some refactoring

1 files changed, 28 insertions, 53 deletions

diff --git a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss
index ccb254d..c3f9a6d 100644
--- a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss
@@ -97,33 +97,6 @@ MarlinViewWindow {
   .pane-separator { background-color: $dark_sidebar_border; }
 }
 
-%dark_sidebar_scrollbar {
-
-  &.overlay-indicator:not(.dragging):not(.hovering) .slider {
-    background-color: lighten($dark_sidebar_fg, 15%);
-    border: 1px solid transparentize(black, 0.7);
-  }
-
-  // trough coloring
-  .trough {
-    background-color: transparentize(black, 0.8);
-    border: none;
-  }
-
-  // slider coloring
-  .slider {
-    background-color: transparentize(lighten($dark_sidebar_fg, 15%), 0.3);
-
-    &:hover { background-color: lighten($dark_sidebar_fg, 20%); }
-
-    &:prelight:active { background-color: $selected_bg_color; }
-
-    &:insensitive {
-      background-color: transparent;
-    }
-  }
-}
-
 GtkFileChooserDialog {
 
   &.background.csd, &.background { background-color: $dark_sidebar_bg }
@@ -230,32 +203,7 @@ GeditFileBrowserWidget {
 
   .maximized & { background-color: opacify($dark_sidebar_bg, 1); }
 
-  .scrollbar {
-
-    &.overlay-indicator:not(.dragging):not(.hovering) .slider {
-      background-color: lighten($dark_sidebar_fg, 15%);
-      border: 1px solid transparentize(black, 0.7);
-    }
-
-    // trough coloring
-    .trough {
-      background-color: transparentize(black, 0.8);
-      border: none;
-    }
-
-    // slider coloring
-    .slider {
-      background-color: transparentize(lighten($dark_sidebar_fg, 15%), 0.3);
-
-      &:hover { background-color: lighten($dark_sidebar_fg, 15%); }
-
-      &:prelight:active { background-color: $selected_bg_color; }
-
-      &:insensitive {
-        background-color: transparent;
-      }
-    }
-  }
+  .scrollbar { @extend %dark_sidebar_scrollbar; }
 
   .horizontal {
     background-color: transparent;
@@ -291,3 +239,30 @@ GeditWindow.background.csd GeditFileBrowserView.view {
   &:focus { @include entry(osd-focus); }
   &:insensitive { @include entry(osd-insensitive); }
 }
+
+%dark_sidebar_scrollbar {
+
+  &.overlay-indicator:not(.dragging):not(.hovering) .slider {
+    background-color: lighten($dark_sidebar_fg, 15%);
+    border: 1px solid transparentize(black, 0.7);
+  }
+
+  // trough coloring
+  .trough {
+    background-color: transparentize(black, 0.8);
+    border: none;
+  }
+
+  // slider coloring
+  .slider {
+    background-color: transparentize(lighten($dark_sidebar_fg, 15%), 0.3);
+
+    &:hover { background-color: lighten($dark_sidebar_fg, 20%); }
+
+    &:prelight:active { background-color: $selected_bg_color; }
+
+    &:insensitive {
+      background-color: transparent;
+    }
+  }
+}