From bd70ba5f7fd9947e5dfa34e3d1619dbf75e61724 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Tue, 10 Feb 2015 17:12:50 +0100 Subject: ContrastHigh GTK3: adjust flat buttons in m-c-c - add arrows to scrollbars - adjust metacity theme - rework mate-panel settings - change line numbers bg in pluma - use round corners for GtkStatusbar frames in pluma, caja - use round corners for notebook frames - add mate-applications.css --- desktop-themes/ContrastHigh/gtk-3.0/Makefile.am | 1 + .../ContrastHigh/gtk-3.0/gtk-widgets.css | 147 ++++++++--- desktop-themes/ContrastHigh/gtk-3.0/gtk.css | 75 ++++++ .../ContrastHigh/gtk-3.0/mate-applications.css | 286 +++++++++++++++++++++ .../ContrastHigh/metacity-1/metacity-theme-1.xml | 8 +- 5 files changed, 478 insertions(+), 39 deletions(-) create mode 100644 desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css diff --git a/desktop-themes/ContrastHigh/gtk-3.0/Makefile.am b/desktop-themes/ContrastHigh/gtk-3.0/Makefile.am index f5153eee..13aa9f08 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/Makefile.am +++ b/desktop-themes/ContrastHigh/gtk-3.0/Makefile.am @@ -4,6 +4,7 @@ theme_DATA = \ resize-grip.svg \ gtk.css \ gtk-widgets.css \ + mate-applications.css \ settings.ini EXTRA_DIST = $(theme_DATA) diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css index 568f3b60..85e40988 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css @@ -1,26 +1,3 @@ -/* common color definitions */ - -@define-color warning_color #faad3d; -@define-color warning_bg_color @warning_color; -@define-color warning_fg_color black; - -@define-color question_color #8aadd4; -@define-color question_bg_color @question_color; -@define-color question_fg_color white; - -@define-color error_color #ed3636; -@define-color error_bg_color @error_color; -@define-color error_fg_color white; - -@define-color error_color #cc0000; -@define-color success_color #4e9a06; - -/* fallback mode */ -@define-color os_chrome_bg_color black; -@define-color os_chrome_fg_color #ccc; -@define-color os_chrome_selected_bg_color #333; -@define-color os_chrome_selected_fg_color white; - * { -GtkRange-stepper-size: 2; -GtkScale-slider-length: 28; @@ -289,9 +266,7 @@ GtkLevelBar.vertical { } /* ie. mate-control-center */ -.button.flat, -.button.flat:hover, -.button.flat:active:hover { +.button.flat { padding: 0px; border-color: transparent; background-color: transparent; @@ -303,6 +278,10 @@ GtkLevelBar.vertical { border-image: none; } +.button.flat.hover { + border-radius: 3px; +} + .button:active { background-color: @theme_button_active_bg; color: @theme_base_color; @@ -882,6 +861,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 tab { @@ -940,30 +923,108 @@ 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; +} - border-width: 0; - border-color: transparent; +.scrollbar.trough, +.scrollbar.trough.vertical, +.sidebar .scrollbar.trough, +.osd .scrollbar.trough { + background-image: none; + background-color: @theme_internal_bg; + border-left-width: 1px; + border-style: solid; + border-color: @theme_internal_bg; border-radius: 0; + border-image: none; } -.scrollbars-junction { +.scrollbar.trough.horizontal { + background-image: none; background-color: @theme_internal_bg; + border-top-width: 1px; + border-style: solid; + border-color: @theme_internal_bg; + border-radius: 0; + border-image: none; } -.scrollbar.slider { - background-color: @theme_slider_bg; +.scrollbar.button, +.scrollbar.button:active, +.scrollbar.button:active:hover, +.scrollbar.button:insensitive { + border-style: none; + border-image: none; + border-radius: 0; + background-image: none; + background-color: transparent; +} + +.scrollbar.button:active, +.scrollbar.button:active:hover { + background-color: alpha(shade(@scrollbar_trough, 0.8), 0.5); +} + +.scrollbar.button.top:hover { + box-shadow: inset 0 -1px mix(@theme_slider_bg, @scrollbar_trough, 0.8); +} + +.scrollbar.button.bottom:hover { + box-shadow: inset 0 1px mix(@theme_slider_bg, @scrollbar_trough, 0.8); +} + +.scrollbar.button.right:hover { + box-shadow: inset 1px 0 mix(@theme_slider_bg, @scrollbar_trough, 0.8); +} + +.scrollbar.button.left:hover { + box-shadow: inset -1px 0 mix(@theme_slider_bg, @scrollbar_trough, 0.8); +} + +.scrollbar.button { + color: @theme_fg_color; +} + +.scrollbar.button:hover { + color: @theme_fg_color; +} + +.scrollbar.button:insensitive { + color: @theme_insensitive_color; +} + +.scrollbar.button:active { + color: @theme_fg_color; +} +.scrollbar.slider, +.sidebar .scrollbar.slider, +.osd .scrollbar.slider { + background-color: @theme_slider_bg; border-style: solid; border-radius: 12px; border-width: 3px; @@ -971,12 +1032,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/ContrastHigh/gtk-3.0/gtk.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk.css index 6ef136ac..55c749eb 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/gtk.css +++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk.css @@ -1,4 +1,5 @@ @define-color theme_base_color #fff; +@define-color theme_bg_color @theme_base_color; @define-color theme_fg_color #000; @define-color theme_active_color #555753; @define-color theme_border_color @theme_active_color; @@ -72,6 +73,79 @@ @define-color wm_button_pressed_bg @theme_fg_color; @define-color wm_button_prelight_fg @theme_base_color; @define-color wm_button_pressed_fg @theme_base_color; +@define-color wm_shadow alpha(black, 0.5); + +/******* + * OSD * + *******/ +@define-color osd_highlight #ffffff; +@define-color osd_lowlight #525252; +@define-color osd_base #212526; + +@define-color osd_fg #ededed; +@define-color osd_bg alpha(@osd_base, 0.80); + +@define-color osd_text_shadow alpha(black, 0.75); + +@define-color osd_toolbar_bg_a alpha(@osd_base, 0.80); +@define-color osd_toolbar_bg_b alpha(#101010, 0.80); +@define-color osd_toolbar_bg_c alpha(shade(@osd_base, 1.02), 0.80); + +@define-color osd_button_bg_a alpha(@osd_highlight, 0.16); +@define-color osd_button_bg_b alpha(@osd_lowlight, 0.05); +@define-color osd_button_bg_c alpha(@osd_highlight, 0.12); + +@define-color osd_button_bg_insensitive alpha(@osd_highlight, 0.25); +@define-color osd_button_bg_insensitive_active alpha(@osd_highlight, 0.16); + +@define-color osd_button_bg_hover_a alpha(@osd_highlight, 0.28); +@define-color osd_button_bg_hover_b alpha(@osd_lowlight, 0.14); +@define-color osd_button_bg_hover_c alpha(@osd_highlight, 0.14); + +@define-color osd_button_bg_active_a alpha(@osd_lowlight, 0.18); +@define-color osd_button_bg_active_b alpha(@osd_highlight, 0.23); +@define-color osd_button_bg_active_c alpha(@osd_lowlight, 0.17); + +@define-color osd_button_fg shade(@osd_fg, 0.80); +@define-color osd_button_fg_hover shade(@osd_fg, 0.96); +@define-color osd_button_fg_active shade(@osd_fg, 1.10); +@define-color osd_button_fg_insensitive shade(@osd_fg, 0.70); + +@define-color osd_button_border alpha(@osd_highlight, 0.40); +@define-color osd_button_inset shade(@osd_fg, 0.67); +@define-color osd_button_shadow alpha(black, 0.35); + +@define-color osd_trough_bg alpha(@osd_button_fg, 0.10); + +@define-color scrollbar_trough shade(@theme_bg_color, 0.98); + +/************************ + * Info, Warnings, etc. * + ************************/ + +@define-color warning_color #faad3d; +@define-color warning_bg_color @warning_color; +@define-color warning_fg_color black; + +@define-color question_color #8aadd4; +@define-color question_bg_color @question_color; +@define-color question_fg_color white; + +@define-color error_color #ed3636; +@define-color error_bg_color @error_color; +@define-color error_fg_color white; + +@define-color error_color #cc0000; +@define-color success_color #4e9a06; + +/***************** + * fallback mode * + *****************/ + +@define-color os_chrome_bg_color black; +@define-color os_chrome_fg_color #ccc; +@define-color os_chrome_selected_bg_color #333; +@define-color os_chrome_selected_fg_color white; * { /* Pidgin */ @@ -89,3 +163,4 @@ } @import url("gtk-widgets.css"); +@import url("mate-applications.css"); diff --git a/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css b/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css new file mode 100644 index 00000000..d86dc723 --- /dev/null +++ b/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css @@ -0,0 +1,286 @@ +/************ + * Caja * + ************/ + +.caja-cluebar-label { + color: @theme_base_color; + font: bold; +} + +CajaWindow .sidebar .frame { + border-style: none; +} + +CajaNotebook.notebook { + border-right-width: 0; + border-left-width: 0; + border-bottom-width: 0; +} + +CajaNotebook .frame { + border-width: 0; +} + +CajaWindow .pane-separator { + border-width: 0 1px 0 0; + border-style: solid; + border-color: @theme_border_color; +} + +.caja-desktop.caja-canvas-item { + color: @theme_base_color; + text-shadow: 1px 1px black; +} + +.caja-desktop.caja-canvas-item:selected { + color: @theme_base_color; +} + +.caja-desktop.caja-canvas-item:backdrop { + background-color: @theme_fg_color; +} + +.caja-desktop.caja-canvas-item:active, +.caja-desktop.caja-canvas-item:prelight, +.caja-desktop.caja-canvas-item:selected { + text-shadow: none; +} + +/**************** + * Mate-Panel * + ****************/ + +/* the panel bar itself */ +.mate-panel-menu-bar, +MatePanelApplet > GtkMenuBar.menubar, +PanelToplevel, +PanelWidget, +PanelFrame, +PanelAppletFrame, +MatePanelAppletFrameDBus, +MatePanelAppletContainer, +MatePanelApplet { + background-image: none; + background-color: @theme_base_color; + padding: 0; + color: @theme_fg_color; + text-shadow: none; +} + +MatePanelApplet { + border-width: 0; +} + +PanelSeparator { + border-width: 0; + background-image: none; + color: @theme_fg_color; + text-shadow: none; +} + +.mate-panel-menu-bar .menuitem, +MatePanelApplet > GtkMenuBar.menubar .menuitem { + color: @theme_fg_color; +} + +.mate-panel-menu-bar .menuitem:hover, +MatePanelApplet > GtkMenuBar.menubar .menuitem:hover { + color: @theme_base_color; + background-color: @theme_active_color; +} + +.mate-panel-menu-bar .menuitem *:hover, +MatePanelApplet > GtkMenuBar.menubar .menuitem *:hover { + text-shadow: none; +} + +/* dropdown menus from applets */ +.mate-panel-menu-bar .menu, +MatePanelApplet > GtkMenuBar.menubar .menu { + font: regular; +} + +.mate-panel-menu-bar .menu *:hover, +MatePanelApplet > GtkMenuBar.menubar .menu *:hover { + text-shadow: none; +} + +.mate-panel-menu-bar .menu .menuitem, +MatePanelApplet > GtkMenuBar.menubar .menu .menuitem { + color: @theme_fg_color; +} + +.mate-panel-menu-bar .menu .menuitem:hover, +MatePanelApplet > GtkMenuBar.menubar .menu .menuitem:hover { + color: @theme_base_color; + background-color: @theme_active_color; +} + +/* desktop-applet, clockapplet, drivemount, character-map, +dictionary */ +MatePanelApplet .button { + padding: 4px; + border-radius: 0px; + border-width: 0px; + border-style: solid; + text-shadow: none; + color: @theme_fg_color; + background-image: none; + background-color: @theme_base_color; +} + +MatePanelApplet .button:checked:hover, +MatePanelApplet .button:checked, +MatePanelApplet .button:active:hover, +MatePanelApplet .button:active { + border-image: none; + background-image: none; + background-color: @theme_active_color; + border-width: 0; + border-radius: 0; +} + +MatePanelApplet .button:hover { + border-image: none; + background-image: none; + background-color: @theme_fg_color; + border-color: @theme_fg_color; + color: @theme_base_color; + border-width: 0; + border-radius: 0; +} + +MatePanelApplet *:hover { + color: @theme_base_color; +} + +MatePanelApplet *:checked, +MatePanelApplet *:hover:checked, +MatePanelApplet *:active, +MatePanelApplet *:hover:active { + color: @theme_base_color; + text-shadow: none; +} + +/*Wncklist */ +WnckTasklist .button { + padding: 4px; + border-radius: 0px; + border-width: 0px; + border-style: solid; + text-shadow: none; + color: @theme_fg_color; + background-image: none; + background-color: @theme_base_color; +} + +WnckTasklist .button:checked:hover, +WnckTasklist .button:checked, +WnckTasklist .button:active:hover, +WnckTasklist .button:active { + border-image: none; + background-image: none; + background-color: @theme_active_color; + border-width: 0; + border-radius: 0; +} + +WnckTasklist .button:hover { + border-image: none; + background-image: none; + background-color: @theme_fg_color; + border-color: @theme_fg_color; + color: @theme_base_color; + border-width: 0; + border-radius: 0; +} + +ClockBox, +.mate-panel-menu-bar.menubar, +MatePanelApplet > GtkMenuBar.menubar { + font: bold; +} + +WnckPager { + background-image: none; + border-color: transparent; + background-color: shade(@theme_base_color, 0.9); + text-shadow: none; +} + +/* 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: transparent; +} + +/* Classic icon style */ +.mate-panel-menu-bar { + -PanelMenuBar-icon-visible: true; +} + +NaTrayApplet { + background-image: none; + background-color: @theme_base_color; + padding: 0; + color: @theme_fg_color; + text-shadow: none; + -NaTrayApplet-icon-padding: 12; + -NaTrayApplet-icon-size: 16; +} + +/**************** + * Mate-Terminal * + ****************/ + +/* Background mate-terminal, this isn't the normal way to style that! */ +TerminalWindow .entry { + -TerminalWindow-background-darkness: 0.95; + background-color: shade (@theme_base_color, 0.95); + color: @theme_fg_color; +} + +/**************** + * Pluma * + ****************/ + +/* pluma line numbers */ +PlumaView { + background-color: @theme_slider_bg; + color: @theme_base_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; +} + diff --git a/desktop-themes/ContrastHigh/metacity-1/metacity-theme-1.xml b/desktop-themes/ContrastHigh/metacity-1/metacity-theme-1.xml index 0985b76b..b8b410df 100644 --- a/desktop-themes/ContrastHigh/metacity-1/metacity-theme-1.xml +++ b/desktop-themes/ContrastHigh/metacity-1/metacity-theme-1.xml @@ -8,14 +8,14 @@ Simple low-overhead default theme that comes with Metacity. - + - - + + - + -- cgit v1.2.1