[epiphany/wip/exalm/pinned: 3/3] Fix pinned tab styling in incognito mode



commit 4e8ca5aa8137a119599071a610db62ee610513df
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date:   Fri Apr 5 00:36:49 2019 +0500

    Fix pinned tab styling in incognito mode
    
    The last commit made them appear with non-incognito colors.

 src/resources/themes/Adwaita-dark.css   | 14 +++++-----
 src/resources/themes/Adwaita.css        | 14 +++++-----
 src/resources/themes/_Adwaita-base.scss | 47 ++++++++++++++++++---------------
 3 files changed, 39 insertions(+), 36 deletions(-)
---
diff --git a/src/resources/themes/Adwaita-dark.css b/src/resources/themes/Adwaita-dark.css
index 02ee94e22..e4ff11d30 100644
--- a/src/resources/themes/Adwaita-dark.css
+++ b/src/resources/themes/Adwaita-dark.css
@@ -226,16 +226,16 @@ dzlsuggestionpopover > revealer > box > elastic > scrolledwindow > viewport > li
 
 .main-notebook tab:not(.reorderable-page) { min-width: 16; }
 
-.main-notebook tab:not(.reorderable-page):hover { border-color: rgba(27, 27, 27, 0.3); background-color: 
rgba(53, 53, 53, 0.2); }
+.main-notebook header.top tab, .main-notebook header.bottom tab { border-style: none solid; }
 
-.main-notebook tab:not(.reorderable-page):backdrop { border-color: transparent; background-color: 
transparent; }
+.main-notebook header.left tab, .main-notebook header.right tab { border-style: solid none; }
 
-.main-notebook tab:not(.reorderable-page):checked { border-color: rgba(27, 27, 27, 0.5); background-color: 
rgba(53, 53, 53, 0.5); }
+window:not(.incognito-mode) .main-notebook tab:not(.reorderable-page):hover { border-color: rgba(27, 27, 27, 
0.3); background-color: rgba(53, 53, 53, 0.2); }
 
-.main-notebook tab:not(.reorderable-page):checked:hover { background-color: rgba(53, 53, 53, 0.7); }
+window:not(.incognito-mode) .main-notebook tab:not(.reorderable-page):backdrop { border-color: transparent; 
background-color: transparent; }
 
-.main-notebook tab:not(.reorderable-page):backdrop:checked { border-color: #202020; background-color: 
#353535; }
+window:not(.incognito-mode) .main-notebook tab:not(.reorderable-page):checked { border-color: rgba(27, 27, 
27, 0.5); background-color: rgba(53, 53, 53, 0.5); }
 
-.main-notebook header.top tab, .main-notebook header.bottom tab { border-style: none solid; }
+window:not(.incognito-mode) .main-notebook tab:not(.reorderable-page):checked:hover { background-color: 
rgba(53, 53, 53, 0.7); }
 
-.main-notebook header.left tab, .main-notebook header.right tab { border-style: solid none; }
+window:not(.incognito-mode) .main-notebook tab:not(.reorderable-page):backdrop:checked { border-color: 
#202020; background-color: #353535; }
diff --git a/src/resources/themes/Adwaita.css b/src/resources/themes/Adwaita.css
index f629c949f..c37014ed9 100644
--- a/src/resources/themes/Adwaita.css
+++ b/src/resources/themes/Adwaita.css
@@ -226,16 +226,16 @@ dzlsuggestionpopover > revealer > box > elastic > scrolledwindow > viewport > li
 
 .main-notebook tab:not(.reorderable-page) { min-width: 16; }
 
-.main-notebook tab:not(.reorderable-page):hover { border-color: rgba(205, 199, 194, 0.3); background-color: 
rgba(246, 245, 244, 0.2); }
+.main-notebook header.top tab, .main-notebook header.bottom tab { border-style: none solid; }
 
-.main-notebook tab:not(.reorderable-page):backdrop { border-color: transparent; background-color: 
transparent; }
+.main-notebook header.left tab, .main-notebook header.right tab { border-style: solid none; }
 
-.main-notebook tab:not(.reorderable-page):checked { border-color: rgba(205, 199, 194, 0.5); 
background-color: rgba(246, 245, 244, 0.5); }
+window:not(.incognito-mode) .main-notebook tab:not(.reorderable-page):hover { border-color: rgba(205, 199, 
194, 0.3); background-color: rgba(246, 245, 244, 0.2); }
 
-.main-notebook tab:not(.reorderable-page):checked:hover { background-color: rgba(246, 245, 244, 0.7); }
+window:not(.incognito-mode) .main-notebook tab:not(.reorderable-page):backdrop { border-color: transparent; 
background-color: transparent; }
 
-.main-notebook tab:not(.reorderable-page):backdrop:checked { border-color: #d5d0cc; background-color: 
#f6f5f4; }
+window:not(.incognito-mode) .main-notebook tab:not(.reorderable-page):checked { border-color: rgba(205, 199, 
194, 0.5); background-color: rgba(246, 245, 244, 0.5); }
 
-.main-notebook header.top tab, .main-notebook header.bottom tab { border-style: none solid; }
+window:not(.incognito-mode) .main-notebook tab:not(.reorderable-page):checked:hover { background-color: 
rgba(246, 245, 244, 0.7); }
 
-.main-notebook header.left tab, .main-notebook header.right tab { border-style: solid none; }
+window:not(.incognito-mode) .main-notebook tab:not(.reorderable-page):backdrop:checked { border-color: 
#d5d0cc; background-color: #f6f5f4; }
diff --git a/src/resources/themes/_Adwaita-base.scss b/src/resources/themes/_Adwaita-base.scss
index 6ebcfe26c..4b5dd615f 100644
--- a/src/resources/themes/_Adwaita-base.scss
+++ b/src/resources/themes/_Adwaita-base.scss
@@ -295,28 +295,6 @@ dzlsuggestionpopover > revealer > box > elastic > scrolledwindow > viewport > li
 .main-notebook {
   tab:not(.reorderable-page) {
     min-width: 16;
-
-    &:hover {
-      border-color: transparentize($borders_color, 0.7);
-      background-color: transparentize($bg_color, 0.8);
-    }
-
-    &:backdrop {
-      border-color: transparent;
-      background-color: transparent;
-    }
-
-    &:checked {
-      border-color: transparentize($borders_color, 0.5);
-      background-color: transparentize($bg_color, 0.5);
-
-      &:hover { background-color: transparentize($bg_color, 0.3); }
-    }
-
-    &:backdrop:checked {
-      border-color: $backdrop_borders_color;
-      background-color: $backdrop_bg_color;
-    }
   }
 
   header {
@@ -335,3 +313,28 @@ dzlsuggestionpopover > revealer > box > elastic > scrolledwindow > viewport > li
     }
   }
 }
+
+window:not(.incognito-mode) .main-notebook tab:not(.reorderable-page) {
+  &:hover {
+    border-color: transparentize($borders_color, 0.7);
+    background-color: transparentize($bg_color, 0.8);
+  }
+
+  &:backdrop {
+    border-color: transparent;
+    background-color: transparent;
+  }
+
+  &:checked {
+    border-color: transparentize($borders_color, 0.5);
+    background-color: transparentize($bg_color, 0.5);
+
+    &:hover { background-color: transparentize($bg_color, 0.3); }
+  }
+
+  &:backdrop:checked {
+    border-color: $backdrop_borders_color;
+    background-color: $backdrop_bg_color;
+  }
+}
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]