From 0aaaadcc6412ff6676edca89c7d080397970a314 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 31 May 2014 12:46:14 +0200 Subject: TraditionalGreen GTK3: update to GTK+-3.12 --- .../TraditionalGreen/gtk-3.0/Makefile.am | 1 + .../TraditionalGreen/gtk-3.0/applications.css | 63 ------ .../TraditionalGreen/gtk-3.0/gtk-variant.css | 4 +- .../TraditionalGreen/gtk-3.0/gtk-widgets-img.css | 1 + .../TraditionalGreen/gtk-3.0/gtk-widgets.css | 144 +++++++++---- desktop-themes/TraditionalGreen/gtk-3.0/gtk.css | 1 + .../TraditionalGreen/gtk-3.0/mate-applications.css | 225 +++++++++++++++++++++ .../TraditionalGreen/gtk-3.0/settings.ini | 2 +- .../metacity-1/metacity-theme-1.xml | 10 +- 9 files changed, 338 insertions(+), 113 deletions(-) create mode 100644 desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/Makefile.am b/desktop-themes/TraditionalGreen/gtk-3.0/Makefile.am index f05aed0e..e8824535 100644 --- a/desktop-themes/TraditionalGreen/gtk-3.0/Makefile.am +++ b/desktop-themes/TraditionalGreen/gtk-3.0/Makefile.am @@ -8,6 +8,7 @@ theme_DATA = \ gtk-variant.css \ gtk-widgets.css \ gtk-widgets-img.css \ + mate-applications.css \ settings.ini EXTRA_DIST = $(theme_DATA) diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/applications.css b/desktop-themes/TraditionalGreen/gtk-3.0/applications.css index 42140447..029a5495 100644 --- a/desktop-themes/TraditionalGreen/gtk-3.0/applications.css +++ b/desktop-themes/TraditionalGreen/gtk-3.0/applications.css @@ -66,69 +66,6 @@ GtkIconView.documents-main-view.check { border-radius: 3px; } -/*************** - * gnome-panel * - ***************/ - -.gnome-panel-menu-bar, -PanelApplet > GtkMenuBar.menubar, -PanelToplevel, -PanelWidget, -PanelApplet { - background-color: @os_chrome_bg_color; - background-image: none; - color: @os_chrome_fg_color; -} - -.gnome-panel-menu-bar, -PanelApplet > GtkMenuBar.menubar, -PanelApplet > GtkMenuBar.menubar.menuitem, -PanelMenuBar.menubar, -PanelMenuBar.menubar.menuitem { - -PanelMenuBar-icon-visible: true; -} - -PanelAppletFrame { - background-color: @applet_frame_bg_color; - background-image: none; - color: @os_chrome_fg_color; -} - -PanelApplet .button, -PanelApplet .button:active, -PanelApplet .button:hover, -PanelApplet .button:hover:active { - border-image: url("img/border-gnome-panel-button.svg") 3 3 4 3 / 3px 3px 4px 3px repeat; -} - -PanelApplet .menu .menuitem *:active { - color: @theme_text_color; -} - -PanelApplet .menu .menuitem *:selected { - color: @theme_selected_fg_color; -} - -PanelWidget > .button -{ - padding: 0; -} - -WnckPager { - background-color: @pager_bg_color; -} - -NaTrayApplet { - -NaTrayApplet-icon-padding: 7; - -NaTrayApplet-icon-size: 22; -} - -GsmFailWhaleDialog { - background-color: @os_chrome_bg_color; - background-image: none; - color: @os_chrome_fg_color; -} - /****************** * gnome-terminal * ******************/ diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-variant.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-variant.css index f72119c0..41a8a7f2 100644 --- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-variant.css +++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-variant.css @@ -37,8 +37,8 @@ /* Core colors are only used in the current file, as bases for other color declarations. */ -@define-color core_color_a #B9C0A9; /* Core color for blue widgets in Clearlooks-Phenix. */ -@define-color core_color_b #edeceb; /* Core color for gray widgets in Clearlooks-Phenix. */ +@define-color core_color_a #B9C0A9; /* Core color for green widgets in TraditionalGreen. */ +@define-color core_color_b #edeceb; /* Core color for gray widgets in TraditionalGreen. */ /******************************************** * End of configuration for color variants. * diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets-img.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets-img.css index f3ea71fb..eeff8574 100644 --- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets-img.css +++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets-img.css @@ -386,6 +386,7 @@ GtkComboBox.combobox-entry .button, GtkSwitch.trough, /* generic button borders */ .button, +.titlebar .titlebutton:hover, .primary-toolbar .button.raised, .primary-toolbar .raised .button, .primary-toolbar GtkComboBox .button, diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css index 95b54e25..e8cb82fb 100644 --- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css @@ -63,7 +63,11 @@ GtkWindow { GtkImage, GtkImage:insensitive, GtkLabel, -GtkLabel:insensitive { +GtkLabel:insensitive, +GtkBox, +GtkBox:insensitive, +GtkGrid, +GtkGrid:insensitive { background-color: transparent; } @@ -416,7 +420,7 @@ GtkScale.mark { border-color: @border_color; border-style: solid; border-radius: 3px; - background-color: @theme_base_color; + background-color: @theme_bg_color; padding: 0; } @@ -454,7 +458,13 @@ GtkComboBox.combobox-entry .button { border-color: transparent; } +/* We want anything inside the buttons to use their background */ +.button * { + background-color: transparent; +} + /* We may want a background for focused buttons, but in the meantime let's remove it too */ +GtkMenuToolButton *, .primary-toolbar .button, .primary-toolbar .button:insensitive { background-image: none; @@ -535,6 +545,7 @@ GtkComboBox.combobox-entry .button { .toolbar GtkComboBox .button:focus, GtkComboBox.combobox-entry .button, .primary-toolbar GtkComboBox.combobox-entry .button, +.titlebar .titlebutton:hover, GtkColorChooserWidget #add-color-button { background-image: -gtk-gradient (linear, left top, @@ -680,6 +691,7 @@ GtkComboBox.combobox-entry .button:insensitive { border-radius: 3px; border-style: solid; border-width: 1px; + background-color: transparent; } .notebook tab.top { @@ -770,6 +782,10 @@ GtkComboBox.combobox-entry .button:insensitive { @notebook_active_tab_gradient_b); } +.notebook tab * { + background-color: transparent; +} + /* close button styling */ .notebook tab .button, .notebook tab .button:active, @@ -1042,22 +1058,19 @@ GtkComboBox .button *:hover { *********/ /* combobox menus */ -GtkTreeMenu.menu { - background-color: @theme_base_color; +GtkTreeMenu.menu, +GtkTreeMenu.menu * { + background-color: @menu_bg_color; } GtkTreeMenu .menuitem { padding: 2px; } -GtkTreeMenu .menuitem * { - color: @theme_text_color; -} - .menu { background-color: @menu_bg_color; color: @menu_fg_color; - padding: 0; + padding: 1px; border-style: solid; border-width: 1px; border-color: @menu_border_color; @@ -1065,7 +1078,7 @@ GtkTreeMenu .menuitem * { .menu.button { background-image: none; - background-color: @theme_base_color; + background-color: @menu_bg_color; color: @internal_element_color; border-image: none; @@ -1092,7 +1105,7 @@ GtkTreeMenu .menuitem * { /* this controls the general appearance of the menubar */ .menubar { border-style: none; - padding: 4px; + padding: 0px; -GtkWidget-window-dragging: true; -GtkMenuBar-internal-padding: 1; background-image: -gtk-gradient (linear, @@ -1115,6 +1128,7 @@ GtkTreeMenu .menuitem * { border-width: 1px 1px 0px; border-color: @menubar_menuitem_hover_border_color; border-radius: 3px 3px 0 0; + color: @menubar_menuitem_hover_color; background-image: -gtk-gradient (linear, left top, left bottom, @@ -1132,6 +1146,11 @@ GtkTreeMenu .menuitem * { .menu .menuitem { -GtkMenuItem-arrow-scaling: 0.5; padding: 4px; + background-color: @menu_bg_color; +} + +.menu .menuitem > * { + background-color: transparent; } .menu .menuitem:hover { @@ -1144,13 +1163,6 @@ GtkTreeMenu .menuitem:hover, border-style: solid; border-width: 1px; border-color: @menubar_menuitem_hover_border_color; - background-image: -gtk-gradient (linear, - left top, - left bottom, - from (@menubar_menuitem_hover_gradient_a), - color-stop (0.50, @menubar_menuitem_hover_gradient_b), - color-stop (0.50, @menubar_menuitem_hover_gradient_c), - to (@menubar_menuitem_hover_gradient_d)); } GtkTreeMenu .menuitem *:hover, @@ -1159,6 +1171,13 @@ GtkTreeMenu .menuitem *:hover, .menu .menuitem:hover, .menu .menuitem *:hover { color: @theme_selected_fg_color; + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (@menubar_menuitem_hover_gradient_a), + color-stop (0.50, @menubar_menuitem_hover_gradient_b), + color-stop (0.50, @menubar_menuitem_hover_gradient_c), + to (@menubar_menuitem_hover_gradient_d)); } .menu .menuitem:insensitive, @@ -1185,6 +1204,7 @@ GtkTreeMenu .menuitem *:hover, .menuitem.separator { color: @menu_separator_color; + padding: 3px 1px 3px 1px; -GtkMenuItem-horizontal-padding: 0; } @@ -1348,29 +1368,11 @@ GtkCheckButton:selected:focus { ***********/ .sidebar, -.sidebar .view { +.sidebar .view, +.sidebar GtkScrolledWindow { background-color: @sidebar_bg_color; } -.sidebar .scrollbar.trough { - border-radius: 100px; - border-style: solid; - border-width: 2px; - border-color: transparent; -} - -.sidebar .scrollbar.trough { - background-color: shade(@sidebar_bg_color, 0.8); -} - -.sidebar .scrollbar.slider { - background-color: @sidebar_bg_color; -} - -.sidebar .scrollbar.slider:hover { - background-color: @theme_base_color; -} - .sidebar .radio, .sidebar .radio:focus, .sidebar .radio:selected { @@ -1719,25 +1721,25 @@ GtkInfoBar:last-child, border-style: solid; } -.info { +.info > * { background-color: @info_bg_color; color: @info_fg_color; border-color: darker(@info_bg_color); } -.warning { +.warning > * { background-color: @warning_bg_color; color: @warning_fg_color; border-color: darker(@warning_bg_color); } -.question { +.question > * { background-color: @question_bg_color; color: @question_fg_color; border-color: darker(@question_bg_color); } -.error { +.error > * { background-color: @error_bg_color; color: @error_fg_color; border-color: darker(@error_bg_color); @@ -1763,3 +1765,61 @@ GtkInfoBar:last-child, background-color: transparent; } +/************ + * Titlebar * + ************/ + +.titlebar { + background-image: linear-gradient(to bottom, + @theme_base_color, + @theme_bg_color); + background-color: transparent; + border-radius: 7px 7px 0px 0px; + border-bottom: 1px solid; + border-color: shade(@border_color, 1.30); +} + +.titlebar > * { + background: none; +} + +.tiled .titlebar { + border-radius: 0; +} + +.maximized .titlebar { + border-radius: 0; +} + +.titlebar .title { + font: Bold; +} + +.titlebar .titlebutton { + background: none; + border-image: none; + padding: 5px 5px 6px 5px; +} + +.window-frame { + border-width: 1px; + border-radius: 7px 7px 0 0; + border-style: solid; + margin: 10px; +} + +/************ + * Popovers * + ************/ + +GtkPopover { + border: 1px solid; + border-radius: 7px; + border-color: @border_color; + background-clip: border-box; +} + +GtkPopover > .toolbar, +GtkPopover.osd > .toolbar .button { + background-color: transparent; +} diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk.css index c916fc5a..6dd43210 100644 --- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk.css +++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk.css @@ -394,4 +394,5 @@ @import url("gtk-widgets-img.css"); @import url("gtk-widgets.css"); @import url("applications.css"); +@import url("mate-applications.css"); diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css new file mode 100644 index 00000000..5ee4a146 --- /dev/null +++ b/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css @@ -0,0 +1,225 @@ +/************ + * Caja * + ************/ + + +.caja-desktop.caja-canvas-item { + color: @theme_base_color; + text-shadow: 1px 1px alpha (@theme_fg_color, 0.8); +} + +.caja-desktop.caja-canvas-item:active, +.caja-desktop.caja-canvas-item:prelight, +.caja-desktop.caja-canvas-item:selected { + text-shadow: none; +} + + +.caja-desktop .entry { + background-image: none; + border-image: none; +} + +/*************** + * mate-panel * + ***************/ + +.mate-panel-menu-bar, +MatePanelApplet > GtkMenuBar.menubar, +PanelToplevel, +PanelWidget, +PanelFrame, +PanelAppletFrame, +MatePanelAppletFrameDBus, +MatePanelAppletContainer, +MatePanelApplet { + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (@menubar_gradient_a), + color-stop (0.50, @menubar_gradient_b), + to (@menubar_gradient_c)); + background-color: @theme_bg_color; + padding: 0px; + color: @theme_fg_color; + text-shadow: none; +} + +/* set selected menubar button */ +PanelMenuBar.menubar .menuitem:hover { + background-image: none; + background-color: shade(@theme_selected_bg_color, 1.1); + border-style: none; + border-image: none; + /* join menuitem to menu */ + border-radius: 3px 3px 0px 0px; + border-width: 0px; + text-shadow: none; + padding: 3px 5px; +} + +/* set selected menubar menuitem */ +PanelMenuBar.menubar .menu .menuitem:active:hover, +PanelMenuBar.menubar .menu .menuitem:hover { + background-image: none; + color: @theme_text_color; + border-style: solid; + border-width: 1px; + border-radius: 3px; + border-color: alpha(@theme_selected_bg_color, 0.1); + padding: 3px 5px; +} + +MatePanelApplet { + border-width: 0; +} + +PanelSeparator { + border-width: 0; + background-image: none; + color: shade (@theme_bg_color, 0.75); + text-shadow: none; +} + +/* desktop-applet, clockapplet, drivemount, character-map, +dictionary */ +MatePanelApplet .button { + /* Due to a bug somewhere in gtk or cairo, + a padding of zero (or even one) doesn't work always!!! */ + padding: 0px; + + border-radius: 3px; + border-width: 1px; + border-style: solid; + text-shadow: none; + + color: @theme_fg_color; + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (@button_gradient_a), + color-stop (0.50, @button_gradient_b), + color-stop (0.50, @button_gradient_c), + to (@button_gradient_d)); +} + +MatePanelApplet .button:active:hover, +MatePanelApplet .button:active { + border-style: solid; + background-image: linear-gradient(to bottom, + @button_active_gradient_a, + @button_active_gradient_b 3px, + @button_active_gradient_c 4px, + @button_active_gradient_d 50%, + @button_active_gradient_e 50%, + @button_active_gradient_f); +} + +MatePanelApplet .button:hover { + border-style: solid; + background-image: linear-gradient(to bottom, + @button_gradient_color_b, + @button_gradient_color_a); +} + +/*Wncklist */ +WnckTasklist .button { + padding: 0px; + border-radius: 3px; + border-width: 1px; + border-style: solid; + text-shadow: none; + + color: @theme_fg_color; + background-color: transparent; + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (@button_gradient_a), + color-stop (0.50, @button_gradient_b), + color-stop (0.50, @button_gradient_c), + to (@button_gradient_d)); +} + +WnckTasklist .button:active:hover, +WnckTasklist .button:active { + border-style: solid; + background-color: transparent; + background-image: linear-gradient(to bottom, + @button_active_gradient_a, + @button_active_gradient_b 3px, + @button_active_gradient_c 4px, + @button_active_gradient_d 50%, + @button_active_gradient_e 50%, + @button_active_gradient_f); +} + +WnckTasklist .button:hover { + border-style: solid; + background-color: transparent; + background-image: linear-gradient(to bottom, + @button_hover_gradient_c); +} + +/* set selected button WnckSelector */ +.mate-panel-window-menu-menu-bar .menuitem:hover, +MatePanelApplet > WnckSelector.menubar .menuitem:hover { + color: @theme_fg_color; + border-style: solid; + background-image: linear-gradient(to bottom, + @button_active_gradient_a, + @button_active_gradient_b 3px, + @button_active_gradient_c 4px, + @button_active_gradient_d 50%, + @button_active_gradient_e 50%, + @button_active_gradient_f); +} + +/* set WnckSelector selected menuitem */ +.mate-panel-window-menu-menu-bar .menu .menuitem:hover, +MatePanelApplet > WnckSelector.menubar .menu .menuitem:hover { + background-image: none; + background-color: shade(@theme_selected_bg_color, 1.1); + color: @theme_text_color; + border-style: solid; + border-width: 1px; + border-radius: 3px; + border-image: url("assets/menu-border.svg") 2 / 2px stretch; + /*border-color: alpha(@theme_selected_bg_color, 0.1);*/ +} + +ClockBox, +.mate-panel-menu-bar.menubar, +MatePanelApplet > GtkMenuBar.menubar { + font: normal; +} + +WnckPager { + background-image: none; + border-color: transparent; + background-color: shade(@theme_bg_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; +} + +/* Classic icon style */ +/*.mate-panel-menu-bar { + -PanelMenuBar-icon-visible: true; +}*/ + +NaTrayApplet { + background-image: none; + background-color: @theme_bg_color; + padding: 0; + color: @theme_fg_color; + text-shadow: none; +/* -NaTrayApplet-icon-padding: 12; + -NaTrayApplet-icon-size: 16;*/ +} diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/settings.ini b/desktop-themes/TraditionalGreen/gtk-3.0/settings.ini index cc3237c1..80923690 100644 --- a/desktop-themes/TraditionalGreen/gtk-3.0/settings.ini +++ b/desktop-themes/TraditionalGreen/gtk-3.0/settings.ini @@ -2,4 +2,4 @@ gtk-color-scheme = "base_color:#ffffff\nbg_color:#edeceb\nfg_color:#000000\nselected_bg_color:#B9C0A9\nselected_fg_color:#42453E\ntooltip_bg_color:#EAF5B5\ntooltip_fg_color:#000000\ntext_color:#1a1a1a\nlink_color:#0000ee\nvisited_link_color:#551a8b" gtk-auto-mnemonics = 0 gtk-visible-focus = automatic - +gtk-primary-button-warps-slider = false diff --git a/desktop-themes/TraditionalGreen/metacity-1/metacity-theme-1.xml b/desktop-themes/TraditionalGreen/metacity-1/metacity-theme-1.xml index 612f59f1..08825231 100644 --- a/desktop-themes/TraditionalGreen/metacity-1/metacity-theme-1.xml +++ b/desktop-themes/TraditionalGreen/metacity-1/metacity-theme-1.xml @@ -349,7 +349,7 @@ - + <title color="blend/gtk:fg[NORMAL]/gtk:text[NORMAL]/5.45" x="4 `max` (width-title_width)/2" y="0 `max` ((height-title_height)/2)"/> </draw_ops> <draw_ops name="title"> @@ -463,12 +463,12 @@ <!-- fill gradient --> <gradient type="vertical" x="3" y="3" width="width-6" height="(height)/2-1"> - <color value="shade/gtk:bg[NORMAL]/1.15"/> - <color value="shade/gtk:bg[NORMAL]/1.07"/> + <color value="shade/gtk:bg[NORMAL]/0.95"/> + <color value="shade/gtk:bg[NORMAL]/0.87"/> </gradient> <gradient type="vertical" x="3" y="(height)/2" width="width-6" height="(height)/2-2"> - <color value="shade/gtk:bg[NORMAL]/1.05"/> - <color value="shade/gtk:bg[NORMAL]/0.97"/> + <color value="shade/gtk:bg[NORMAL]/0.85"/> + <color value="shade/gtk:bg[NORMAL]/0.77"/> </gradient> <!-- bottom border smooth effect --> -- cgit v1.2.1