diff options
4 files changed, 244 insertions, 101 deletions
diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css index d6c18e23..c88b586a 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; @@ -898,6 +877,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 { @@ -956,30 +939,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; @@ -987,7 +1048,15 @@ 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; @@ -1000,7 +1069,7 @@ GtkScrolledWindow GtkViewport.frame { 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 10ab961d..1417239d 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; @@ -121,6 +122,37 @@ @define-color osd_popover_bg alpha(@osd_base, 0.90); @define-color wm_shadow alpha(black, 0.5); + +@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 */ -GtkIMHtml-hyperlink-color: #000060; diff --git a/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css b/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css index cfb7f1a4..29edc3c3 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css +++ b/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css @@ -60,38 +60,38 @@ PanelAppletFrame, MatePanelAppletFrameDBus, MatePanelAppletContainer, MatePanelApplet { - background-image: none; - background-color: @os_chrome_bg_color; - padding: 0; - color: @os_chrome_fg_color; - text-shadow: none; + background-image: none; + background-color: @theme_base_color; + padding: 0; + color: @theme_fg_color; + text-shadow: none; } MatePanelApplet { - border-width: 0; + border-width: 0; } PanelSeparator { - border-width: 0; - background-image: none; - color: shade (@theme_fg_color, 1.65); - text-shadow: none; + border-width: 0; + background-image: none; + color: @theme_fg_color; + text-shadow: none; } .mate-panel-menu-bar .menuitem, MatePanelApplet > GtkMenuBar.menubar .menuitem { - color: @os_chrome_fg_color; + color: @theme_fg_color; } .mate-panel-menu-bar .menuitem:hover, MatePanelApplet > GtkMenuBar.menubar .menuitem:hover { - color: @os_chrome_selected_fg_color; - background-color: @os_chrome_selected_bg_color; + color: @theme_base_color; + background-color: @theme_active_color; } .mate-panel-menu-bar .menuitem *:hover, MatePanelApplet > GtkMenuBar.menubar .menuitem *:hover { - text-shadow: 0 1px @os_chrome_bg_color; + text-shadow: none; } /* dropdown menus from applets */ @@ -112,30 +112,28 @@ MatePanelApplet > GtkMenuBar.menubar .menu .menuitem { .mate-panel-menu-bar .menu .menuitem:hover, MatePanelApplet > GtkMenuBar.menubar .menu .menuitem:hover { - color: @os_chrome_selected_fg_color; - background-color: @os_chrome_selected_bg_color; + 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: @os_chrome_fg_color; + padding: 4px; + border-radius: 0px; + border-width: 0px; + border-style: solid; + text-shadow: none; + color: @theme_fg_color; background-image: none; - background-color: @os_chrome_bg_color; + background-color: @theme_base_color; } MatePanelApplet .button:active:hover, MatePanelApplet .button:active { border-image: none; background-image: none; - background-color: @os_chrome_selected_bg_color; + background-color: @theme_active_color; border-width: 0; border-radius: 0; } @@ -143,40 +141,40 @@ MatePanelApplet .button:active { MatePanelApplet .button:hover { border-image: none; background-image: none; - background-color: @os_chrome_selected_bg_color; + background-color: @theme_fg_color; + border-color: @theme_fg_color; + color: @theme_base_color; border-width: 0; border-radius: 0; } MatePanelApplet *:hover { - color: @os_chrome_selected_fg_color; + color: @theme_base_color; } MatePanelApplet *:active, MatePanelApplet *:hover:active { - color: @os_chrome_selected_fg_color; - text-shadow: 0 1px @os_chrome_bg_color; + 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: @os_chrome_fg_color; + padding: 4px; + border-radius: 0px; + border-width: 0px; + border-style: solid; + text-shadow: none; + color: @theme_fg_color; background-image: none; - background-color: @os_chrome_bg_color; + background-color: @theme_base_color; } WnckTasklist .button:active:hover, WnckTasklist .button:active { border-image: none; background-image: none; - background-color: @os_chrome_selected_bg_color; + background-color: @theme_active_color; border-width: 0; border-radius: 0; } @@ -184,7 +182,9 @@ WnckTasklist .button:active { WnckTasklist .button:hover { border-image: none; background-image: none; - background-color: @os_chrome_selected_bg_color; + background-color: @theme_fg_color; + border-color: @theme_fg_color; + color: @theme_base_color; border-width: 0; border-radius: 0; } @@ -192,37 +192,37 @@ WnckTasklist .button:hover { ClockBox, .mate-panel-menu-bar.menubar, MatePanelApplet > GtkMenuBar.menubar { - font: normal; + font: bold; } WnckPager { - background-image: none; - border-color: transparent; - background-color: shade(@theme_base_color, 0.9); - text-shadow: none; + background-image: none; + border-color: transparent; + background-color: shade(@theme_base_color, 0.9); + text-shadow: none; } /* prelight of WnckPager */ -MatePanelApplet *:hover { - background-image: linear-gradient(to bottom, - shade (@theme_selected_bg_color, 2.86), - shade (@theme_selected_bg_color, 1.0)); - background-color: @theme_base_color; +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; -}*/ +.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;*/ + 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; } /**************** @@ -236,3 +236,45 @@ TerminalWindow .entry { 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 @@ <description>Simple low-overhead default theme that comes with Metacity.</description> </info> -<frame_geometry name="normal"> +<frame_geometry name="normal" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false"> <distance name="left_width" value="6"/> <distance name="right_width" value="6"/> <distance name="bottom_height" value="7"/> - <distance name="left_titlebar_edge" value="6"/> - <distance name="right_titlebar_edge" value="6"/> + <distance name="left_titlebar_edge" value="4"/> + <distance name="right_titlebar_edge" value="1"/> <aspect_ratio name="button" value="1.0"/> - <distance name="title_vertical_pad" value="3"/> + <distance name="title_vertical_pad" value="8"/> <border name="title_border" left="3" right="4" top="4" bottom="3"/> <border name="button_border" left="0" right="0" top="1" bottom="1"/> </frame_geometry> |