diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/assets/radiance-menubaritem.png b/usr/share/themes/Lubuntu-default/gtk-3.0/assets/radiance-menubaritem.png deleted file mode 100644 index 9ed5abb..0000000 Binary files a/usr/share/themes/Lubuntu-default/gtk-3.0/assets/radiance-menubaritem.png and /dev/null differ 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 78932c6..55e1c1f 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 @@ -89,6 +89,7 @@ GtkScale.slider.vertical:backdrop, border-top-color: shade (@bg_color, 0.86); border-right-color: shade (@bg_color, 0.82); border-bottom-color: shade (@bg_color, 0.76); + border-bottom-color: #ff0000; border-left-color: shade (@bg_color, 0.82); color: mix (@fg_color, @bg_color, 0.2); 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 be97711..7a6570b 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 @@ -32,5 +32,5 @@ .menubar.menuitem:hover, .menubar .menuitem:hover { - border-image: url("assets/radiance-menubaritem.png") 8 10 1 10 / 8px 10px 1px 10px stretch; -} \ No newline at end of file + border-image: none; +} diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-radiance.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-radiance.css index 9ffe342..eab9f38 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-radiance.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-radiance.css @@ -43,8 +43,8 @@ .menubar.menuitem:hover, .menubar .menuitem:hover { - color: @dark_fg_color; - text-shadow: 0 1px shade (@dark_bg_color, 1.1); + color: @selected_fg_color; + text-shadow: 0 1px shade (@selected_bg_color, 1.1); } .menuitem:hover, @@ -90,4 +90,4 @@ background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 1.03)), to (shade (@dark_bg_color, 0.96))); -} \ No newline at end of file +} 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 d6c0a39..6516c2f 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 @@ -704,7 +704,7 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop, * frame * *********/ .frame { - border-radius: 3px; + border-radius: 0px; border-width: 1px; border-style: solid; border-color: shade (@bg_color, 0.82); @@ -832,18 +832,14 @@ GtkMenuToolButton.menu, .menu { background-image: none; background-color: @dark_bg_color; - border-bottom-color: @dark_bg_color; - border-left-color: @dark_bg_color; - border-right-color: @dark_bg_color; - border-top-color: @dark_bg_color; + border-bottom-color: @combobox_color; + border-left-color:@combobox_color; + border-right-color: @combobox_color; + border-top-color: @combobox_color; padding: 0; - border-width: 0px; - border-style: none; + border-width: 1px; + border-style: solid; color: @dark_fg_color; - box-shadow: inset 0 1px shade (@dark_bg_color, 1.18), - inset 0 -1px shade (@dark_bg_color, 1.18), - inset -1px 0 shade (@dark_bg_color, 1.16), - inset 1px 0 shade (@dark_bg_color, 1.18); } .toolbar .menu, @@ -857,9 +853,6 @@ GtkComboBox .menu { border-style: solid; padding: 0; color: @fg_color; - box-shadow: inset -1px 0 shade (@bg_color, 1.18), - inset 1px 0 shade (@bg_color, 1.18), - inset 0 1px shade (@bg_color, 1.18); } .menu:selected { @@ -900,13 +893,13 @@ GtkComboBox .menu { ***************/ .menubar.menuitem:hover, .menubar .menuitem:hover { + border-style: none; border-radius: 4px 4px 0 0; - border-width: 1px 1px 0 1px; - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 1.38)), - to (shade (@dark_bg_color, 1.11))); + border-width: 0 0 0 0; + background-image: none; + background-color: @selected_bg_color; box-shadow: none; - color: shade (@dark_fg_color, 1.1); + color: @selected_fg_color; text-shadow: 0 -1px shade (@dark_bg_color, 0.7); } @@ -936,7 +929,7 @@ GtkComboBox .menuitem *:hover { .menuitem:hover, .menu .menuitem:hover { - border-radius: 0; + border-radius: 0px; background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@selected_bg_color, 1.1)), to (shade (@selected_bg_color, 0.9))); @@ -1486,16 +1479,16 @@ GtkTreeMenu .menuitem.separator, GtkMenuToolButton .menuitem.separator, .primary-toolbar .button .menuitem.separator, .menuitem.separator { - border-color: shade (@dark_bg_color, 0.99); - border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5); - border-right-color: alpha (shade (@dark_bg_color, 1.26), 0.5); + border-color: shade (@bg_color, 0.99); + border-bottom-color: @combobox_color; + border-right-color: @bg_color; } .toolbar .menuitem.separator, GtkComboBox .menuitem.separator { - border-color: shade (@bg_color, 0.92); - border-bottom-color: alpha (shade (@bg_color, 1.26), 0.6); - border-right-color: alpha (shade (@bg_color, 1.26), 0.6); + border-color: shade (@bg_color, 0.99); + border-bottom-color: @combobox_color; + border-right-color: @bg_color; } /*********** @@ -1635,328 +1628,6 @@ GtkTextView { background-color: @base_color; } -/*********** - * toolbar * - ***********/ -.toolbar { - border-style: none; - background-color: transparent; - padding: 1px; - - color: @fg_color; - text-shadow: none; -} - -.toolbar:backdrop { - color: @backdrop_fg_color; -} - -.toolbar .button { - /*padding: 1px;*/ - /*padding: 6px 8px;*/ -} - -/* primary-toolbar */ -.primary-toolbar, -.primary-toolbar .toolbar, -.primary-toolbar.toolbar { - -GtkWidget-window-dragging: true; - - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 0.96)), - to (shade (@dark_bg_color, 1.4))); - border-bottom-color: shade (@dark_bg_color, 1.1); - border-top-color: shade (@dark_bg_color, 1.09); - border-style: solid; - border-width: px 0 1px 0; - - color: @dark_fg_color; - text-shadow: 0 -1px shade (@dark_bg_color, 0.7); - - box-shadow: inset 0 0px shade (@dark_bg_color, 0.94); -} - -.primary-toolbar .toolbar:backdrop, -.primary-toolbar.toolbar:backdrop { - background-image: none; - background-color: @dark_bg_color; - box-shadow: none; - border-top-color: @dark_bg_color; - border-bottom-color: shade (@dark_bg_color, 0.9); - - color: @backdrop_dark_fg_color; -} - -.primary-toolbar :insensitive { - text-shadow: 0 -1px shade (@dark_bg_color, 0.7); -} - -.primary-toolbar GtkComboBox, -.primary-toolbar .button { - background-color: transparent; - background-image: none; - border-color: transparent; - /*border-radius: 3px;*/ - /*border-width: 1px;*/ - /*padding: 3px;*/ - - color: @dark_fg_color; - text-shadow: 0 -1px shade (@dark_bg_color, 0.7); -} - -.primary-toolbar GtkComboBox:backdrop, -.primary-toolbar .button:backdrop { - color: @backdrop_dark_fg_color; - text-shadow: 0 -1px shade (@dark_bg_color, 0.9); -} - -.primary-toolbar .raised .button, -.primary-toolbar .raised.button, -.primary-toolbar .button:hover, -.primary-toolbar .button:active, -.primary-toolbar .button:insensitive { - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 1.2)), - to (shade (@dark_bg_color, 1.1))); - /*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 { -} - -.primary-toolbar GtkComboBox.combobox-entry .button { -} - -.primary-toolbar GtkComboBox.combobox-entry .button, -.primary-toolbar .raised .button, -.primary-toolbar .raised.button, -.primary-toolbar .button:hover { -} - -.primary-toolbar .button:active { - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 0.9)), - to (shade (@dark_bg_color, 0.95))); - - text-shadow: 0 -1px shade (@dark_bg_color, 0.6); -} - -.primary-toolbar .button:active:hover { - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 0.95)), - to (shade (@dark_bg_color, 1.0))); -} - -.primary-toolbar .button:active:insensitive, -.primary-toolbar .button:insensitive { - text-shadow: none; -} - -.primary-toolbar .button:insensitive { - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 1.01)), - to (shade (@dark_bg_color, 0.99))); -} - -.primary-toolbar .button:active:insensitive { - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 0.94)), - to (shade (@dark_bg_color, 1.02))); -} - -.primary-toolbar .entry, -.primary-toolbar .entry:active, -.primary-toolbar .entry:focused { - border-radius: 9px; - -/* background-color: @dark_bg_color; - background-image: none; - - background-clip: border-box;*/ -} - -.primary-toolbar GtkSeparatorToolItem, -.primary-toolbar .separator, -.primary-toolbar .separator:insensitive { - border-color: alpha (shade (@dark_bg_color, 0.94), 0.35); - border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5); - border-right-color: alpha (shade (@dark_bg_color, 1.26), 0.5); -} - -/* inline-toolbar */ -.inline-toolbar.toolbar { - -GtkToolbar-button-relief: normal; - - border-right-color: shade (@bg_color, 0.86); - border-bottom-color: shade (@bg_color, 0.88); - border-left-color: shade (@bg_color, 0.86); - - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (#f2f1ef, 0.93)), - color-stop (0.08, #f2f1ef), - to (#ffffff)); - border-width: 0 1px 1px 1px; - border-style: solid; - border-radius: 3px; - border-top-right-radius: 0; - border-top-left-radius: 0; - padding: 3px 4px 4px 4px; -} - -.inline-toolbar.toolbar .button { - padding: 4px; - - icon-shadow: 0 1px shade (@bg_color, 1.16); -} - -.inline-toolbar.toolbar .button *:insensitive, -.inline-toolbar.toolbar GtkToolButton .button:insensitive { -} - -/* Middle button */ -.primary-toolbar .button.raised.linked, -.primary-toolbar .button.raised.linked:active, -.primary-toolbar .button.raised.linked:focus, -.primary-toolbar .button.raised.linked:focus:active, -.primary-toolbar .button.raised.linked:insensitive, -.primary-toolbar .button.raised.linked:backdrop, -.primary-toolbar .raised.linked .button, -.primary-toolbar .raised.linked .button:active, -.primary-toolbar .raised.linked .button:focus, -.primary-toolbar .raised.linked .button:focus:active, -.primary-toolbar .raised.linked .button:insensitive, -.primary-toolbar .raised.linked .button:backdrop, -.inline-toolbar.toolbar .button, -.inline-toolbar.toolbar .button:active, -.inline-toolbar.toolbar .button:focus, -.inline-toolbar.toolbar .button:focus:active, -.inline-toolbar.toolbar .button:insensitive, -.inline-toolbar.toolbar .button:backdrop, -.inline-toolbar.toolbar .button:backdrop:insensitive, -.inline-toolbar.toolbar GtkToolButton .button, -.inline-toolbar.toolbar GtkToolButton .button:active, -.inline-toolbar.toolbar GtkToolButton .button:focus, -.inline-toolbar.toolbar GtkToolButton .button:focus:active, -.inline-toolbar.toolbar GtkToolButton .button:insensitive, -.inline-toolbar.toolbar GtkToolButton .button:backdrop, -.inline-toolbar.toolbar GtkToolButton .button:backdrop:insensitive { - border-right-width: 0; - border-left-width: 0; - border-image-width: 10px 0 10px 0; - border-radius: 0; -} - -/* Leftmost button */ -.primary-toolbar .button.raised.linked:first-child, -.primary-toolbar .button.raised.linked:active:first-child, -.primary-toolbar .button.raised.linked:focus:first-child, -.primary-toolbar .button.raised.linked:focus:active:first-child, -.primary-toolbar .button.raised.linked:insensitive:first-child, -.primary-toolbar .button.raised.linked:backdrop:first-child, -.primary-toolbar .raised.linked .button:first-child, -.primary-toolbar .raised.linked .button:active:first-child, -.primary-toolbar .raised.linked .button:focus:first-child, -.primary-toolbar .raised.linked .button:focus:active:first-child, -.primary-toolbar .raised.linked .button:insensitive:first-child, -.primary-toolbar .raised.linked .button:backdrop:first-child, -.inline-toolbar.toolbar .button:first-child, -.inline-toolbar.toolbar .button:active:first-child, -.inline-toolbar.toolbar .button:focus:first-child, -.inline-toolbar.toolbar .button:focus:active:first-child, -.inline-toolbar.toolbar .button:insensitive:first-child, -.inline-toolbar.toolbar .button:backdrop:first-child, -.inline-toolbar.toolbar .button:backdrop:insensitive:first-child, -.inline-toolbar.toolbar GtkToolButton:first-child .button, -.inline-toolbar.toolbar GtkToolButton:first-child .button:active, -.inline-toolbar.toolbar GtkToolButton:first-child .button:focus, -.inline-toolbar.toolbar GtkToolButton:first-child .button:focus:active, -.inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive, -.inline-toolbar.toolbar GtkToolButton:first-child .button:backdrop, -.inline-toolbar.toolbar GtkToolButton:first-child .button:backdrop:insensitive { - border-left-width: 1px; - border-right-width: 0; - border-image-width: 10px 0 10px 12px; - border-radius: 8px; - border-bottom-right-radius: 0; - border-top-right-radius: 0; -} - -/* Rightmost button */ -.primary-toolbar .button.raised.linked:last-child, -.primary-toolbar .button.raised.linked:active:last-child, -.primary-toolbar .button.raised.linked:focus:last-child, -.primary-toolbar .button.raised.linked:focus:active:last-child, -.primary-toolbar .button.raised.linked:insensitive:last-child, -.primary-toolbar .button.raised.linked:backdrop:last-child, -.primary-toolbar .raised.linked .button:last-child, -.primary-toolbar .raised.linked .button:active:last-child, -.primary-toolbar .raised.linked .button:focus:last-child, -.primary-toolbar .raised.linked .button:focus:active:last-child, -.primary-toolbar .raised.linked .button:insensitive:last-child, -.primary-toolbar .raised.linked .button:backdrop:last-child, -.inline-toolbar.toolbar .button:last-child, -.inline-toolbar.toolbar .button:active:last-child, -.inline-toolbar.toolbar .button:focus:last-child, -.inline-toolbar.toolbar .button:focus:active:last-child, -.inline-toolbar.toolbar .button:insensitive:last-child, -.inline-toolbar.toolbar .button:backdrop:last-child, -.inline-toolbar.toolbar .button:backdrop:insensitive:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child .button, -.inline-toolbar.toolbar GtkToolButton:last-child .button:active, -.inline-toolbar.toolbar GtkToolButton:last-child .button:focus, -.inline-toolbar.toolbar GtkToolButton:last-child .button:focus:active, -.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive, -.inline-toolbar.toolbar GtkToolButton:last-child .button:backdrop, -.inline-toolbar.toolbar GtkToolButton:last-child .button:backdrop:insensitive { - border-left-width: 0; - border-right-width: 1px; - border-image-width: 10px 12px 10px 0; - border-radius: 8px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - /*box-shadow: inset 1px 0 shade (@bg_color, 0.84);*/ -} - -/* Single button */ -.primary-toolbar.toolbar .button:only-child, -.primary-toolbar.toolbar .button:active:only-child, -.primary-toolbar.toolbar .button:focus:only-child, -.primary-toolbar.toolbar .button:focus:active:only-child, -.primary-toolbar.toolbar .button:insensitive:only-child, -.primary-toolbar.toolbar .button:backdrop:only-child, -.primary-toolbar.toolbar .button:backdrop:insensitive:only-child, -.primary-toolbar.toolbar GtkToolButton:only-child .button, -.primary-toolbar.toolbar GtkToolButton:only-child .button:active, -.primary-toolbar.toolbar GtkToolButton:only-child .button:focus, -.primary-toolbar.toolbar GtkToolButton:only-child .button:focus:active, -.primary-toolbar.toolbar GtkToolButton:only-child .button:insensitive, -.primary-toolbar.toolbar GtkToolButton:only-child .button:backdrop, -.primary-toolbar.toolbar GtkToolButton:only-child .button:backdrop:insensitive, -.inline-toolbar.toolbar .button:only-child, -.inline-toolbar.toolbar .button:active:only-child, -.inline-toolbar.toolbar .button:focus:only-child, -.inline-toolbar.toolbar .button:focus:active:only-child, -.inline-toolbar.toolbar .button:insensitive:only-child, -.inline-toolbar.toolbar .button:backdrop:only-child, -.inline-toolbar.toolbar .button:backdrop:insensitive:only-child, -.inline-toolbar.toolbar GtkToolButton:only-child .button, -.inline-toolbar.toolbar GtkToolButton:only-child .button:active, -.inline-toolbar.toolbar GtkToolButton:only-child .button:focus, -.inline-toolbar.toolbar GtkToolButton:only-child .button:focus:active, -.inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive, -.inline-toolbar.toolbar GtkToolButton:only-child .button:backdrop, -.inline-toolbar.toolbar GtkToolButton:only-child .button:backdrop:insensitive { - border-right-width: 1px; - border-left-width: 1px; - border-image-width: 10px 12px 10px 12px; - border-radius: 8px; - /*box-shadow: none;*/ -} - /*********** * tooltip * ***********/ @@ -1968,7 +1639,6 @@ GtkTextView { border-radius: 5px; border-style: solid; border-width: 1px; - color: @tooltip_fg_color; } diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css index 69aaee6..ce98fa0 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css @@ -24,13 +24,16 @@ Adapted by 神癒礁湖 (Rafael Laguna). GPL2 / Open Source licensed. @define-color error_bg_color rgb (237, 54, 54); @define-color link_color #5590CC; @define-color error_color #cc0000; +@define-color combobox_color #888; /* theme common colors */ +@define-color notebook_button_bg_color shade (@bg_color, 1.02); @define-color button_bg_color shade (@bg_color,1.02); @define-color button_insensitive_bg_color mix (@button_bg_color, @bg_color, 0.6); @define-color dark_bg_color @bg_color; @define-color dark_fg_color @fg_color; @define-color transparent rgba (0, 0, 0, 0); + @define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8); @define-color backdrop_text_color mix (@base_color, @text_color, 0.8); @define-color backdrop_dark_fg_color mix (@dark_bg_color, @dark_fg_color, 0.75);