GTK+-3.20 BlueSubmarine: fix scrollbar breakage from gtk+-3.19.11

author: raveit65 <[email protected]> 2016-03-04 15:31:38 +0100
committer: raveit65 <[email protected]> 2016-03-04 15:31:38 +0100
commit: edfed8cfe81d1cfa09c780ce2edcb1b5c0a8691f (patch)
tree: 38f07ae508c34c2daede52067a81e0d1f229db33 /desktop-themes
parent: bfe52a0e4bd76221f1c523f39a717e48809ec494 (diff)
download: mate-themes-edfed8cfe81d1cfa09c780ce2edcb1b5c0a8691f.tar.bz2
mate-themes-edfed8cfe81d1cfa09c780ce2edcb1b5c0a8691f.tar.xz
4 files changed, 83 insertions, 99 deletions
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
index 9e15f399..c69da9a4 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
@@ -11,16 +11,13 @@
 -GtkDialog-action-area-border: 10; /* ie. logout dialog */ 
 -GtkHTML-link-color: @link_color; 
 -GtkIMHtml-hyperlink-color: @link_color; 
- -GtkRange-trough-border: 1; 
+/* -GtkRange-trough-border: 1; 
 -GtkRange-slider-width: 11; 
 -GtkRange-stepper-size: 13; 
 -GtkRange-trough-under-steppers: 1; 
 -GtkRange-stepper-spacing: 0; 
- -GtkScale-trough-border: 0; 
+ -GtkScale-trough-border: 0; */ 
 -GtkScrollbar-activate-slider: 1; 
- -GtkScrollbar-trough-border: 0; 
- -GtkScrollbar-slider-width: 11; 
- -GtkScrollbar-min-slider-length: 31; 
 -GtkScrolledWindow-scrollbar-spacing: 0; 
 -GtkTextView-error-underline-color: @error_color; 
 -GtkToolButton-icon-spacing: 4; 
