3 files changed, 38 insertions, 83 deletions

diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index 5cc7d76..b180637 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -1,22 +1,14 @@
 //
 // Tab overrides
 //
-//GeditNotebook.notebook,
+.gedit-bottom-panel-paned notebook {
 //ScratchMainWindow .notebook,
 //EphyNotebook.notebook,
 //MidoriNotebook .notebook,
 //TerminalWindow .notebook,
 //PantheonTerminalPantheonTerminalWindow .notebook {
-//
-//  header.top tab {
-//    &:active {
-//      box-shadow: inset 0 1px $borders_color,
-//                  inset 0 -1px $borders_color,
-//                  inset 1px 0 $borders_color,
-//                  inset -1px 0 $borders_color;
-//    }
-//  }
-//}
+  > header.top > tabs > tab:checked { box-shadow: inset 0 -1px $borders_color; }
+}
 
 //TerminalWindow .notebook,
 //PantheonTerminalPantheonTerminalWindow .notebook {
@@ -220,32 +212,33 @@ $disk_space_free: darken($bg_color, 3%);
 .gedit-document-panel {
 
   row button {
+    min-width: 22px;
+    min-height: 22px;
+    padding: 0;
+
     color: transparent;
-    background-image: none;
-    background-color: transparent;
+    background: none;
     border: none;
     box-shadow: none;
-    padding: 4px;
-    & image { color: inherit; }
+
+    image { color: inherit; }
   }
-  .prelight-row button {
+
+  row:hover:not(:selected) button {
     color: mix($bg_color, $fg_color, 35%);
+
+    &:hover { color: lighten(red, 15%); }
+    &:active { color: $fg_color; }
   }
-  row button:hover,
-  .prelight-row button:hover {
-    color: lighten(red, 15%);
-  }
-  .prelight-row:selected button:hover {
+
+  row:hover:selected button:hover {
     color: lighten(red, 20%);
-    background-image: none;
-    background-color: transparent;
+    background: none;
     border: none;
     box-shadow: none;
+
     &:active { color: $selected_fg_color; }
   }
-  .prelight-row button:active {
-    color: $fg_color;
-  }
 }
 
 .gedit-document-panel-dragged-row {
@@ -275,10 +268,6 @@ $disk_space_free: darken($bg_color, 3%);
   padding: 2px;
 }
 
-//GeditFileBrowserWidget toolbar {
-//  border-bottom: 1px solid $borders_color;
-//}
-
 //
 // Epiphany
 //
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 54e7bbb..8c79b17 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -1026,8 +1026,9 @@ paned.titlebar {
 
   > headerbar {
     &:not(:only-child):not(:first-child):not(:last-child) { border-radius: 0;}
+
+    ~ headerbar { border-top-left-radius: 0; }
     &:first-child { border-top-right-radius: 0; }
-    &:last-child { border-top-left-radius: 0; } 
   }
 }
 
diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
index 1e8177c..42d08a4 100644
--- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
@@ -131,64 +131,29 @@
 
   .maximized & { background-color: opacify($dark_sidebar_bg, 1); }
 
-  row { color: $dark_sidebar_fg; }
-
   row {
+    color: $dark_sidebar_fg;
     background-color: transparentize($dark_sidebar_fg, 1);
-    border: solid transparentize($dark_sidebar_fg, 1);
-    border-width: 3px 2px 3px 2px;
-  }
-  row:hover {
-    border: solid transparentize($dark_sidebar_fg, 0.85);
-    border-width: 3px 2px 3px 2px;
-    background-color: transparentize($dark_sidebar_fg, 0.85);
-  }
-  row:active {
-    color: $selected_fg_color;
-    background-color: $selected_bg_color;
-    border: solid $selected_bg_color;
-    border-width: 3px 2px 3px 2px;
 
-    button { color: $selected_fg_color; }
-  }
-  row:selected, row:selected:hover {
-    color: $selected_fg_color;
-    background-color: $selected_bg_color;
-    border: solid $selected_bg_color;
-    border-width: 3px 2px 3px 2px;
-  }
-  .prelight-row button:active {
-    color: $dark_sidebar_fg;
+    &:hover {
+      background-color: transparentize($dark_sidebar_fg, 0.85);
+    }
+    &:active {
+      color: $selected_fg_color;
+      background-color: $selected_bg_color;
+
+      button { color: $selected_fg_color; }
+    }
+    &:selected, &:selected:hover {
+      color: $selected_fg_color;
+      background-color: $selected_bg_color;
+    }
+    &:hover:not(:selected) button:active {
+      color: $dark_sidebar_fg;
+    }
   }
 }
 
-//GeditFileBrowserWidget {
-//  background-color: $dark_sidebar_bg;
-//
-//  .maximized & { background-color: opacify($dark_sidebar_bg, 1); }
-//
-//  scrollbar { @extend %dark_sidebar_scrollbar; }
-//
-//  .horizontal {
-//    background-color: transparent;
-//    border-color: darken($dark_sidebar_bg, 7%);
-//
-//    button { @extend %dark_sidebar_button; }
-//    combobox { color: $dark_sidebar_fg; }
-//  }
-//}
-
-//GeditWindow.background.csd GeditFileBrowserView.view {
-//
-//  background-color: transparent;
-//  color: $dark_sidebar_fg;
-//
-//  &.expander {
-//    color: $dark_sidebar_fg;
-//    &:hover { color: $selected_bg_color; }
-//  }
-//}
-
 %dark_sidebar_button {
   @include button(osd);