From a74dbf487dda7b9d5f6a4268a6de1eec8884b3bb Mon Sep 17 00:00:00 2001 From: raveit65 Date: Tue, 10 Feb 2015 20:08:08 +0100 Subject: ContrastHighInverse GTK3: fix flat buttons in m-c-c and pluma - set line numbers background in pluma - give frames in pluma caja and notbooks round corners - adjust mate-panel - fix hover fg_color - fix menu hover borders - add arrows in scrollbars - add fine-tuning in scrollbars --- .../ContrastHighInverse/gtk-3.0/gtk-widgets.css | 121 ++++++++++----- desktop-themes/ContrastHighInverse/gtk-3.0/gtk.css | 29 ++++ .../gtk-3.0/mate-applications.css | 171 +++++++++++++++------ 3 files changed, 243 insertions(+), 78 deletions(-) diff --git a/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css index eb5c5449..2cbbeaaf 100644 --- a/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css @@ -1,26 +1,3 @@ -/* common color definitions */ - -@define-color warning_color #ff4400; -@define-color warning_bg_color @warning_color; -@define-color warning_fg_color white; - -@define-color question_color #0000ff; -@define-color question_bg_color @question_color; -@define-color question_fg_color white; - -@define-color error_color #ff0000; -@define-color error_bg_color @error_color; -@define-color error_fg_color white; - -@define-color error_color #ff0000; -@define-color success_color #00ff00; - -/* fallback mode */ -@define-color os_chrome_bg_color white; -@define-color os_chrome_fg_color #ccc; -@define-color os_chrome_selected_bg_color #333; -@define-color os_chrome_selected_fg_color black; - * { -GtkRange-stepper-size: 2; -GtkScale-slider-length: 28; @@ -283,6 +260,23 @@ GtkLevelBar.vertical { padding: 5px; } +/* ie. mate-control-center */ +.button.flat { + padding: 0px; + border-color: transparent; + background-color: transparent; + background-image: none; + color: @theme_fg_color; + box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0); + text-shadow: none; + icon-shadow: none; + border-image: none; +} + +.button.flat.hover { + border-radius: 3px; +} + .button:active { background-color: @theme_button_active_bg; color: @theme_base_color; @@ -517,18 +511,30 @@ GtkComboBox .button { color: @theme_fg_color; } -.menuitem { +.menuitem, +.menu .menuitem { color: @theme_fg_color; background-color: transparent; } -.menuitem:insensitive { +.menuitem:insensitive, +.menu .menuitem:insensitive { color: @theme_button_insensitive_fg; } -.menuitem:hover { - color: @theme_base_color; +.menubar .menuitem:hover { + color: @theme_fg_color; + background-color: @theme_active_color; +} + +.menu .menuitem:hover { + color: @theme_fg_color; background-color: @theme_active_color; + border-style: solid; + border-left-width: 1px; + border-right-width: 1px; + border-left-color: @theme_fg_color; + border-right-color: @theme_fg_color; } .menu .menuitem { @@ -539,7 +545,8 @@ GtkComboBox .button { padding: 3px 5px; } -.menuitem.separator { +.menuitem.separator, +.menu .menuitem.separator { -GtkMenuItem-horizontal-padding: 0; } @@ -862,6 +869,10 @@ GtkSwitch.trough:active:insensitive { border-style: solid; background-clip: border-box; background-color: @theme_notebook_bg; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; } .notebook :hover { @@ -926,30 +937,54 @@ GtkScrolledWindow GtkViewport.frame { border-style: none; } +/************** + * Scrollbars * + **************/ + .scrollbar { -GtkRange-slider-width: 17; -GtkRange-stepper-size: 17; -GtkRange-trough-border: 0; - -GtkScrollbar-has-backward-stepper: false; - -GtkScrollbar-has-forward-stepper: false; + -GtkScrollbar-has-backward-stepper: true; + -GtkScrollbar-has-forward-stepper: true; -GtkScrollbar-min-slider-length: 64; } -.scrollbar.trough { +.scrollbars-junction { + background-image: linear-gradient(to bottom, + shade (@theme_internal_bg, 1.0), + shade (@theme_internal_bg, 1.0)); background-color: @theme_internal_bg; + border-width: 0px; + border-color: @theme_internal_bg; + border-radius: 0px; + border-image: linear-gradient(to bottom, + shade (@theme_internal_bg, 1.0), + shade (@theme_internal_bg, 1.0)); + box-shadow: none; +} +.scrollbar.trough, +.scrollbar.trough.vertical, +.sidebar .scrollbar.trough, +.osd .scrollbar.trough { + background-color: @theme_internal_bg; border-width: 0; border-color: transparent; border-radius: 0; } -.scrollbars-junction { +.scrollbar.trough.horizontal { background-color: @theme_internal_bg; + border-width: 0; + border-color: transparent; + border-radius: 0; } -.scrollbar.slider { +.scrollbar.slider, +.sidebar .scrollbar.slider, +.osd .scrollbar.slider { background-color: @theme_slider_bg; - border-style: solid; border-radius: 12px; border-width: 3px; @@ -957,12 +992,28 @@ GtkScrolledWindow GtkViewport.frame { } .scrollbar.slider:hover, -.scrollbar.slider:active:hover { +.scrollbar.slider:active:hover, +.scrollbar.slider.vertical:hover, +.scrollbar.slider.vertical:active:hover, +.scrollbar.slider.horizontal:hover, +.scrollbar.slider.horizontal:active:hover, +.sidebar .scrollbar.slider:hover, +.sidebar .scrollbar.slider:hover:active, +.osd .scrollbar.slider:hover, +.osd .scrollbar.slider:active { background-color: @theme_fg_color; border-width: 3px; border-color: transparent; } +.scrollbar.slider.fine-tune:prelight:active { + background-image: none; + border-style: solid; + border-image: none; + border-color: transparent; + border-width: 5px; +} + /****************** * Column headers * ******************/ diff --git a/desktop-themes/ContrastHighInverse/gtk-3.0/gtk.css b/desktop-themes/ContrastHighInverse/gtk-3.0/gtk.css index f1728ec9..1493c97c 100644 --- a/desktop-themes/ContrastHighInverse/gtk-3.0/gtk.css +++ b/desktop-themes/ContrastHighInverse/gtk-3.0/gtk.css @@ -1,4 +1,5 @@ @define-color theme_base_color #000000; +@define-color theme_bg_color @theme_base_color; @define-color theme_fg_color #ffffff; @define-color theme_active_color #666699; @define-color theme_border_color @theme_active_color; @@ -121,6 +122,33 @@ @define-color osd_popover_bg alpha(@osd_base, 0.90); @define-color wm_shadow alpha(black, 0.5); +/************************ + * Info, Warnings, etc. * + ************************/ + +@define-color warning_color #ff4400; +@define-color warning_bg_color @warning_color; +@define-color warning_fg_color white; + +@define-color question_color #0000ff; +@define-color question_bg_color @question_color; +@define-color question_fg_color white; + +@define-color error_color #ff0000; +@define-color error_bg_color @error_color; +@define-color error_fg_color white; + +@define-color error_color #ff0000; +@define-color success_color #00ff00; + +/***************** + * fallback mode * + *****************/ + +@define-color os_chrome_bg_color white; +@define-color os_chrome_fg_color #ccc; +@define-color os_chrome_selected_bg_color #333; +@define-color os_chrome_selected_fg_color black; * { /* Pidgin */ @@ -138,3 +166,4 @@ } @import url("gtk-widgets.css"); +@import url("mate-applications.css"); diff --git a/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css b/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css index 93987cd3..cd8de841 100644 --- a/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css +++ b/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css @@ -13,18 +13,23 @@ MatePanelAppletFrameDBus, MatePanelAppletContainer, MatePanelApplet { color: @theme_fg_color; - background-color: @theme_base_color; background-image: none; } -/* applets on the panel */ -ClockBox, -.mate-panel-menu-bar, -MatePanelApplet > GtkMenuBar.menubar { - font: bold; +MatePanelApplet { + border-width: 0; +} + +PanelSeparator { + border-width: 0; + background-image: none; + color: @theme_fg_color; + text-shadow: none; } +/* applets on the panel */ + .mate-panel-menu-bar .menuitem, MatePanelApplet > GtkMenuBar.menubar .menuitem { color: @theme_fg_color; @@ -32,13 +37,13 @@ MatePanelApplet > GtkMenuBar.menubar .menuitem { .mate-panel-menu-bar .menuitem:hover, MatePanelApplet > GtkMenuBar.menubar .menuitem:hover { - color: @theme_fg_active_color; + color: @theme_fg_color; background-color: @theme_active_color; } .mate-panel-menu-bar .menuitem *:hover, MatePanelApplet > GtkMenuBar.menubar .menuitem *:hover { - text-shadow: 0 1px @theme_base_color; + text-shadow: none; } /* dropdown menus from applets */ @@ -59,95 +64,175 @@ MatePanelApplet > GtkMenuBar.menubar .menu .menuitem { .mate-panel-menu-bar .menu .menuitem:hover, MatePanelApplet > GtkMenuBar.menubar .menu .menuitem:hover { - color: @theme_fg_active_color; + color: @theme_fg_color; background-color: @theme_active_color; } /* application buttons */ MatePanelApplet .button, -MatePanelApplet .button:hover { - padding: 4px; - +MatePanelApplet .button.flat { + padding: 3px; border-image: none; border-width: 0; border-radius: 0; - background-image: none; - background-color: @theme_base_color; - + background-color: @theme_bg_color; color: @theme_fg_color; text-shadow: none; } +MatePanelApplet .button:hover, +MatePanelApplet .button.flat:hover { + padding: 3px; + border-image: none; + border-width: 0; + border-radius: 0; + background-image: none; + background-color: @theme_fg_color; + color: @theme_bg_color; + text-shadow: none; +} + +MatePanelApplet .button:active:hover, +MatePanelApplet .button:active, +MatePanelApplet .button.flat:active:hover, +MatePanelApplet .button.flat:active, MatePanelApplet .button:checked:hover, MatePanelApplet .button:checked, -MatePanelApplet .button:active:hover, -MatePanelApplet .button:active { +MatePanelApplet .button.flat:checked:hover, +MatePanelApplet .button.flat:checked { + padding: 3px; border-image: none; background-image: none; background-color: @theme_active_color; border-width: 0; border-radius: 0; -} - -/* prelight of WnckPager */ -MatePanelApplet *:hover { - background-image: linear-gradient(to bottom, - shade (@theme_active_color, 2.86), - shade (@theme_active_color, 1.0)); - background-color: @theme_base_color; - color: @theme_fg_active_color; + color: @theme_fg_color; } MatePanelApplet *:checked, MatePanelApplet *:hover:checked, MatePanelApplet *:active, MatePanelApplet *:hover:active { - color: @theme_fg_active_color; - text-shadow: 0 1px @theme_base_color; + padding: 3px; + color: @theme_fg_color; + text-shadow: none; } /*Wncklist */ -WnckTasklist .button { - padding: 4px; - - border-radius: 0px; - border-width: 0px; - border-style: solid; - text-shadow: none; - +WnckTasklist .button, +WnckTasklist .button.flat { + padding: 3px; + border-radius: 0px; + border-width: 0px; + border-style: solid; + text-shadow: none; color: @theme_fg_color; background-image: none; - background-color: @theme_base_color; + background-color: @theme_bg_color; } +WnckTasklist .button:active:hover, +WnckTasklist .button:active, +WnckTasklist .button.flat:active:hover, +WnckTasklist .button.flat:active, WnckTasklist .button:checked:hover, WnckTasklist .button:checked, -WnckTasklist .button:active:hover, -WnckTasklist .button:active { +WnckTasklist .button.flat:checked:hover, +WnckTasklist .button.flat:checked { + padding: 3px; border-image: none; - color: @theme_fg_active_color; + color: @theme_fg_color; background-image: none; background-color: @theme_active_color; border-width: 0; border-radius: 0; } -WnckTasklist .button:hover { +WnckTasklist .button:hover, +WnckTasklist .button.flat:hover { + padding: 3px; border-image: none; - color: @theme_fg_active_color; + color: @theme_bg_color; background-image: none; - background-color: @theme_active_color; + background-color: @theme_fg_color; border-width: 0; border-radius: 0; } +/* set WnckSelector selected menuitem */ +.mate-panel-window-menu-menu-bar .menu .menuitem:hover, +MatePanelApplet > WnckSelector.menubar .menu .menuitem:hover { + background-color: @theme_active_color; + background-image: none; + border-radius: 0px; + text-shadow: none; + color: @theme_fg_color; +} + WnckPager { background-color: lighter(@theme_active_color); } +/* prelight of WnckPager */ +WnckPager:hover { + background-image: linear-gradient(to bottom, + shade (@theme_active_color, 2.86), + shade (@theme_active_color, 1.0)); + background-color: @theme_base_color; + color: @theme_fg_active_color; +} + +ClockBox, +.mate-panel-menu-bar, +MatePanelApplet > GtkMenuBar.menubar { + font: bold; +} + NaTrayApplet { -NaTrayApplet-icon-padding: 12; -NaTrayApplet-icon-size: 16; } +/**************** + * Pluma * + ****************/ + +/* pluma line numbers */ +PlumaView { + background-color: shade (@theme_slider_bg, 0.16); + color: @theme_fg_color; +} + +PlumaWindow GtkStatusbar .frame, +CajaWindow GtkStatusbar .frame { + border-radius: 3px; +} + +/* Pluma status bar */ +PlumaWindow .button.flat { + border-radius: 5px; + padding: 2px 5px; +} + +PlumaWindow .button.flat:hover { + border-radius: 5px; + padding: 2px 5px; +} + +/*********************** + * Mate-Control-Center * + ***********************/ + +ShellWindow .button.flat { + border-image: none; +} + +/* button hover of applications */ +ShellWindow GtkScrolledWindow .button.flat:hover { + background-color: @theme_fg_color; + border-color: @theme_fg_color; + color: @theme_base_color; + border-radius: 12px; +} + -- cgit v1.2.1