@@ -272,8 +269,6 @@ paned > separator.wide:backdrop {
 
 entry, 
 entry.combo { 
-/* Look out ! 
-This is the background color of mate-control-center 'too' */ 
 background-color: shade (@bg_color, 1.1); 
 padding: 6px 4px; 
 color: @entry_text_color; 
@@ -581,9 +576,9 @@ levelbar block.empty:backdrop {
 ************/ 
 
 scale { 
- -GtkScale-slider-length: 16; 
+/* -GtkScale-slider-length: 16; 
 -GtkRange-slider-width: 16; 
- -GtkRange-trough-border: 0; 
+ -GtkRange-trough-border: 0; */ 
 } 
 
 scale slider, 
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
index 9f5656fd..cf88b508 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
@@ -20,9 +20,12 @@
 background-color: shade (@theme_bg_color, 1.08);
 }
 
-.caja-side-pane scrolledwindow scrollbar.vertical.left trough,
-.caja-side-pane scrolledwindow scrollbar.horizontal.bottom trough {
- border-style: none;
+/* to avoid overlap with eject buttons */
+.caja-side-pane scrolledwindow scrollbar.vertical.left.overlay-indicator,
+.caja-side-pane scrolledwindow scrollbar.vertical.left.overlay-indicator trough,
+.caja-side-pane scrolledwindow scrollbar.vertical.left.overlay-indicator slider,
+.caja-side-pane scrolledwindow scrollbar.vertical.left.overlay-indicator button {
+ min-width: 8px;
 }
 
 /* selected item in sidebar */
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/other-applications.css b/desktop-themes/Blue-Submarine/gtk-3.0/other-applications.css
index 4105b94b..6e215a81 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/other-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/other-applications.css
@@ -143,37 +143,6 @@ NemoTrashBar .button *:disabled {
 text-shadow: none;
 }
 
-.nemo-window .sidebar scrollbar {
- background-image: none;
- border-style: solid;
- -GtkRange-stepper-size: 16;
- -GtkRange-stepper-spacing: 0;
- -GtkRange-trough-border: 1;
- -GtkRange-arrow-scaling: 0.666;
- -GtkRange-slider-width: 13;
- -GtkRange-trough-under-steppers: 1;
- -GtkScrollbar-has-backward-stepper: true;
- -GtkScrollbar-has-forward-stepper: true;
- -GtkScrollbar-activate-slider: 1;
- -GtkScrollbar-min-slider-length: 31;
- -GtkScrollbar-slider-width: 11;
- -GtkScrolledWindow-scrollbar-spacing: 0;
-}
-
-.nemo-window .sidebar scrollbar.vertical.left trough {
- border-radius: 0;
- border-width: 0 0px 0 1px;
- border-style: solid;
- border-color: shade (@theme_bg_color, 0.96);
-}
-
-.nemo-window .sidebar scrollbar trough {
- border-radius: 0;
- border-width: 1px 0 0px 0;
- border-style: solid;
- border-color: shade (@theme_bg_color, 0.96);
-}
-
 NemoWindow .sidebar .frame {
 border-width: 0px;
 border-style: none;
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/scrollbar.css b/desktop-themes/Blue-Submarine/gtk-3.0/scrollbar.css
index cde68eb2..4eca8153 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/scrollbar.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/scrollbar.css
@@ -5,105 +5,105 @@
 scrollbar {
 background-image: none;
 border-style: solid;
+ border-color: shade(@button_border, 1.13);
 -GtkRange-stepper-size: 16;
 -GtkRange-stepper-spacing: 0;
- -GtkRange-trough-border: 0;
- -GtkRange-arrow-scaling: 0.666;
- -GtkRange-slider-width: 13;
- -GtkRange-trough-under-steppers: 1;
 -GtkScrollbar-has-backward-stepper: true;
 -GtkScrollbar-has-forward-stepper: true;
 -GtkScrollbar-activate-slider: 1;
- -GtkScrollbar-min-slider-length: 31;
 -GtkScrolledWindow-scrollbar-spacing: 0;
 }
 
- /* the small square between scrollbars!!!
- no borders with background-image */
-scrolledwindow junction {
- background-image: linear-gradient(to bottom,
- shade(@theme_bg_color, 1.05),
- shade(@theme_bg_color, 1.05));
- border-image: linear-gradient(to bottom,
- shade(@theme_bg_color, 1.05),
- shade(@theme_bg_color, 1.05));
- background-color: transparent;
- border-style: none;
- border-width: 0;
- box-shadow: none;
+scrollbar.vertical {
+ border-width: 0px 0px 0px 1px;
+ min-width: 10px;
+}
+
+scrollbar.horizontal {
+ border-width: 1px 0px 0px 0px;
+ min-height: 10px;
 }
 
-scrollbar trough,
 scrollbar.vertical trough {
+ min-width: 13px;
 background-image: -gtk-gradient (linear, left top, left bottom,
 from (shade (@theme_bg_color, 0.98)),
 to (shade (@theme_bg_color, 1.06)));
- border-left-width: 1px;
- border-right-width: 0px;
- border-top-width: 0px;
- border-bottom-width: 0px;
 border-radius: 0;
- border-color: shade(@button_border, 1.13);
- border-style: solid;
+ border-style: none;
 box-shadow: none;
 }
 
 scrollbar.horizontal trough {
+ min-height: 13px;
 background-image: -gtk-gradient (linear, left top, right top,
 from (shade (@theme_bg_color, 0.98)),
 to (shade (@theme_bg_color, 1.06)));
- border-left-width: 0px;
- border-right-width: 0px;
- border-top-width: 1px;
- border-bottom-width: 0px;
 border-radius: 0;
- border-style: solid;
+ border-style: none;
 box-shadow: none;
 }
 
-/* Sliders and buttons */
+scrollbar trough:disabled {
+ background-color: shade (@theme_bg_color, 1.06);
+}
+
+/* Sliders */
 scrollbar.vertical slider {
+ min-width: 11px;
+ min-height: 31px;
 background-image: -gtk-gradient (linear, left top, left bottom,
 from (shade (@theme_bg_color, 0.95)),
 to (shade (@theme_bg_color, 0.8)));
- border-color: shade (@theme_bg_color, 0.65);
+ border-color: shade(@button_border, 1.13);
 border-radius: 10px;
 border-width: 1px;
+ border-style: solid;
 }
 
 scrollbar.vertical slider:hover,
 scrollbar.vertical slider:hover:active {
 background-image: -gtk-gradient (linear, left top, left bottom,
- from (shade (@theme_bg_color, 0.85)),
- to (shade (@theme_bg_color, 0.7)));
+ from (shade (@theme_bg_color, 0.7)),
+ to (shade (@theme_bg_color, 0.85)));
 border-color: shade (@theme_bg_color, 0.85);
- border-width: 0 0 0 0;
 }
 
 scrollbar.horizontal slider {
+ min-width: 31px;
+ min-height: 13px;
 background-image: -gtk-gradient (linear, left top, right top,
 from (shade (@theme_bg_color, 0.95)),
 to (shade (@theme_bg_color, 0.8)));
- border-color: shade (@theme_bg_color, 0.65);
+ border-color: shade(@button_border, 1.13);
 border-radius: 10px;
 border-width: 1px;
+ border-style: solid;
 }
 
 scrollbar.horizontal slider:hover,
 scrollbar.horizontal slider:hover:active {
 background-image: -gtk-gradient (linear, left top, right top,
- from (shade (@theme_bg_color, 0.85)),
- to (shade (@theme_bg_color, 0.7)));
+ from (shade (@theme_bg_color, 0.7)),
+ to (shade (@theme_bg_color, 0.85)));
 border-color: shade (@theme_bg_color, 0.85);
- border-width: 0 0 0 0;
 }
 
 scrollbar slider:disabled {
 background-color: shade (@theme_bg_color, 0.9);
 }
 
-scrollbar trough:disabled {
- background-color: shade (@theme_bg_color, 1.06);
+/* Buttons */
+scrollbar.vertical button {
+ min-width:13px;
+ min-height: 16px;
+ padding: 0px;
+}
+
+scrollbar.horizontal button {
+ min-width:16px;
+ min-height: 13px;
+ padding: 0px;
 }
 
 scrollbar button,
@@ -114,7 +114,6 @@ scrollbar button:disabled {
 border-style: none;
 border-image: none;
 border-radius: 0;
- background-image: none;
 background-color: transparent;
 }
 
@@ -123,35 +122,37 @@ scrollbar button:hover:active {
 background-color: alpha(shade(@scrollbar_trough, 0.8), 0.5);
 }
 
-scrollbar button.top:hover {
- box-shadow: none;
-/* -gtk-image-effect: highlight; invalid property name in GTK 3.20 */
+scrollbar.vertical button.up {
+ -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
+ -gtk-icon-effect: highlight;
 }
 
-scrollbar button.bottom:hover {
- box-shadow: none;
-/* -gtk-image-effect: highlight; invalid property name in GTK 3.20 */
+scrollbar.vertical button.down {
+ -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+ -gtk-icon-effect: highlight;
 }
 
-scrollbar button.right:hover {
- box-shadow: none;
-/* -gtk-image-effect: highlight; invalid property name in GTK 3.20 */
+scrollbar.horizontal button.up {
+ -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+ -gtk-icon-effect: highlight;
 }
 
-scrollbar button.left:hover {
- box-shadow: none;
-/* -gtk-image-effect: highlight; invalid property name in GTK 3.20 */
+scrollbar.horizontal button.down {
+ -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+ -gtk-icon-effect: highlight;
 }
 
 scrollbar button {
 color: @theme_fg_color;
 }
 
-scrollbar button:hover {
- color: @theme_fg_color;
+scrollbar button:hover,
+scrollbar button:hover:active {
+ color: @theme_selected_bg_color;
 }
 
 scrollbar button:disabled {
+ background-color: @insensitive_bg_color;
 color: @insensitive_fg_color;
 }
 
@@ -214,3 +215,19 @@ scrolledwindow.frame {
 border-radius: 0;
 border-style: solid;
 }
+
+ /* the small square between scrollbars!!!
+ no borders with background-image */
+scrolledwindow junction {
+ background-image: linear-gradient(to bottom,
+ shade(@theme_bg_color, 1.00),
+ shade(@theme_bg_color, 1.00));
+ border-image: linear-gradient(to bottom,
+ shade(@theme_bg_color, 1.00),
+ shade(@theme_bg_color, 1.00));
+ background-color: transparent;
+ border-style: none;
+ border-width: 0;
+ box-shadow: none;
+}
+
author	raveit65 <[email protected]>	2016-03-04 15:31:38 +0100
committer	raveit65 <[email protected]>	2016-03-04 15:31:38 +0100
commit	edfed8cfe81d1cfa09c780ce2edcb1b5c0a8691f (patch)
tree	38f07ae508c34c2daede52067a81e0d1f229db33 /desktop-themes
parent	bfe52a0e4bd76221f1c523f39a717e48809ec494 (diff)
download	mate-themes-edfed8cfe81d1cfa09c780ce2edcb1b5c0a8691f.tar.bz2 mate-themes-edfed8cfe81d1cfa09c780ce2edcb1b5c0a8691f.tar.xz