From a506e577ac1aef4ecda18f5e28325c80470b0a40 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 19 Oct 2014 15:17:32 +0200 Subject: Traditional themes GTK3: update to support GTK3-3.10 --- desktop-themes/TraditionalOkTest/COPYING | 1 - .../TraditionalOkTest/gtk-3.0/applications.css | 34 ++++- .../TraditionalOkTest/gtk-3.0/gtk-widgets-img.css | 1 + .../TraditionalOkTest/gtk-3.0/gtk-widgets.css | 148 +++++++++++++++------ .../TraditionalOkTest/gtk-3.0/img/Makefile.am | 1 - .../TraditionalOkTest/gtk-3.0/img/border-error.svg | 104 --------------- .../TraditionalOkTest/gtk-3.0/settings.ini | 2 +- 7 files changed, 139 insertions(+), 152 deletions(-) delete mode 100644 desktop-themes/TraditionalOkTest/gtk-3.0/img/border-error.svg (limited to 'desktop-themes/TraditionalOkTest') diff --git a/desktop-themes/TraditionalOkTest/COPYING b/desktop-themes/TraditionalOkTest/COPYING index 10926e87..94a9ed02 100644 --- a/desktop-themes/TraditionalOkTest/COPYING +++ b/desktop-themes/TraditionalOkTest/COPYING @@ -672,4 +672,3 @@ may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . - diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css b/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css index a3882f3a..5e3c78f2 100644 --- a/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css +++ b/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css @@ -47,8 +47,38 @@ * gedit * *********/ -GeditFloatingSlider .entry.not-found:focus { - border-image: url("img/border-error.svg") 3 3 4 3 / 3px 3px 4px 3px repeat; +GeditMultiNotebook .notebook { + border-width: 0px 0px 1px 1px; +} + +GeditPanel.horizontal .notebook { + border-width: 0px 1px 1px 1px; +} + +GeditPanel.vertical .notebook { + border-width: 0px 1px 1px 1px; +} + +GeditViewFrame .gedit-search-slider { + padding: 4px; + border-image: url("img/border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px repeat; +} + +GeditViewFrame .gedit-search-slider .not-found { + background-color: @error_bg_color; + color: @error_fg_color; +} + +GeditViewFrame .gedit-search-slider .not-found:selected { + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; +} + +.gedit-search-entry-occurrences-tag { + color: @theme_text_color; + background-color: @theme_bg_color; + margin: 2px 0px 2px 2px; + padding: 2px; } /******************* diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets-img.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets-img.css index f3ea71fb..eeff8574 100644 --- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets-img.css +++ b/desktop-themes/TraditionalOkTest/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/TraditionalOkTest/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css index 6abb49dd..1ba81bbe 100644 --- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/TraditionalOkTest/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, @@ -591,7 +602,7 @@ GtkComboBox.combobox-entry .button:active, @trough_gradient_b 4px); } -/* Prelit button background */ +/* Prelight button background */ .button:hover, .spinbutton .button:hover, .toolbar .button:hover, @@ -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,11 @@ 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 +1059,20 @@ 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 { + font: normal; background-color: @theme_bg_color; color: @menu_fg_color; - padding: 0; + padding: 1px; border-style: solid; border-width: 1px; border-color: @menu_border_color; @@ -1065,7 +1080,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 +1107,7 @@ GtkTreeMenu .menuitem * { /* this controls the general appearance of the menubar */ .menubar { border-style: none; - padding: 0px; + padding: 1px; -GtkWidget-window-dragging: true; -GtkMenuBar-internal-padding: 1; background-image: -gtk-gradient (linear, @@ -1115,6 +1130,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 +1148,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 +1165,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 +1173,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 +1206,7 @@ GtkTreeMenu .menuitem *:hover, .menuitem.separator { color: @menu_separator_color; + padding: 3px 1px 3px 1px; -GtkMenuItem-horizontal-padding: 0; } @@ -1348,29 +1370,11 @@ GtkCheckButton:selected:focus { ***********/ .sidebar, -.sidebar .view { - 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 { +.sidebar .view, +.sidebar GtkScrolledWindow { background-color: @sidebar_bg_color; } -.sidebar .scrollbar.slider:hover { - background-color: @theme_base_color; -} - .sidebar .radio, .sidebar .radio:focus, .sidebar .radio:selected { @@ -1719,25 +1723,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 +1767,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: 0px; + border-radius: 7px 7px 0 0; + border-style: solid; + margin: 0px; +} + +/************ + * 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/TraditionalOkTest/gtk-3.0/img/Makefile.am b/desktop-themes/TraditionalOkTest/gtk-3.0/img/Makefile.am index 80bdbb25..81c9c408 100644 --- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/Makefile.am +++ b/desktop-themes/TraditionalOkTest/gtk-3.0/img/Makefile.am @@ -3,7 +3,6 @@ THEME_NAME=TraditionalOkTest themedir = $(datadir)/themes/$(THEME_NAME)/gtk-3.0/img theme_DATA = \ - border-error.svg \ border-focused-ptb.svg \ border-focused.svg \ border-focused-switch.svg \ diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-error.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-error.svg deleted file mode 100644 index 6532d220..00000000 --- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-error.svg +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/settings.ini b/desktop-themes/TraditionalOkTest/gtk-3.0/settings.ini index 0ef654c8..5c1f15aa 100644 --- a/desktop-themes/TraditionalOkTest/gtk-3.0/settings.ini +++ b/desktop-themes/TraditionalOkTest/gtk-3.0/settings.ini @@ -2,4 +2,4 @@ gtk-color-scheme = "base_color:#babdb6\nbg_color:#888a85\nfg_color:#f5f5f5\nselected_bg_color:#f57900\nselected_fg_color:#ffffff\ntooltip_bg_color:#EAF5B5\ntooltip_fg_color:#000000\ntext_color:#000000\nlink_color:#0000ee\nvisited_link_color:#551a8b" gtk-auto-mnemonics = 0 gtk-visible-focus = automatic - +gtk-primary-button-warps-slider = false -- cgit v1.2.1