From b4684c03839205ec1242725ed25ff1137a1725fa Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 1 Mar 2015 20:53:22 +0100 Subject: BlackMate GTK3: first adjustments for GTK3-3.16 - add overshoot effect - fix padding in comboboxentry - caja list-view frame - fix scrollbars - adjustments for caja sidebars - adjustments for mate-control-center --- desktop-themes/BlackMATE/gtk-3.0/gtk-main.css | 2 + desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css | 154 ++++++++++++--------- .../BlackMATE/gtk-3.0/mate-applications.css | 38 +++-- 3 files changed, 114 insertions(+), 80 deletions(-) diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-main.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-main.css index 53d6cda1..873c12e5 100644 --- a/desktop-themes/BlackMATE/gtk-3.0/gtk-main.css +++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-main.css @@ -60,6 +60,8 @@ @define-color scroll_slider_color #3b3b3b; +@define-color scrollbar_trough shade(@less_dark_color, 0.98); + @define-color less_dark_color #4d4d4d; /*shade(@scroll_slider_color, 1.3)*/ @define-color menu_controls_color #ffffff; diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css index faa25d92..6fa59602 100644 --- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css @@ -39,7 +39,7 @@ outline-color: @focus_border; outline-style: dashed; outline-offset: 2px; - outline-width: 2px; /* disable ugly focus-line */ + outline-width: 0px; /* disable ugly focus-line */ -gtk-icon-style: regular; /* no symbolic icons */ } @@ -136,6 +136,11 @@ * Miscellaneous * *****************/ +/* displays at end of mouse scrolling */ +.overshoot { + background-color: alpha (@theme_selected_bg_color, 0.35); +} + .content-view.view.rubberband, .view.rubberband, .rubberband { @@ -310,8 +315,6 @@ GtkTreeView .separator, .entry:focus { border-image: none; - border-style: solid; - border-color: shade(@less_dark_color, 1.2); box-shadow: inset 0 -2px alpha(@entry_shadow, 0.05), inset 0 -1px alpha(@entry_shadow, 0.07); } @@ -536,9 +539,12 @@ GtkCalendar { border-width: 1px 0 0; } +/* disable for GTK3-3.16 , issue with caja list-view frame*/ +/* GtkScrolledWindow.frame { background-color: transparent; } +*/ /* no double frames */ GtkScrolledWindow GtkViewport.frame { @@ -1324,18 +1330,91 @@ GtkComboBox .menu { background-image: none; border-style: solid; -GtkRange-trough-border: 0; - -GtkRange-arrow-scaling: 0.5; - -GtkRange-slider-width: 12; + -GtkScrollbar-has-backward-stepper: true; + -GtkScrollbar-has-forward-stepper: true; -GtkRange-stepper-size: 16; - -GtkScrollbar-min-slider-length: 34; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */ - + -GtkRange-slider-width: 13; + -GtkScrollbar-min-slider-length: 42; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */ -GtkRange-stepper-spacing: 0; - -GtkRange-trough-under-steppers: 0; + -GtkRange-trough-under-steppers: 1; } -.scrollbar.trough { - background-color: transparent; +.scrollbars-junction { /* the small square between scrollbars!!! */ + background-image: none; + background-color: @less_dark_color; + border-width: 0; + border-radius: 0; + border-image: none; + box-shadow: none; +} + +.scrollbar.trough, +.scrollbar.trough.vertical { + background-image: linear-gradient(to right, + @scrollbar_trough, + shade (@scrollbar_trough, 1.08)); + border-left-width: 1px; + border-style: solid; + border-color: shade (@theme_bg_color, 0.94); + border-radius: 0; + border-image: none; +} + +.scrollbar.trough.horizontal { + background-image: linear-gradient(to bottom, + @scrollbar_trough, + shade (@scrollbar_trough, 1.08)); + border-top-width: 1px; + border-style: solid; + border-color: shade (@theme_bg_color, 0.94); + border-radius: 0; + border-image: none; +} + +.scrollbar.button, +.scrollbar.button.horizontal, +.scrollbar.button.vertical { + color: @theme_fg_color; /*@internal_element_color*/ + border-image: none; + border-style: none; + border-width: 0px; + background-image: none; + background-color: @less_dark_color; +} + +.scrollbar.button:hover, +.scrollbar.button.horizontal:hover, +.scrollbar.button.vertical:hover { + background-image: none; + background-color: shade(@less_dark_color, 1.4); + /*border-color: shade(@highlighted_border, 1.1);*/ + color: @theme_fg_color; + border-image: none; + border-style: none; + border-width: 0px; +} + +.scrollbar.button:hover:active, +.scrollbar.button.vertical:hover:active, +.scrollbar.button.horizontal:hover:active { + background-color: @less_dark_color; + background-image: linear-gradient(to top, + shade(@less_dark_color, 1.5), + shade(@less_dark_color, 0.86)); + color: @theme_fg_color; + border-image: none; + border-style: none; + border-width: 0px; + /*border-color: shade(@highlighted_border, 1.1);*/ +} + +.scrollbar.button:insensitive, +.scrollbar.button.horizontal:insensitive, +.scrollbar.button.vertical:insensitive { background-image: none; + background-color: transparent; + color: transparent; + border-image: none; border-style: none; border-width: 0px; } @@ -1416,61 +1495,6 @@ GtkComboBox .menu { shade(@scroll_slider_color, 0.6)); } -.scrollbar.button, -.scrollbar.button.horizontal, -.scrollbar.button.vertical { - color: @theme_fg_color; /*@internal_element_color*/ - border-image: none; - border-style: none; - border-width: 0px; - background-image: none; - background-color: transparent; -} - -.scrollbar.button:hover, -.scrollbar.button.horizontal:hover, -.scrollbar.button.vertical:hover { - background-image: none; - background-color: shade(@theme_bg_color, 1.4); - /*border-color: shade(@highlighted_border, 1.1);*/ - color: @theme_fg_color; - border-image: none; - border-style: none; - border-width: 0px; -} - -.scrollbar.button:hover:active, -.scrollbar.button.horizontal:hover:active { - background-image: linear-gradient(to top, - shade(@theme_bg_color, 1.5), - shade(@theme_bg_color, 0.86)); - color: @theme_fg_color; - border-image: none; - border-style: none; - border-width: 0px; - /*border-color: shade(@highlighted_border, 1.1);*/ -} - -.scrollbar.button.vertical:hover:active { - background-image: linear-gradient(to left, - shade(@theme_bg_color, 1.5), - shade(@theme_bg_color, 0.86)); - border-image: none; - border-style: none; - border-width: 0px; -} - -.scrollbar.button:insensitive, -.scrollbar.button.horizontal:insensitive, -.scrollbar.button.vertical:insensitive { - background-image: none; - background-color: transparent; - color: transparent; - border-image: none; - border-style: none; - border-width: 0px; -} - .scrollbar.slider:insensitive { background-image: none; background-color: shade(@theme_bg_color, 1.5); diff --git a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css index e7f298ce..46158d40 100644 --- a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css +++ b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css @@ -4,11 +4,21 @@ /**** View ***/ -CajaView .view { - background-color: shade (@theme_bg_color, 1.08); +/* Look out ! +FIXME This is the background color of caja view */ +/*background of icon view */ +CajaView .entry { + background-color: shade(@theme_bg_color, 1.00); color: @theme_fg_color; } +/*background of list view */ +CajaWindow .view { + background-color: shade(@theme_bg_color, 1.00); + color: @theme_fg_color; + border-color: transparent; +} + .caja-inactive-pane .view { background-color: shade(@less_dark_color, 1.3); } @@ -26,12 +36,6 @@ CajaView .view .entry:focus { /**** Window ***/ -/*FIXME normaly this isn't the right entry for adjusting -the sidebar background color*/ -CajaWindow .view { - background-color: shade (@theme_bg_color, 1.08); -} - /* the small line between sidebar and view */ CajaWindow * { -GtkPaned-handle-size: 2px; @@ -163,11 +167,15 @@ CajaWindow .button.flat:hover { /**** Sidebar ***/ -/* FIXME has no effect*/ -/*CajaWindow .sidebar .view { - background-color: shade (@theme_bg_color, 1.08); - color: @theme_fg_color; -}*/ +/* caja sidebar */ +CajaWindow FMTreeView .view, +CajaWindow CajaNotesViewer .view, +CajaWindow CajaPlacesSidebar .view, +CajaWindow CajaHistorySidebar .view, +CajaWindow CajaEmblemSidebar .frame, +CajaWindow CajaInformationPanel .vertical { + background-color: shade (@theme_bg_color, 1.08); +} CajaWindow .sidebar .frame { border-width: 0px; @@ -528,12 +536,12 @@ ShellWindow AppResizer { background-color: @less_dark_color; } -GtkScrolledWindow .button.flat { +ShellWindow GtkScrolledWindow .button.flat { border-image: none; } /* button hover of applications */ -GtkScrolledWindow .button.flat:hover { +ShellWindow GtkScrolledWindow .button.flat:hover { border-radius: 8px; } -- cgit v1.2.1