1 files changed, 22 insertions, 12 deletions
diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss
index a499f77..1bbcde6 100644
--- a/common/gtk-3.0/3.18/sass/_applications.scss
+++ b/common/gtk-3.0/3.18/sass/_applications.scss
@@ -5,8 +5,7 @@ GeditNotebook.notebook,
 ScratchMainWindow .notebook,
 EphyNotebook.notebook,
 MidoriNotebook .notebook,
-TerminalWindow .notebook,
-PantheonTerminalPantheonTerminalWindow .notebook {
+TerminalWindow .notebook {
 
   tab.reorderable-page.top, tab.top {
     &:active, &.active-page, &.active-page:hover {
@@ -18,8 +17,7 @@ PantheonTerminalPantheonTerminalWindow .notebook {
   }
 }
 
-TerminalWindow .notebook,
-PantheonTerminalPantheonTerminalWindow .notebook {
+TerminalWindow .notebook {
 
   tab.reorderable-page.top, tab.top {
     padding-top: 7px;
@@ -97,7 +95,7 @@ EelEditableLabel.entry { transition: none; }  // Workaround for invisible text i
 }
 
 .nautilus-desktop.nautilus-canvas-item {
-  color: $selected_fg_color;
+  color: white;
   text-shadow: 1px 1px transparentize(black, 0.4);
 
   &:active { color: $fg_color; }
@@ -555,7 +553,7 @@ PanelApplet .button:hover {
 PanelApplet .button:active, PanelApplet .button:active:backdrop,
 PanelApplet .button:checked, PanelApplet .button:checked:backdrop {
   background-clip: padding-box;
-  color: $selected_fg_color;
+  color: white;
   background-color: transparentize(black, 0.75);
   border-radius: 0;
   border-color: transparentize(black, 0.75);
@@ -563,7 +561,7 @@ PanelApplet .button:checked, PanelApplet .button:checked:backdrop {
 }
 
 PanelApplet:hover {
-  color: $selected_fg_color;
+  color: white;
 }
 
 PanelApplet:active,
@@ -699,6 +697,11 @@ MarlinViewWindow {
   text-shadow: 0 1px 2px transparentize(black, 0.4);
   icon-shadow: 0 1px 2px transparentize(black, 0.4);
 
+  .maximized {
+    background-color: $panel_bg;
+    box-shadow: inset 0 -1px darken($panel_bg, 7%);
+  }
+
   &-shadow {
     background-image: none;
     background-color: transparent;
@@ -744,6 +747,13 @@ MarlinViewWindow {
     padding-top: 8px;
     padding-bottom: 8px;
   }
+
+  .color-light & {
+    color: transparentize(black, 0.35);
+
+    text-shadow: 0 0 2px transparentize(white, 0.7), 0 1px 0 transparentize(white, 0.75);
+    icon-shadow: 0 0 2px transparentize(white, 0.7), 0 1px 0 transparentize(white, 0.75);
+  }
 }
 
 .panel-app-button > GtkWidget > GtkWidget:first-child {
@@ -759,23 +769,23 @@ MarlinViewWindow {
 WingpanelWidgetsIndicatorPopover.popover {
   padding: 0;
 
+  font: initial;
   text-shadow: none;
   icon-shadow: none;
 
+  .sidebar { background: none; }
+
   .menuitem {
     padding: 5px;
     outline-color: transparent;
     text-shadow: none;
     icon-shadow: none;
-    border: solid transparent;
-    border-width: 1px 0;
 
     GtkLabel, GtkImage { padding: 0 3px; }
 
     &:hover, &:active {
-      background-color: if($variant == 'light', transparentize(black, 0.96), transparentize(white, 0.95));
-      border: solid if($variant == 'light', transparentize(black, 0.92), transparentize(white, 0.93));
-      border-width: 1px 0;
+      color: $selected_fg_color;
+      background-color: $selected_bg_color;
     }
     *:insensitive { color: $insensitive_fg_color; }
   }