From af76a16edd6cbe3e971b443c611659c8bf6fd17c Mon Sep 17 00:00:00 2001 From: Rafael Laguna Date: Thu, 20 Feb 2014 17:36:10 +0100 Subject: [PATCH] - merge with light themes - remove obsolete dependencies - remove unsued theme entries - fix nautilus background & sidepane - fix thunar bitmaps errors --- .../Lubuntu-default/gtk-2.0/assets/thunar.rc | 5 +- .../themes/Lubuntu-default/gtk-2.0/gtkrc | 2 +- .../Lubuntu-default/gtk-3.0/apps/gedit.css | 37 +++- .../gtk-3.0/apps/gnome-system-log.css | 4 + .../Lubuntu-default/gtk-3.0/apps/unity.css | 105 +++++++++-- .../Lubuntu-default/gtk-3.0/gtk-lubuntu.css | 8 + .../Lubuntu-default/gtk-3.0/gtk-main.css | 4 +- .../gtk-3.0/gtk-widgets-assets.css | 11 +- .../gtk-3.0/gtk-widgets-backdrop.css | 108 ++--------- .../gtk-3.0/gtk-widgets-borders-radiance.css | 2 +- .../gtk-3.0/gtk-widgets-borders.css | 177 +----------------- .../Lubuntu-default/gtk-3.0/gtk-widgets.css | 169 ++++++----------- 12 files changed, 221 insertions(+), 411 deletions(-) create mode 100644 usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-system-log.css diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/thunar.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/assets/thunar.rc index 74ba14c..5198bd9 100644 --- a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/thunar.rc +++ b/usr/share/themes/Lubuntu-default/gtk-2.0/assets/thunar.rc @@ -31,10 +31,9 @@ style "sidepane" } widget_class "*ThunarShortcutsView*" style "sidepane" -widget_class "*ThunarTreeView*" style "sidepane" widget_class "*ThunarLocationEntry*" style "entry" -widget_class "*ThunarStatusbar*" style "resize-grip" + # Gtk2 Open-File Dialog widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*" style "sidepane" -widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.." style "treeview-header" + diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc b/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc index 6a218c3..863b9da 100644 --- a/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc +++ b/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc @@ -687,7 +687,7 @@ widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" st include "assets/ff.rc" include "assets/chromium.rc" include "assets/gnome-terminal.rc" -include "assets/nautilus.rc" +#include "assets/nautilus.rc" include "assets/lxpanel.rc" include "assets/entry.rc" include "assets/statusbar.rc" diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gedit.css b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gedit.css index 9ef1f6c..6f11618 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gedit.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gedit.css @@ -7,11 +7,6 @@ GeditWindow .pane-separator:hover { GeditPanel.title GtkLabel { } -GeditPanel .toolbar { - border-style: none; - background-color: transparent; -} - GeditDocumentsPanel .view { } @@ -24,7 +19,6 @@ GeditWindow .notebook { } GeditPanel .notebook { - padding: 3px; border-radius: 1px; } @@ -33,8 +27,35 @@ GeditWindow .notebook tab { border-radius: 3px; } -GeditFloatingSlider .not-found { +GeditViewFrame .gedit-search-slider { + background-color: @theme_base_color; + padding: 6px; + border-color: shade (@notebook_tab_gradient_b, 0.80); + border-radius: 0 0 3px 3px; + border-width: 0 1px 1px 1px; + border-style: solid; +} + +GeditViewFrame .gedit-search-slider .not-found { color: @error_fg_color; background-image: none; background-color: @error_bg_color; -} \ No newline at end of file +} + +GeditViewFrame .gedit-search-slider .not-found:selected { + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; +} + +GeditFileBrowserWidget .toolbar { + background-color: @theme_bg_color; + border: none; + padding-bottom: 3px; +} + +.gedit-search-entry-occurrences-tag { + background-color: transparent; + color: @backdrop_text_color; + margin: 2px; + padding: 2px; +} diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-system-log.css b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-system-log.css new file mode 100644 index 0000000..445b4ea --- /dev/null +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-system-log.css @@ -0,0 +1,4 @@ +/* LP: #1045602 */ +LogviewWindow .view.dim-label, .dim-label { + color: @info_fg_color; +} diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css index 5ff6bce..0b22c56 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css @@ -1,14 +1,100 @@ +/* Decorations */ + +UnityDecoration { + -UnityDecoration-extents: 28px 1px 1px 1px; + -UnityDecoration-input-extents: 10px; + + -UnityDecoration-shadow-offset-x: 1px; + -UnityDecoration-shadow-offset-y: 1px; + -UnityDecoration-active-shadow-color: rgba (0, 0, 0, 0.647); + -UnityDecoration-active-shadow-radius: 15px; + -UnityDecoration-inactive-shadow-color: rgba (0, 0, 0, 0.647); + -UnityDecoration-inactive-shadow-radius: 10px; + + -UnityDecoration-glow-size: 10px; + -UnityDecoration-glow-color: rgb (221, 72, 20); + + -UnityDecoration-title-indent: 10px; + -UnityDecoration-title-fade: 35px; + -UnityDecoration-title-alignment: 0.0; +} + +UnityDecoration.top { + border: 1px solid rgba (72, 33, 0, 0.3568); /* shade (@dark_bg_color, 0.8) - shade (#edebe6, 1.06) */ + border-bottom-width: 0; + border-radius: 8px 8px 0 0; + padding: 1px 8px 0 8px; + + box-shadow: inset 0 0 transparent, inset 0 0 transparent, + inset 0 1px shade (#edebe6, 1.08), inset 0 0 transparent; + + background-color: transparent; + background-clip: border-box; + background-image: -gtk-gradient (linear, left top, left bottom, + from (shade (#edebe6, 1.06)), + to (@dark_bg_color)); + + color: shade (@dark_bg_color, 0.4); + text-shadow: 1px 0 1px shade (@dark_bg_color, 1.06), -1px 0 1px shade (@dark_bg_color, 1.06), + 0 1px 1px shade (@dark_bg_color, 1.06), 0 -1px 1px shade (@dark_bg_color, 1.06); +} + +UnityDecoration.top:backdrop { + border: 1px solid rgba (74, 29, 0, 0.2784); /* shade (@dark_bg_color, 0.8) - shade (#edebe6, 0.96) */ + border-bottom-width: 0; + background-color: transparent; + background-clip: border-box; + background-image: -gtk-gradient (linear, left top, left bottom, + from (shade (#edebe6, 0.96)), + to (@dark_bg_color)); + box-shadow: inset 0 0 transparent, inset 0 0 transparent, + inset 0 1px shade (#edebe6, 0.98), inset 0 0 transparent; + color: #a39e9a; + text-shadow: 1px 0 1px shade (@dark_bg_color, 1.08), -1px 0 1px shade (@dark_bg_color, 1.08), + 0 1px 1px shade (@dark_bg_color, 1.08), 0 -1px 1px shade (@dark_bg_color, 1.08); +} + +UnityDecoration.left, +UnityDecoration.right { + background-color: shade (@bg_color, 0.7); + background-size: 1px 70px; + background-repeat: repeat-x; + + /* start color: mix of the top border color and bg-image gradient end */ + background-image: -gtk-gradient (linear, left top, left bottom, + color-stop (0, #a89686), + color-stop (0.5, #a89686), + color-stop (1, shade (@bg_color, 0.7))); +} + +UnityDecoration.left:backdrop, +UnityDecoration.right:backdrop { + /* start color: mix of the top border color and bg-image gradient end */ + background-image: -gtk-gradient (linear, left top, left bottom, + color-stop (0, #b5a395), + color-stop (0.5, #b5a395), + color-stop (1, shade (@bg_color, 0.7))); +} + +UnityDecoration.bottom { + background-image: none; + background-color: shade (@bg_color, 0.7); +} + +/* Panel Style */ + UnityPanelWidget, .unity-panel { background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 1.3)), - to (shade (@dark_bg_color, 1.0))); - border-top-color: shade (@dark_bg_color, 1.4); + from (shade (#edebe6, 1.06)), + to (@dark_bg_color)); + border-top-color: shade (#edebe6, 1.08); border-style: solid; border-width: 1px 0 0 0; color: @dark_fg_color; - text-shadow: 0 1px shade (@dark_bg_color, 1.1); + text-shadow: 1px 0 1px shade (@dark_bg_color, 1.06), -1px 0 1px shade (@dark_bg_color, 1.06), + 0 1px 1px shade (@dark_bg_color, 1.06), 0 -1px 1px shade (@dark_bg_color, 1.06); } .unity-panel.menubar, @@ -18,21 +104,12 @@ UnityPanelWidget, .unity-panel.menuitem, .unity-panel .menuitem { border-width: 1px 1px 0 1px; - - icon-shadow: 0 1px shade (@dark_bg_color, 1.06); + icon-shadow: 0 -1px shade (@dark_bg_color, 1.06); } .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { - border-radius: 7px 7px 0 0; - border-width: 1px 1px 0 1px; background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 1.5)), to (shade (@dark_bg_color, 1.02))); - border-image: url("../assets/radiance-menubaritem.png") 8 10 1 10 / 8px 10px 1px 10px stretch; - /*box-shadow: inset 0 -1px shade (@dark_bg_color, 0.95);*/ - box-shadow: none; - - color: @fg_color; - text-shadow: 0 1px shade (@dark_bg_color, 1.1); } diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-lubuntu.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-lubuntu.css index 72e571d..61a8567 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-lubuntu.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-lubuntu.css @@ -230,3 +230,11 @@ GtkMenuToolButton.menu .menuitem *:insensitive, background-color: shade (@theme_bg_color, 0.882); } + +/* Nautilus mods */ + +/* sidebar */ +NautilusWindow .sidebar, +NautilusWindow .sidebar .view { + background-color: @sidepane_color; +} diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css index 458d63e..f7a7ee3 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css @@ -1,5 +1,5 @@ /*default color scheme */ -@define-color bg_color #e0e0e0; +@define-color bg_color #f2f1f0; @define-color fg_color #4c4c4c; @define-color base_color #ffffff; @define-color text_color #333333; @@ -22,6 +22,7 @@ @define-color combobox_color #888888; @define-color progress_color #5591c3; @define-color scroll_color #B3B3B3; +@define-color sidepane_color #dae0e6; /* theme common colors */ @define-color button_bg_color shade (@bg_color, 1.02); /*shade (#cdcdcd, 1.08);*/ @@ -67,5 +68,6 @@ @import url("apps/nautilus.css"); @import url("apps/gnome-panel.css"); @import url("apps/gnome-terminal.css"); +@import url("apps/gnome-system-log.css"); @import url("gtk-lubuntu.css"); diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets.css index d008c19..ab8f695 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets.css @@ -399,8 +399,11 @@ .primary-toolbar .menu .check:active, .menubar.toolbar .menu .check:active, .header-bar .menu .check:active, +.menu .check:active { + background-image: url("assets/check-menuitem-dark.png"); +} + .toolbar .menu .check:active:hover, -.menu .check:active, .menu .check:active:hover { background-image: url("assets/check-menuitem.png"); } @@ -414,12 +417,8 @@ background-image: url("assets/check-menuitem-insensitive.png"); } -.primary-toolbar .menu .radio:active, -.menubar.toolbar .menu .radio:active, -.header-bar .menu .radio:active, .toolbar .menu .radio:active:hover, -.menu .radio:active, -.menu .radio:active:hover { +.menu .radio:active { background-image: url("assets/radio-menuitem.png"); } diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-backdrop.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-backdrop.css index ac12b5b..3e559d8 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-backdrop.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-backdrop.css @@ -11,36 +11,6 @@ GtkWindow:backdrop { background-color: @bg_color; } -/********** - * states * - **********/ -*:insensitive:backdrop { - color: mix (shade (@bg_color, 0.6), @bg_color, 0.2); - text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.5); -} - -*:active:backdrop { -} - -*:active:hover:insensitive:backdrop { -} - -*:active:insensitive:backdrop { -} - -*:hover:backdrop { -} - -*:hover:insensitive:backdrop { -} - -*:selected:backdrop, -*:selected:focused:backdrop { - background-color: @backdrop_selected_bg_color; - - color: @backdrop_selected_fg_color; -} - /****************** * common effects * ******************/ @@ -367,15 +337,6 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop, border-width: 0; } -.cell:selected:backdrop { -} - -row:hover:backdrop { -} - -row:insensitive:backdrop { -} - row:selected:backdrop { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@backdrop_selected_bg_color, 1.06)), @@ -387,9 +348,6 @@ row:selected:backdrop { color: @backdrop_selected_fg_color; } -row:selected:focused { -} - /******************* * check and radio * *******************/ @@ -630,15 +588,6 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop { to (alpha (shade (@bg_color, 0.05), 0.01))); } -.primary-toolbar .entry.progressbar:backdrop, -.primary-toolbar .entry.progressbar:backdrop, -.menubar.toolbar .entry.progressbar:backdrop, -.menubar.toolbar .entry.progressbar:backdrop, -.header-bar .entry.progressbar:backdrop, -.header-bar .entry.progressbar:backdrop, -.entry.progressbar:backdrop { -} - /************ * expander * ************/ @@ -714,12 +663,6 @@ GtkIconView.view.cell:selected:focused:backdrop { background-color: shade (@bg_color, 1.01); } -.notebook tab:active:backdrop { -} - -.notebook tab:backdrop { -} - /************************* * progressbar and scale * *************************/ @@ -879,48 +822,16 @@ GtkScrolledWindow.frame:backdrop { -unico-inner-stroke-color: alpha (shade (@bg_color, 1.26), 0.6); } -.menuitem.separator:backdrop { -} - -.menubar .menuitem.separator:backdrop, -.primary-toolbar .menuitem.separator:backdrop, -.menubar.toolbar .menuitem.separator:backdrop, -.header-bar .menuitem.separator:backdrop { -} - /*********** * sidebar * ***********/ -.sidebar:backdrop, -.sidebar .view:backdrop { -} - .sidebar row:selected:backdrop { text-shadow: 0 1px shade (@backdrop_selected_bg_color, 0.7); } -.sidebar .frame:backdrop { -} - /************** * spinbutton * **************/ -.spinbutton.button:active:backdrop, -.spinbutton.button:insensitive:backdrop, -.notebook .spinbutton.button:active:backdrop, -.notebook .spinbutton.button:insensitive:backdrop, -.spinbutton.button:backdrop, -.notebook .spinbutton.button:backdrop { -} - -.spinbutton.button:active:nth-child(last):backdrop, -.spinbutton.button:insensitive:nth-child(last):backdrop, -.notebook .spinbutton.button:active:nth-child(last):backdrop, -.notebook .spinbutton.button:insensitive:nth-child(last):backdrop, -.spinbutton.button:nth-child(last):backdrop, -.notebook .spinbutton.button:nth-child(last):backdrop { -} - .spinbutton.button:backdrop, .notebook .spinbutton.button:backdrop { background-image: -gtk-gradient (linear, left top, left bottom, @@ -934,10 +845,6 @@ GtkScrolledWindow.frame:backdrop { -unico-border-gradient: none; } -.spinbutton:backdrop, -.spinbutton:hover:backdrop { -} - /*********** * spinner * ***********/ @@ -1414,3 +1321,18 @@ GtkTreeView .entry:backdrop { ************/ GtkViewport.frame:backdrop { } + +/***************************************************************************** + * states [please keep this section at the end of the file (CSS precedence)] * + *****************************************************************************/ +*:insensitive:backdrop { + color: mix (shade (@bg_color, 0.6), @bg_color, 0.2); + text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.5); +} + +*:selected:backdrop, +*:selected:focused:backdrop { + background-color: @backdrop_selected_bg_color; + + color: @backdrop_selected_fg_color; +} diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders-radiance.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders-radiance.css index 0a9cde2..cc1f946 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders-radiance.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders-radiance.css @@ -69,5 +69,5 @@ .menubar.menuitem:hover, .menubar .menuitem:hover { - border-image: url("assets/radiance-menubaritem.png") 8 10 1 10 / 8px 10px 1px 10px stretch; + border-color: #b8ab9c; } \ No newline at end of file diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders.css index b9f30af..e14c0eb 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders.css @@ -148,7 +148,9 @@ GtkSwitch.trough:active { .menubar.menuitem:hover, .menubar .menuitem:hover { - border-image: url("assets/menubaritem.png") 8 10 1 10 / 8px 10px 1px 10px stretch; + border: 1px solid #2e2e2c; + border-bottom-width: 0px; + border-radius: 4px 4px 0 0; } /********* @@ -173,13 +175,6 @@ GtkSwitch.trough:active { border-image: url("assets/entry-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.entry:selected, -.entry:selected:focus { -} - -.entry:focus { -} - .entry:insensitive { border-image: url("assets/entry-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } @@ -295,157 +290,6 @@ GtkComboBox.combobox-entry .button:active:focus { border-left-width: 0; } -/* tooltip elements borders */ -.tooltip .entry, -.tooltip .button { -} - -/* tooltip focused elements borders */ -.tooltip .entry:focus, -.tooltip .button:focus { -} - -/* primary toolbar - generic element borders */ -.primary-toolbar .entry, -.primary-toolbar GtkComboBox.combobox-entry .entry, -.primary-toolbar GtkComboBox.combobox-entry .button, -.primary-toolbar .button:active, -.primary-toolbar .button.raised:active, -.primary-toolbar .raised .button:active, -.primary-toolbar .button.raised:insensitive, -.primary-toolbar .raised .button:insensitive, -.menubar.toolbar .entry, -.menubar.toolbar GtkComboBox.combobox-entry .entry, -.menubar.toolbar GtkComboBox.combobox-entry .button, -.menubar.toolbar .button:active, -.menubar.toolbar .button.raised:active, -.menubar.toolbar .raised .button:active, -.menubar.toolbar .button.raised:insensitive, -.menubar.toolbar .raised .button:insensitive, -.header-bar .entry, -.header-bar GtkComboBox.combobox-entry .entry, -.header-bar GtkComboBox.combobox-entry .button, -.header-bar .button:active, -.header-bar .button.raised:active, -.header-bar .raised .button:active, -.header-bar .button.raised:insensitive, -.header-bar .raised .button:insensitive, -.inline-toolbar.toolbar .button:active, -.inline-toolbar.toolbar .button:insensitive, -.inline-toolbar.toolbar GtkToolButton .button:active, -.inline-toolbar.toolbar GtkToolButton .button:insensitive, -.primary-toolbar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough:insensitive, -.primary-toolbar GtkComboBox .button:active, -.primary-toolbar GtkComboBox .button:insensitive, -.menubar.toolbar GtkSwitch.trough, -.header-bar GtkSwitch.trough, -.menubar.toolbar GtkSwitch.trough:insensitive, -.header-bar GtkSwitch.trough:insensitive, -.menubar.toolbar GtkComboBox .button:active, -.header-bar GtkComboBox .button:active, -.menubar.toolbar GtkComboBox .button:insensitive, -.header-bar GtkComboBox .button:insensitive { -} - -/* primary toolbar - focused element borders */ -.primary-toolbar .entry:focus, -.primary-toolbar .button:active:focus, -.primary-toolbar GtkComboBox.combobox-entry .entry:focus, -.primary-toolbar GtkComboBox.combobox-entry .button:focus, -.primary-toolbar .button.raised:focus:active, -.primary-toolbar .raised .button:focus:active, -.primary-toolbar .button.raised.default:active, -.primary-toolbar .raised .button.default:active, -.menubar.toolbar .entry:focus, -.menubar.toolbar .button:active:focus, -.menubar.toolbar GtkComboBox.combobox-entry .entry:focus, -.menubar.toolbar GtkComboBox.combobox-entry .button:focus, -.menubar.toolbar .button.raised:focus:active, -.menubar.toolbar .raised .button:focus:active, -.menubar.toolbar .button.raised.default:active, -.menubar.toolbar .raised .button.default:active, -.header-bar .entry:focus, -.header-bar .button:active:focus, -.header-bar GtkComboBox.combobox-entry .entry:focus, -.header-bar GtkComboBox.combobox-entry .button:focus, -.header-bar .button.raised:focus:active, -.header-bar .raised .button:focus:active, -.header-bar .button.raised.default:active, -.header-bar .raised .button.default:active, -.inline-toolbar.toolbar .button:focus:active, -.inline-toolbar.toolbar .button.default:active, -.primary-toolbar GtkComboBox .button:active:focus, -.menubar.toolbar GtkComboBox .button:active:focus, -.header-bar GtkComboBox .button:active:focus { -} - -/* primary toolbar - generic button borders */ -.primary-toolbar .button.raised, -.primary-toolbar .raised .button, -.menubar.toolbar .button.raised, -.menubar.toolbar .raised .button, -.header-bar .button.raised, -.header-bar .raised .button, -.inline-toolbar.toolbar .button, -.primary-toolbar GtkComboBox .button, -.menubar.toolbar GtkComboBox .button, -.header-bar GtkComboBox .button { -} - -/* primary toolbar - focused button borders */ -.primary-toolbar .button.raised:focus, -.primary-toolbar .button.raised.default, -.primary-toolbar .raised .button:focus, -.primary-toolbar .raised .button.default, -.menubar.toolbar .button.raised:focus, -.menubar.toolbar .button.raised.default, -.menubar.toolbar .raised .button:focus, -.menubar.toolbar .raised .button.default, -.header-bar .button.raised:focus, -.header-bar .button.raised.default, -.header-bar .raised .button:focus, -.header-bar .raised .button.default, -.inline-toolbar.toolbar .button:focus, -.inline-toolbar.toolbar .button.default, -.primary-toolbar GtkComboBox .button:focus, -.menubar.toolbar GtkComboBox .button:focus, -.header-bar GtkComboBox .button:focus { -} - -/* column-headers borders */ -column-header.button, -column-header .button, -column-header.button:focus, -column-header .button:focus, -column-header.button:active, -column-header .button:active, -column-header.button:active:hover, -column-header .button:active:hover -column-header.button:active:focus, -column-header .button:active:focus { -} - -column-header.button:backdrop, -column-header .button:backdrop { -} - -column-header.button:insensitive, -column-header .button:insensitive { -} - -column-header.button:last-child, -column-header:last-child .button, -column-header.button:last-child:focus, -column-header:last-child .button:focus, -column-header.button:last-child:active, -column-header:last-child .button:active, -column-header.button:last-child:active:hover, -column-header:last-child .button:active:hover, -column-header.button:last-child:active:focus, -column-header:last-child .button:active:focus { -} - .notebook tab.top:active { border-image: url("assets/notebook-tab-top.png") 8 10 1 10 / 8px 10px 1px 10px stretch; } @@ -471,9 +315,6 @@ GtkSwitch.trough:backdrop, .trough:backdrop { } -.trough row:backdrop { -} - .trough, .trough.highlight { border-radius: 4px; @@ -617,15 +458,3 @@ GtkSwitch.slider:active:insensitive { border-image: url("assets/scale-vertical-fill-backdrop.png") 6 2 6 2 / 6px 2px 6px 2px stretch; } -/* unfocused window: primary toolbar generic element borders */ -.primary-toolbar .button:active:backdrop, -.primary-toolbar .button.raised:backdrop, -.primary-toolbar .raised .button:backdrop, -.primary-toolbar GtkComboBox.combobox-entry .entry:backdrop, -.primary-toolbar GtkComboBox.combobox-entry .button:backdrop, -.primary-toolbar GtkComboBox .button:backdrop, -.primary-toolbar .entry:backdrop, -.primary-toolbar GtkSwitch.trough:backdrop, -.inline-toolbar.toolbar .button:backdrop, -.inline-toolbar.toolbar .button:backdrop:insensitive { -} diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css index c264056..3da32f9 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css @@ -50,6 +50,7 @@ -GtkWidget-focus-line-width: 1px; -GtkWidget-link-color: @link_color; -GtkWidget-visited-link-color: @link_color; + -GtkWindow-decoration-button-layout: "close:"; -GtkWindow-resize-grip-width: 0; -GtkWindow-resize-grip-height: 0; -WnckTasklist-fade-overlay-rect: 0; @@ -62,18 +63,19 @@ /*-unico-arrow-texture: url("assets/combobox-arrow.png");*/ - -unico-focus-border-color: alpha (@selected_bg_color, 0.5); - -unico-focus-border-radius: 5; - -unico-focus-fill-color: alpha (@selected_bg_color, 0.1); + /* To avoid using custom attributes, unico looks at the outline attributes + * to find out how to render the focus ring. + */ + outline-color: alpha (@selected_bg_color, 0.5); + outline-offset: 5px; } GtkWindow { color: @fg_color; + background-color: @bg_color; } -* { - /* inherit the color from parent by default */ - color: inherit; +GtkPaned { background-color: @bg_color; } @@ -81,44 +83,6 @@ GtkWindow:backdrop { color: @backdrop_fg_color; } -/********** - * states * - **********/ -*:insensitive { - color: shade (@bg_color, 0.6); - text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.5); -} - -*:active { -} - -*:active:hover:insensitive { -} - -*:active:insensitive { -} - -*:hover { -} - -*:hover:insensitive { -} - -*:selected, -*:selected:focused { - background-color: alpha (@selected_bg_color, 0.9); - - color: @selected_fg_color; -} - -*:selected:backdrop, -*:selected:focused:backdrop { - background-color: alpha (@backdrop_selected_bg_color, 0.9); - - color: @backdrop_selected_fg_color; -} - - /********* * arrow * *********/ @@ -526,15 +490,6 @@ GtkSwitch.slider:backdrop, border-width: 0; } -.cell:selected { -} - -row:hover { -} - -row:insensitive { -} - row:selected { background-image: -gtk-gradient (linear, left bottom, left top, from (shade (@selected_bg_color, 1.06)), @@ -547,9 +502,6 @@ row:selected { /*text-shadow: 0 -1px shade (@selected_bg_color, 0.7);*/ } -row:selected:focused { -} - row:selected:backdrop { background-image: -gtk-gradient (linear, left bottom, left top, from (shade (@backdrop_selected_bg_color, 1.06)), @@ -652,9 +604,11 @@ column-header:nth-child(last) .button { background-color: shade (@bg_color, 1.03); } +.view:selected, +.view:active, .content-view.view:selected, .content-view.view:active { - /*background-color: @selected_bg_color;*/ + background-color: @selected_bg_color; } .content-view.view:insensitive { @@ -720,6 +674,13 @@ GtkComboBox.combobox-entry .button, padding: 5px 7px; color: @text_color; + + /* Evolution sets the background color of its mail window to the background + * color of entries, but cannot handle background images. Setting the + * background color here doesn't effect real entries, because + * 'background-image' has precedence. + */ + background-color: @base_color; } GtkComboBox.combobox-entry .button:backdrop, @@ -740,9 +701,6 @@ GtkComboBox.combobox-entry .button:backdrop, color: @selected_fg_color; } -.entry:focused { -} - GtkComboBox.combobox-entry .button:insensitive, .primary-toolbar GtkComboBox.combobox-entry .button:insensitive, .menubar.toolbar GtkComboBox.combobox-entry .button:insensitive, @@ -796,10 +754,7 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop, border-style: solid; border-color: shade (@bg_color, 0.82); border-image: none; -} - -.frame:backdrop { - border-color: shade (@bg_color, 0.88); + background: none; } /************ @@ -923,6 +878,15 @@ GtkLabel:insensitive { background-color: transparent; } +/********* + * stack * + *********/ + +GtkHeaderBar > GtkStack, +GtkHeaderBar > GtkStack:insensitive { + background-color: transparent; +} + /******** * menu * ********/ @@ -1003,6 +967,10 @@ GtkComboBox .menu { border-width: 1px; } +.context-menu { + font: regular medium; +} + /*********** * menubar * ***********/ @@ -1027,13 +995,13 @@ GtkComboBox .menu { ***************/ .menubar.menuitem:hover, .menubar .menuitem:hover { - border-radius: 4px 4px 0 0; - border-width: 1px 1px 0 1px; + background-color: transparent; + background-clip: border-box; background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 1.38)), to (shade (@dark_bg_color, 1.11))); - /*box-shadow: inset 0 -1px shade (@dark_bg_color, 0.95);*/ - box-shadow: none; + + box-shadow: inset 0 1px 1px 0 shade (@dark_bg_color, 1.8); color: shade (@dark_fg_color, 1.1); text-shadow: 0 -1px shade (@dark_bg_color, 0.7); @@ -1549,9 +1517,6 @@ GtkScale.mark { border-color: shade (@bg_color, 0.8); } -.scrollbar.trough.horizontal { -} - .scrollbar.slider, .scrollbar.slider:hover, .scrollbar.button, @@ -1928,9 +1893,6 @@ GtkSwitch.slider { border-style: solid; } -GtkSwitch.slider:insensitive { -} - /************ * textview * ************/ @@ -2049,42 +2011,6 @@ GtkTextView { /*border-width: 1px;*/ } -.primary-toolbar .raised .button:focus, -.primary-toolbar .raised.button:focus, -.primary-toolbar .button:hover:focus, -.primary-toolbar .button:active:focus, -.primary-toolbar .button:insensitive:focus, -.menubar.toolbar .raised .button:focus, -.menubar.toolbar .raised.button:focus, -.menubar.toolbar .button:hover:focus, -.menubar.toolbar .button:active:focus, -.menubar.toolbar .button:insensitive:focus, -.header-bar .raised .button:focus, -.header-bar .raised.button:focus, -.header-bar .button:hover:focus, -.header-bar .button:active:focus, -.header-bar .button:insensitive:focus { -} - -.primary-toolbar GtkComboBox.combobox-entry .button, -.menubar.toolbar GtkComboBox.combobox-entry .button, -.header-bar GtkComboBox.combobox-entry .button { -} - -.primary-toolbar GtkComboBox.combobox-entry .button, -.primary-toolbar .raised .button, -.primary-toolbar .raised.button, -.primary-toolbar .button:hover, -.menubar.toolbar GtkComboBox.combobox-entry .button, -.menubar.toolbar .raised .button, -.menubar.toolbar .raised.button, -.menubar.toolbar .button:hover, -.header-bar GtkComboBox.combobox-entry .button, -.header-bar .raised .button, -.header-bar .raised.button, -.header-bar .button:hover { -} - .primary-toolbar .button:active, .menubar.toolbar .button:active, .header-bar .button:active { @@ -2509,3 +2435,26 @@ GtkTreeView row:nth-child(odd) { GtkViewport.frame { border-width: 0; } + + +/***************************************************************************** + * states [please keep this section at the end of the file (CSS precedence)] * + *****************************************************************************/ +*:insensitive { + color: shade (@bg_color, 0.6); + text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.5); +} + +*:selected, +*:selected:focused { + background-color: alpha (@selected_bg_color, 0.9); + + color: @selected_fg_color; +} + +*:selected:backdrop, +*:selected:focused:backdrop { + background-color: alpha (@backdrop_selected_bg_color, 0.9); + + color: @backdrop_selected_fg_color; +}