From 220e3186acdfb4d5f2f15feb6d838ad4cf6c63d3 Mon Sep 17 00:00:00 2001 From: Rafael Laguna Date: Mon, 13 Apr 2015 19:18:39 +0200 Subject: [PATCH] fix csd menus --- .../Lubuntu-dark-panel/gtk-3.0/apps/geary.css | 5 + .../gtk-3.0/apps/nautilus.css | 4 + .../Lubuntu-dark-panel/gtk-3.0/apps/unity.css | 24 +- .../gtk-3.0/gtk-widgets-assets-radiance.css | 22 +- .../gtk-3.0/gtk-widgets-assets.css | 321 ++--- .../gtk-3.0/gtk-widgets-borders-radiance.css | 37 +- .../gtk-3.0/gtk-widgets-borders.css | 147 -- .../gtk-3.0/gtk-widgets.css | 1203 +++++++---------- .../gtk-3.0/public-colors.css | 23 + .../Lubuntu-dark-panel/gtk-3.0/settings.ini | 2 +- .../Lubuntu-default/gtk-3.0/apps/geary.css | 5 + .../Lubuntu-default/gtk-3.0/apps/nautilus.css | 4 + .../Lubuntu-default/gtk-3.0/apps/unity.css | 16 +- .../Lubuntu-default/gtk-3.0/gtk-main.css | 2 + .../gtk-3.0/gtk-widgets-assets-radiance.css | 22 +- .../gtk-3.0/gtk-widgets-assets.css | 321 ++--- .../gtk-3.0/gtk-widgets-borders-radiance.css | 37 +- .../gtk-3.0/gtk-widgets-borders.css | 147 -- .../Lubuntu-default/gtk-3.0/gtk-widgets.css | 1203 +++++++---------- .../Lubuntu-default/gtk-3.0/public-colors.css | 23 + .../Lubuntu-default/gtk-3.0/settings.ini | 2 +- 21 files changed, 1359 insertions(+), 2211 deletions(-) create mode 100644 src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/apps/geary.css create mode 100644 src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/public-colors.css create mode 100644 src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/geary.css create mode 100644 src/usr/share/themes/Lubuntu-default/gtk-3.0/public-colors.css diff --git a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/apps/geary.css b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/apps/geary.css new file mode 100644 index 0000000..f6d1964 --- /dev/null +++ b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/apps/geary.css @@ -0,0 +1,5 @@ + +/* for overlay-scrollbars */ +ComposerWidget { + background-color: @bg_color; +} diff --git a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/apps/nautilus.css b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/apps/nautilus.css index 55b04f7..c68ad20 100644 --- a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/apps/nautilus.css +++ b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/apps/nautilus.css @@ -105,6 +105,10 @@ NautilusFloatingBar .button { -GtkButton-inner-border: 0; } +NautilusWindow .header-bar .button { + padding: 9px; +} + /* sidebar */ NautilusWindow .sidebar, NautilusWindow .sidebar .view { diff --git a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/apps/unity.css b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/apps/unity.css index 0b22c56..050a438 100644 --- a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/apps/unity.css +++ b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/apps/unity.css @@ -20,7 +20,7 @@ UnityDecoration { } UnityDecoration.top { - border: 1px solid rgba (72, 33, 0, 0.3568); /* shade (@dark_bg_color, 0.8) - shade (#edebe6, 1.06) */ + border: 1px solid rgba (72, 72, 72, 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; @@ -40,12 +40,12 @@ UnityDecoration.top { } UnityDecoration.top:backdrop { - border: 1px solid rgba (74, 29, 0, 0.2784); /* shade (@dark_bg_color, 0.8) - shade (#edebe6, 0.96) */ + border: 1px solid rgba (74, 74, 74, 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)), + from (shade (#e0e0e0, 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; @@ -62,8 +62,8 @@ UnityDecoration.right { /* 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 (0, #a8a8a8), + color-stop (0.5, #a8a8a8), color-stop (1, shade (@bg_color, 0.7))); } @@ -71,8 +71,8 @@ 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 (0, #b5b5b5), + color-stop (0.5, #b5b5b5), color-stop (1, shade (@bg_color, 0.7))); } @@ -86,7 +86,7 @@ UnityDecoration.bottom { UnityPanelWidget, .unity-panel { background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (#edebe6, 1.06)), + from (shade (#e0e0e0, 1.06)), to (@dark_bg_color)); border-top-color: shade (#edebe6, 1.08); border-style: solid; @@ -109,7 +109,9 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 1.5)), - to (shade (@dark_bg_color, 1.02))); + background-image: linear-gradient(to bottom, + shade (@selected_bg_color, 0.96), + shade (@selected_bg_color, 1.15)); + color: @selected_fg_color; } + diff --git a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets-assets-radiance.css b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets-assets-radiance.css index 69e73d6..8d0092c 100644 --- a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets-assets-radiance.css +++ b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets-assets-radiance.css @@ -1,23 +1,23 @@ .menu .check { - background-image: url("assets/check-menuitem-unselected.png"); + -gtk-icon-source: url("assets/check-menuitem-unselected.png"); } .menu .radio { - background-image: url("assets/check-menuitem-unselected.png"); + -gtk-icon-source: url("assets/check-menuitem-unselected.png"); } -.menu .check:active { - background-image: url("assets/check-menuitem-dark.png"); +.menu .check:checked { + -gtk-icon-source: url("assets/check-menuitem-dark.png"); } -.menu .check:active:insensitive { - background-image: url("assets/check-menuitem-insensitive-dark.png"); +.menu .check:checked:insensitive { + -gtk-icon-source: url("assets/check-menuitem-insensitive-dark.png"); } -.menu .radio:active { - background-image: url("assets/radio-menuitem-dark.png"); +.menu .radio:checked { + -gtk-icon-source: url("assets/radio-menuitem-dark.png"); } -.menu .radio:active:insensitive { - background-image: url("assets/radio-menuitem-insensitive-dark.png"); -} \ No newline at end of file +.menu .radio:checked:insensitive { + -gtk-icon-source: url("assets/radio-menuitem-insensitive-dark.png"); +} diff --git a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets-assets.css b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets-assets.css index ab8f695..c1c3d63 100644 --- a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets-assets.css +++ b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets-assets.css @@ -12,33 +12,28 @@ *************************/ /* draw regular check and radio items using our SVG assets */ -.radio, .check { - /*background-clip: border-box;*/ -} - -.check { - background-image: url("assets/check-unselected.png"); + -gtk-icon-source: url("assets/check-unselected.png"); } .check:hover { - background-image: url("assets/check-unselected-hover.png"); + -gtk-icon-source: url("assets/check-unselected-hover.png"); } .check row, .check row:selected, .check row:selected:focus { - background-image: url("assets/check-unselected-alt.png"); + -gtk-icon-source: url("assets/check-unselected-alt.png"); } .check row:hover, .check row:selected:hover, .check row:selected:focus:hover { - background-image: url("assets/check-unselected-hover-alt.png"); + -gtk-icon-source: url("assets/check-unselected-hover-alt.png"); } .check:insensitive { - background-image: url("assets/check-unselected-disabled.png"); + -gtk-icon-source: url("assets/check-unselected-disabled.png"); } .check row:insensitive { @@ -49,169 +44,169 @@ .check row:selected:insensitive, .check row:selected:focus:insensitive { background-color: transparent; - background-image: url("assets/check-unselected-disabled-alt.png"); + -gtk-icon-source: url("assets/check-unselected-disabled-alt.png"); } .check:backdrop { - background-image: url("assets/backdrop-check-unselected.png"); + -gtk-icon-source: url("assets/backdrop-check-unselected.png"); } .check:hover:backdrop { - background-image: url("assets/backdrop-check-unselected-hover.png"); + -gtk-icon-source: url("assets/backdrop-check-unselected-hover.png"); } .check row:backdrop, .check row:selected:backdrop { - background-image: url("assets/backdrop-check-unselected-alt.png"); + -gtk-icon-source: url("assets/backdrop-check-unselected-alt.png"); } .check row:hover:backdrop, .check row:selected:hover:backdrop { - background-image: url("assets/backdrop-check-unselected-hover-alt.png"); + -gtk-icon-source: url("assets/backdrop-check-unselected-hover-alt.png"); } .check:insensitive:backdrop { - background-image: url("assets/backdrop-check-unselected-disabled.png"); + -gtk-icon-source: url("assets/backdrop-check-unselected-disabled.png"); } .check row:selected:insensitive:backdrop { - background-image: url("assets/backdrop-check-unselected-disabled-alt.png"); + -gtk-icon-source: url("assets/backdrop-check-unselected-disabled-alt.png"); } -.check:active { - background-image: url("assets/check-selected.png"); +.check:checked { + -gtk-icon-source: url("assets/check-selected.png"); } -.check:active:hover { - background-image: url("assets/check-selected-hover.png"); +.check:checked:hover { + -gtk-icon-source: url("assets/check-selected-hover.png"); } -.check row:active, -.check row:selected:active, -.check row:selected:focus:active { - background-image: url("assets/check-selected-alt.png"); +.check row:checked, +.check row:selected:checked, +.check row:selected:focus:checked { + -gtk-icon-source: url("assets/check-selected-alt.png"); } -.check row:active:hover, -.check row:selected:active:hover, -.check row:selected:active:focus:hover { - background-image: url("assets/check-selected-hover-alt.png"); +.check row:checked:hover, +.check row:selected:checked:hover, +.check row:selected:checked:focus:hover { + -gtk-icon-source: url("assets/check-selected-hover-alt.png"); } -.check:active:insensitive { - background-image: url("assets/check-selected-disabled.png"); +.check:checked:insensitive { + -gtk-icon-source: url("assets/check-selected-disabled.png"); } -.check row:active:insensitive, -.check row:selected:active:insensitive, -.check row:selected:focus:active:insensitive { - background-image: url("assets/check-selected-disabled-alt.png"); +.check row:checked:insensitive, +.check row:selected:checked:insensitive, +.check row:selected:focus:checked:insensitive { + -gtk-icon-source: url("assets/check-selected-disabled-alt.png"); } -.check:active:backdrop { - background-image: url("assets/backdrop-check-selected.png"); +.check:checked:backdrop { + -gtk-icon-source: url("assets/backdrop-check-selected.png"); } -.check:active:backdrop { - background-image: url("assets/backdrop-check-selected-hover.png"); +.check:checked:backdrop { + -gtk-icon-source: url("assets/backdrop-check-selected-hover.png"); } -.check row:active:backdrop, -.check row:selected:active:backdrop { - background-image: url("assets/backdrop-check-selected-alt.png"); +.check row:checked:backdrop, +.check row:selected:checked:backdrop { + -gtk-icon-source: url("assets/backdrop-check-selected-alt.png"); } -.check row:active:hover:backdrop, -.check row:selected:active:hover:backdrop { - background-image: url("assets/backdrop-check-selected-hover-alt.png"); +.check row:checked:hover:backdrop, +.check row:selected:checked:hover:backdrop { + -gtk-icon-source: url("assets/backdrop-check-selected-hover-alt.png"); } -.check:active:insensitive:backdrop { - background-image: url("assets/backdrop-check-selected-disabled.png"); +.check:checked:insensitive:backdrop { + -gtk-icon-source: url("assets/backdrop-check-selected-disabled.png"); } -.check row:selected:active:insensitive:backdrop { - background-image: url("assets/backdrop-check-selected-disabled-alt.png"); +.check row:selected:checked:insensitive:backdrop { + -gtk-icon-source: url("assets/backdrop-check-selected-disabled-alt.png"); } .check:inconsistent { - background-image: url("assets/check-mixed.png"); + -gtk-icon-source: url("assets/check-mixed.png"); } .check:inconsistent:hover { - background-image: url("assets/check-mixed-hover.png"); + -gtk-icon-source: url("assets/check-mixed-hover.png"); } .check row:inconsistent, .check row:selected:inconsistent, .check row:selected:focus:inconsistent { - background-image: url("assets/check-mixed-alt.png"); + -gtk-icon-source: url("assets/check-mixed-alt.png"); } .check row:inconsistent:hover, .check row:selected:inconsistent:hover, .check row:selected:focus:inconsistent:hover { - background-image: url("assets/check-mixed-hover-alt.png"); + -gtk-icon-source: url("assets/check-mixed-hover-alt.png"); } .check:inconsistent:insensitive { - background-image: url("assets/check-mixed-disabled.png"); + -gtk-icon-source: url("assets/check-mixed-disabled.png"); } .check row:inconsistent:insensitive, .check row:selected:inconsistent:insensitive, .check row:selected:focus:inconsistent:insensitive { - background-image: url("assets/check-mixed-disabled-alt.png"); + -gtk-icon-source: url("assets/check-mixed-disabled-alt.png"); } .check:inconsistent:backdrop { - background-image: url("assets/backdrop-check-mixed.png"); + -gtk-icon-source: url("assets/backdrop-check-mixed.png"); } .check:inconsistent:hover:backdrop { - background-image: url("assets/backdrop-check-mixed-hover.png"); + -gtk-icon-source: url("assets/backdrop-check-mixed-hover.png"); } .check row:inconsistent:backdrop, .check row:selected:inconsistent:backdrop { - background-image: url("assets/backdrop-check-mixed-alt.png"); + -gtk-icon-source: url("assets/backdrop-check-mixed-alt.png"); } .check row:inconsistent:hover:backdrop, .check row:selected:inconsistent:hover:backdrop { - background-image: url("assets/backdrop-check-mixed-hover-alt.png"); + -gtk-icon-source: url("assets/backdrop-check-mixed-hover-alt.png"); } .check:inconsistent:insensitive:backdrop { - background-image: url("assets/backdrop-check-mixed-disabled.png"); + -gtk-icon-source: url("assets/backdrop-check-mixed-disabled.png"); } .check row:selected:inconsistent:insensitive:backdrop { - background-image: url("assets/backdrop-check-mixed-disabled-alt.png"); + -gtk-icon-source: url("assets/backdrop-check-mixed-disabled-alt.png"); } .radio { - background-image: url("assets/radio-unselected.png"); + -gtk-icon-source: url("assets/radio-unselected.png"); } .radio:hover { - background-image: url("assets/radio-unselected-hover.png"); + -gtk-icon-source: url("assets/radio-unselected-hover.png"); } .radio row, .radio row:selected, .radio row:selected:focus { - background-image: url("assets/radio-unselected-alt.png"); + -gtk-icon-source: url("assets/radio-unselected-alt.png"); } .radio row:hover, .radio row:selected:hover, .radio row:selected:focus:hover { - background-image: url("assets/radio-unselected-hover-alt.png"); + -gtk-icon-source: url("assets/radio-unselected-hover-alt.png"); } .radio:insensitive { - background-image: url("assets/radio-unselected-disabled.png"); + -gtk-icon-source: url("assets/radio-unselected-disabled.png"); } .radio row:insensitive { @@ -221,238 +216,218 @@ .radio row:insensitive, .radio row:selected:insensitive, .radio row:selected:focus:insensitive { - background-image: url("assets/radio-unselected-disabled-alt.png"); + -gtk-icon-source: url("assets/radio-unselected-disabled-alt.png"); } .radio:backdrop { - background-image: url("assets/backdrop-radio-unselected.png"); + -gtk-icon-source: url("assets/backdrop-radio-unselected.png"); } .radio:hover:backdrop { - background-image: url("assets/backdrop-radio-unselected-hover.png"); + -gtk-icon-source: url("assets/backdrop-radio-unselected-hover.png"); } .radio row:backdrop, .radio row:selected:backdrop { - background-image: url("assets/backdrop-radio-unselected-alt.png"); + -gtk-icon-source: url("assets/backdrop-radio-unselected-alt.png"); } .radio row:hover:backdrop, .radio row:selected:hover:backdrop { - background-image: url("assets/backdrop-radio-unselected-hover-alt.png"); + -gtk-icon-source: url("assets/backdrop-radio-unselected-hover-alt.png"); } .radio:insensitive:backdrop { - background-image: url("assets/backdrop-radio-unselected-disabled.png"); + -gtk-icon-source: url("assets/backdrop-radio-unselected-disabled.png"); } .radio row:selected:insensitive:backdrop { - background-image: url("assets/backdrop-radio-unselected-disabled-alt.png"); + -gtk-icon-source: url("assets/backdrop-radio-unselected-disabled-alt.png"); } -.radio:active { - background-image: url("assets/radio-selected.png"); +.radio:checked { + -gtk-icon-source: url("assets/radio-selected.png"); } -.radio:active:hover { - background-image: url("assets/radio-selected-hover.png"); +.radio:checked:hover { + -gtk-icon-source: url("assets/radio-selected-hover.png"); } -.radio row:active, -.radio row:selected:active, -.radio row:selected:focus:active { - background-image: url("assets/radio-selected-alt.png"); +.radio row:checked, +.radio row:selected:checked, +.radio row:selected:focus:checked { + -gtk-icon-source: url("assets/radio-selected-alt.png"); } -.radio row:active:hover, -.radio row:selected:active:hover, -.radio row:selected:focus:active:hover { - background-image: url("assets/radio-selected-hover-alt.png"); +.radio row:checked:hover, +.radio row:selected:checked:hover, +.radio row:selected:focus:checked:hover { + -gtk-icon-source: url("assets/radio-selected-hover-alt.png"); } -.radio:active:insensitive { - background-image: url("assets/radio-selected-disabled.png"); +.radio:checked:insensitive { + -gtk-icon-source: url("assets/radio-selected-disabled.png"); } .radio row:insensitive, -.radio row:selected:active:insensitive, -.radio row:selected:focus:active:insensitive { - background-image: url("assets/radio-selected-disabled-alt.png"); +.radio row:selected:checked:insensitive, +.radio row:selected:focus:checked:insensitive { + -gtk-icon-source: url("assets/radio-selected-disabled-alt.png"); } -.radio:active:backdrop { - background-image: url("assets/backdrop-radio-selected.png"); +.radio:checked:backdrop { + -gtk-icon-source: url("assets/backdrop-radio-selected.png"); } -.radio:active:hover:backdrop { - background-image: url("assets/backdrop-radio-selected-hover.png"); +.radio:checked:hover:backdrop { + -gtk-icon-source: url("assets/backdrop-radio-selected-hover.png"); } -.radio row:active:backdrop, -.radio row:selected:active:backdrop { - background-image: url("assets/backdrop-radio-selected-alt.png"); +.radio row:checked:backdrop, +.radio row:selected:checked:backdrop { + -gtk-icon-source: url("assets/backdrop-radio-selected-alt.png"); } -.radio row:active:hover:backdrop, -.radio row:selected:active:hover:backdrop { - background-image: url("assets/backdrop-radio-selected-hover-alt.png"); +.radio row:checked:hover:backdrop, +.radio row:selected:checked:hover:backdrop { + -gtk-icon-source: url("assets/backdrop-radio-selected-hover-alt.png"); } -.radio:active:insensitive:backdrop { - background-image: url("assets/backdrop-radio-selected-disabled.png"); +.radio:checked:insensitive:backdrop { + -gtk-icon-source: url("assets/backdrop-radio-selected-disabled.png"); } -.radio row:selected:active:insensitive:backdrop { - background-image: url("assets/backdrop-radio-selected-disabled-alt.png"); +.radio row:selected:checked:insensitive:backdrop { + -gtk-icon-source: url("assets/backdrop-radio-selected-disabled-alt.png"); } .radio:inconsistent { - background-image: url("assets/radio-mixed.png"); + -gtk-icon-source: url("assets/radio-mixed.png"); } .radio:inconsistent:hover { - background-image: url("assets/radio-mixed-hover.png"); + -gtk-icon-source: url("assets/radio-mixed-hover.png"); } .radio row:inconsistent, .radio row:selected:inconsistent, .radio row:selected:focus:inconsistent { - background-image: url("assets/radio-mixed-alt.png"); + -gtk-icon-source: url("assets/radio-mixed-alt.png"); } .radio row:inconsistent:hover, .radio row:selected:inconsistent:hover, .radio row:selected:focus:inconsistent:hover { - background-image: url("assets/radio-mixed-hover-alt.png"); + -gtk-icon-source: url("assets/radio-mixed-hover-alt.png"); } .radio:inconsistent:insensitive { - background-image: url("assets/radio-mixed-disabled.png"); + -gtk-icon-source: url("assets/radio-mixed-disabled.png"); } .radio row:inconsistent:insensitive, .radio row:selected:inconsistent:insensitive, .radio row:selected:focus:inconsistent:insensitive { - background-image: url("assets/radio-mixed-disabled-alt.png"); + -gtk-icon-source: url("assets/radio-mixed-disabled-alt.png"); } .radio:inconsistent:backdrop { - background-image: url("assets/backdrop-radio-mixed.png"); + -gtk-icon-source: url("assets/backdrop-radio-mixed.png"); } .radio:inconsistent:hover:backdrop { - background-image: url("assets/backdrop-radio-mixed-hover.png"); + -gtk-icon-source: url("assets/backdrop-radio-mixed-hover.png"); } .radio row:inconsistent:backdrop, .radio row:selected:inconsistent:backdrop { - background-image: url("assets/backdrop-radio-mixed-alt.png"); + -gtk-icon-source: url("assets/backdrop-radio-mixed-alt.png"); } .radio row:inconsistent:hover:backdrop, .radio row:selected:inconsistent:hover:backdrop { - background-image: url("assets/backdrop-radio-mixed-hover-alt.png"); + -gtk-icon-source: url("assets/backdrop-radio-mixed-hover-alt.png"); } .radio:inconsistent:insensitive:backdrop { - background-image: url("assets/backdrop-radio-mixed-disabled.png"); + -gtk-icon-source: url("assets/backdrop-radio-mixed-disabled.png"); } .radio row:selected:inconsistent:insensitive:backdrop { - background-image: url("assets/backdrop-radio-mixed-disabled-alt.png"); + -gtk-icon-source: url("assets/backdrop-radio-mixed-disabled-alt.png"); } -/*.sidebar .radio:active, -.sidebar .radio:active:focus, -.sidebar .radio:active:hover { - background-image: url("assets/sidebar-radio-selected.svg"); -} - -.sidebar .radio:hover { - background-image: url("assets/sidebar-radio-prelight.svg"); -} - -.sidebar .radio:active:selected, -.sidebar .radio:active:selected:focus { - background-image: url("assets/sidebar-radio-selected.svg"); -} - -.sidebar .radio:selected:hover, -.sidebar .radio:selected:focus { - background-image: url("assets/sidebar-radio-selected-prelight.svg"); -}*/ - .primary-toolbar .menu .check, .menubar.toolbar .menu .check, .header-bar .menu .check, .menu .check { - background-image: url("assets/check-menuitem-unselected.png"); + -gtk-icon-source: url("assets/check-menuitem-unselected.png"); } .primary-toolbar .menu .radio, .menubar.toolbar .menu .radio, .header-bar .menu .radio, .menu .radio { - background-image: url("assets/check-menuitem-unselected.png"); + -gtk-icon-source: url("assets/check-menuitem-unselected.png"); } -.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"); +.primary-toolbar .menu .check:checked, +.menubar.toolbar .menu .check:checked, +.header-bar .menu .check:checked, +.menu .check:checked { + -gtk-icon-source: url("assets/check-menuitem-dark.png"); } -.toolbar .menu .check:active:hover, -.menu .check:active:hover { - background-image: url("assets/check-menuitem.png"); +.toolbar .menu .check:checked:hover, +.menu .check:checked:hover { + -gtk-icon-source: url("assets/check-menuitem.png"); } -.primary-toolbar .menu .check:active:insensitive, -.menubar.toolbar .menu .check:active:insensitive, -.header-bar .menu .check:active:insensitive, -.toolbar .menu .check:active:hover:insensitive, -.menu .check:active:insensitive, -.menu .check:active:hover:insensitive { - background-image: url("assets/check-menuitem-insensitive.png"); +.primary-toolbar .menu .check:checked:insensitive, +.menubar.toolbar .menu .check:checked:insensitive, +.header-bar .menu .check:checked:insensitive, +.toolbar .menu .check:checked:hover:insensitive, +.menu .check:checked:insensitive, +.menu .check:checked:hover:insensitive { + -gtk-icon-source: url("assets/check-menuitem-insensitive.png"); } -.toolbar .menu .radio:active:hover, -.menu .radio:active { - background-image: url("assets/radio-menuitem.png"); +.toolbar .menu .radio:checked:hover, +.menu .radio:checked { + -gtk-icon-source: url("assets/radio-menuitem.png"); } -.primary-toolbar .menu .radio:active:insensitive, -.menubar.toolbar .menu .radio:active:insensitive, -.header-bar .menu .radio:active:insensitive, -.toolbar .menu .radio:active:hover:insensitive, -.menu .radio:active:insensitive, -.menu .radio:active:hover:insensitive { - background-image: url("assets/radio-menuitem-insensitive.png"); +.primary-toolbar .menu .radio:checked:insensitive, +.menubar.toolbar .menu .radio:checked:insensitive, +.header-bar .menu .radio:checked:insensitive, +.toolbar .menu .radio:checked:hover:insensitive, +.menu .radio:checked:insensitive, +.menu .radio:checked:hover:insensitive { + -gtk-icon-source: url("assets/radio-menuitem-insensitive.png"); } .toolbar .menu .check { - background-image: url("assets/check-menuitem-unselected.png"); + -gtk-icon-source: url("assets/check-menuitem-unselected.png"); } .toolbar .menu .radio { - background-image: url("assets/check-menuitem-unselected.png"); + -gtk-icon-source: url("assets/check-menuitem-unselected.png"); } -.toolbar .menu .check:active { - background-image: url("assets/check-menuitem-dark.png"); +.toolbar .menu .check:checked { + -gtk-icon-source: url("assets/check-menuitem-dark.png"); } -.toolbar .menu .check:active:insensitive { - background-image: url("assets/check-menuitem-insensitive-dark.png"); +.toolbar .menu .check:checked:insensitive { + -gtk-icon-source: url("assets/check-menuitem-insensitive-dark.png"); } -.toolbar .menu .radio:active { - background-image: url("assets/radio-menuitem-dark.png"); +.toolbar .menu .radio:checked { + -gtk-icon-source: url("assets/radio-menuitem-dark.png"); } -.toolbar .menu .radio:active:insensitive { - background-image: url("assets/radio-menuitem-insensitive-dark.png"); +.toolbar .menu .radio:checked:insensitive { + -gtk-icon-source: url("assets/radio-menuitem-insensitive-dark.png"); } /********************* diff --git a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets-borders-radiance.css b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets-borders-radiance.css index cc1f946..63c840e 100644 --- a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets-borders-radiance.css +++ b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets-borders-radiance.css @@ -1,38 +1,3 @@ -.primary-toolbar .button, -.menubar.toolbar .button, -.header-bar .button { - border-image: url("assets/radiance-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:focused, -.menubar.toolbar .button:focused, -.header-bar .button:focused { - border-image: url("assets/radiance-button-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:active, -.menubar.toolbar .button:active, -.header-bar .button:active { - border-image: url("assets/radiance-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:active:focused, -.menubar.toolbar .button:active:focused, -.header-bar .button:active:focused { - border-image: url("assets/radiance-button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:backdrop, -.menubar.toolbar .button:backdrop, -.header-bar .button:backdrop { - border-image: url("assets/radiance-backdrop-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:active:backdrop, -.menubar.toolbar .button:active:backdrop, -.header-bar .button:active:backdrop { - border-image: url("assets/radiance-backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} .primary-toolbar .entry, .menubar.toolbar .entry, @@ -70,4 +35,4 @@ .menubar.menuitem:hover, .menubar .menuitem:hover { border-color: #b8ab9c; -} \ No newline at end of file +} diff --git a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets-borders.css b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets-borders.css index e14c0eb..ef48d1b 100644 --- a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets-borders.css +++ b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets-borders.css @@ -1,151 +1,4 @@ /* Borders */ - -.frame { -/* border-radius: 7px; - border-width: 1px;*/ - - /*border-image: url("assets/frame.png") 8 10 8 10 / 8px 10px 8px 10px stretch;*/ -} - -/* focused element borders */ -.entry:focus, -GtkComboBox.combobox-entry .entry:focus, -.button:focus:active, -.button.default:active, -GtkSwitch.trough:active { -} - -/********** - * button * - **********/ -.button { - border-radius: 8px; - border-width: 1px; - border-style: solid; - border-color: transparent; -} - -.button { - border-image: url("assets/button.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:backdrop { - border-image: url("assets/backdrop-button.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:focus { - border-image: url("assets/button-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:hover { - border-image: url("assets/button-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:hover:backdrop { - border-image: url("assets/backdrop-button-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:hover:focus { - border-image: url("assets/button-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:insensitive { - border-image: url("assets/button-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:insensitive:backdrop { - border-image: url("assets/backdrop-button-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:active { - border-image: url("assets/button-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:active:backdrop { - border-image: url("assets/backdrop-button-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:active:hover { - border-image: url("assets/button-active-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:active:hover:backdrop { - border-image: url("assets/backdrop-button-active-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:active:focus { - border-image: url("assets/button-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:active:hover:focus { - border-image: url("assets/button-active-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:active:insensitive { - border-image: url("assets/button-active-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:active:insensitive:backdrop { - border-image: url("assets/backdrop-button-active-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -/* focused button borders */ -.button:focus, -.button.default { -} - -.button.default { - border-image: url("assets/button-default.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button.default:hover { - border-image: url("assets/button-default-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button.default:focus { - border-image: url("assets/button-default-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button.default:focus:hover { - border-image: url("assets/button-default-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button, -.menubar.toolbar .button, -.header-bar .button { - border-image: url("assets/button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:focused, -.menubar.toolbar .button:focused, -.header-bar .button:focused { - border-image: url("assets/button-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:active, -.menubar.toolbar .button:active, -.header-bar .button:active { - border-image: url("assets/button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:active:focused, -.menubar.toolbar .button:active:focused, -.header-bar .button:active:focused { - border-image: url("assets/button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:backdrop, -.menubar.toolbar .button:backdrop, -.header-bar .button:backdrop { - border-image: url("assets/backdrop-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:active:backdrop, -.menubar.toolbar .button:active:backdrop, -.header-bar .button:active:backdrop { - border-image: url("assets/backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - .menubar.menuitem:hover, .menubar .menuitem:hover { border: 1px solid #2e2e2c; diff --git a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets.css b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets.css index aa5251a..338bf83 100644 --- a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets.css +++ b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets.css @@ -1,7 +1,3 @@ -/* NOTES to contributors: - * use 4 spaces intends, and keep code ALIGNED and ORDERED */ - -/* default */ * { -GtkArrow-arrow-scaling: 0.6; -GtkButton-child-displacement-x: 1; @@ -15,8 +11,8 @@ -GtkEntry-inner-border: 2; -GtkEntry-progress-border: 0; -GtkExpander-expander-size: 8; - -GtkHTML-link-color: @link_color; - -GtkIMHtml-hyperlink-color: @link_color; + -GtkHTML-link-color: #f07746; /* @link_color */ + -GtkIMHtml-hyperlink-color: #f07746; /* @link_color */ -GtkMenu-horizontal-padding: 0; -GtkMenu-vertical-padding: 5px; -GtkMenuBar-internal-padding: 0; @@ -38,7 +34,7 @@ -GtkScrolledWindow-scrollbars-within-bevel: 1; -GtkSeparatorMenuItem-horizontal-padding: 0; -GtkStatusbar-shadow-type: none; - -GtkTextView-error-underline-color: @error_color; + -GtkTextView-error-underline-color: #df382c; /* @error_color */ -GtkToolButton-icon-spacing: 6; -GtkToolItemGroup-expander-size: 11; -GtkToolbar-internal-padding: 0; @@ -46,32 +42,27 @@ -GtkTreeView-vertical-separator: 0; -GtkWidget-separator-width: 2; -GtkWidget-separator-height: 2; - -GtkWidget-focus-padding: 0; - -GtkWidget-focus-line-width: 1px; - -GtkWidget-link-color: @link_color; - -GtkWidget-visited-link-color: @link_color; - -GtkWindow-decoration-button-layout: "close:"; + -GtkWidget-link-color: #f07746; /* @link_color */ + -GtkWidget-visited-link-color: #f07746; /* @link_color */ -GtkWindow-resize-grip-width: 0; -GtkWindow-resize-grip-height: 0; -WnckTasklist-fade-overlay-rect: 0; background-origin: border-box; background-clip: padding-box; - border-width: 1px; - - engine: unico; +} - /*-unico-arrow-texture: url("assets/combobox-arrow.png");*/ +.background { + color: @fg_color; + background-color: @bg_color; +} - /* 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; +.background:backdrop { + color: @backdrop_fg_color; } -GtkWindow { - color: @fg_color; +/* LP: #1285783 */ +GtkScrolledWindow { background-color: @bg_color; } @@ -79,21 +70,18 @@ GtkPaned { background-color: @bg_color; } -GtkWindow:backdrop { - color: @backdrop_fg_color; +/* Background hack to make DejaDup Assistant windows not turn black when + * overlay scrollbars are enabled. + */ +Assistant GtkEventBox { + background-color: @bg_color; } -GtkEventBox { +/* ... and for Evolution's mail preferences window */ +EPreferencesWindow GtkNotebook GtkAlignment GtkVBox { background-color: @bg_color; } -/********* - * arrow * - *********/ -/*.arrow * { - background-image: url("assets/combobox-arrow.png"); -}*/ - /************* * assistant * *************/ @@ -116,25 +104,12 @@ GtkAssistant .sidebar { box-shadow: inset -1px 0 shade (@bg_color, 0.94); } -/************** - * background * - **************/ -.background { - background-color: @bg_color; - border-width: 0; -} - /********** * button * **********/ .button { - -GtkWidget-focus-line-width: 0; - padding: 5px 6px; -} -GtkSwitch.slider, -.button { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@button_bg_color, 1.08)), color-stop (0.5, @button_bg_color), @@ -142,27 +117,54 @@ GtkSwitch.slider, color: @fg_color; text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4); + + border: 1px solid transparent; + border-radius: 8px; + border-image-source: url("assets/button.png"); + + /* all button border images have the same size and are sliced in the same way */ + border-image-width: 10px 12px 10px 12px; + border-image-slice: 10 12 10 12; + border-image-repeat: stretch; +} + +.button.flat { + background-image: none; + border-image-source: none; } -GtkSwitch.slider:backdrop, .button:backdrop { background-image: none; background-color: @bg_color; + border-image-source: url("assets/backdrop-button.png"); color: @backdrop_fg_color; text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.2); } +.button.flat:backdrop { + border-image-source: none; +} + +.button:focus { + border-image-source: url("assets/button-focused.png"); +} + .button:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@button_bg_color, 1.12)), color-stop (0.5, @button_bg_color), to (shade (@button_bg_color, 0.96))); + border-image-source: url("assets/button-hover.png"); } .button:hover:backdrop { - background-image: none; background-color: shade (@bg_color, 1.04); + border-image-source: url("assets/backdrop-button-hover.png"); +} + +.button:hover:focus { + border-image-source: url("assets/button-focused-hover.png"); } .button:insensitive { @@ -170,314 +172,141 @@ GtkSwitch.slider:backdrop, background-color: mix (#ebebeb, @bg_color, 0.5); text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4); + border-image-source: url("assets/button-disabled.png"); } .button:insensitive:backdrop { - background-image: none; background-color: #ebebeb; text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.2); + border-image-source: url("assets/backdrop-button-disabled.png"); } -.button:active { +.button.flat:insensitive, +.button.flat:insensitive:backdrop { + background-color: transparent; + border-image-source: none; +} + +.button:checked { background-image: -gtk-gradient (linear, left top, left bottom, from (#cecece), to (#e8e8e8)); + border-image-source: url("assets/button-active.png"); } -.button:active:hover { - background-image: -gtk-gradient (linear, left top, left bottom, - from (#dcdcdc), - to (#f3f3f3)); +.button:checked:focus { + border-image-source: url("assets/button-active-focused.png"); } -.button:active:insensitive { +.button:active { background-image: -gtk-gradient (linear, left top, left bottom, - from (#e3e3e3), + from (#dcdcdc), to (#f3f3f3)); + border-image-source: url("assets/button-active-hover.png"); } -.button:active:insensitive:backdrop { - background-image: -gtk-gradient (linear, left top, left bottom, - from (mix (#e3e3e3, @bg_color, 0.5)), - to (mix (#f3f3f3, @bg_color, 0.5))); +.button:active:focus { + border-image-source: url("assets/button-active-focused-hover.png"); } -/* default button */ - -/* -.button.default { +.button:active:insensitive { background-image: -gtk-gradient (linear, left top, left bottom, - from (mix (shade (@selected_bg_color, 1.16), @bg_color, 0.3)), - to (mix (shade (@selected_bg_color, 0.84), @bg_color, 0.3))); - - text-shadow: 0 1px alpha (shade (@selected_bg_color, 1.26), 0.4); + from (#e3e3e3), + to (#f3f3f3)); + border-image-source: url("assets/button-active-disabled.png"); } -.button.default:hover { - background-image: -gtk-gradient (linear, left top, left bottom, - from (mix (shade (@selected_bg_color, 1.21), @bg_color, 0.3)), - to (mix (shade (@selected_bg_color, 0.89), @bg_color, 0.3))); +.button:checked:backdrop { + border-image-source: url("assets/backdrop-button-active.png"); } -.button.default:active { - background-image: -gtk-gradient (linear, left top, left bottom, - from (mix (shade (@selected_bg_color, 0.95), @bg_color, 0.3)), - to (mix (shade (@selected_bg_color, 1.05), @bg_color, 0.3))); +.button:active:backdrop { + border-image-source: url("assets/backdrop-button-active-hover.png"); } -.button.default:active:hover { +.button:checked:insensitive:backdrop { background-image: -gtk-gradient (linear, left top, left bottom, - from (mix (shade (@selected_bg_color, 1.0), @bg_color, 0.3)), - to (mix (shade (@selected_bg_color, 1.1), @bg_color, 0.3))); -} - -.button.default:insensitive { -} -*/ - -/* Set up shadows and hilights for button visual separation */ -.linked .button, -.toolbar .button.raised.linked, -.toolbar .raised.linked .button, -.inline-toolbar.toolbar .button, -.inline-toolbar.toolbar GtkToolButton .button { - box-shadow: inset -1px 0 shade (@bg_color, 0.84); -} - -.linked .button:first-child, -.toolbar .button.raised.linked:first-child, -.toolbar .raised.linked .button:first-child, -.inline-toolbar.toolbar .button:first-child, -.inline-toolbar.toolbar GtkToolButton:first-child .button { - box-shadow: inset -1px 0 shade (@bg_color, 0.84); -} - -.linked .button:last-child, -.toolbar .button.raised.linked:last-child, -.toolbar .raised.linked .button:last-child, -.inline-toolbar.toolbar .button:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child .button { - /*box-shadow: inset 1px 0 shade (@bg_color, 1.06);*/ + from (mix (#e3e3e3, @bg_color, 0.5)), + to (mix (#f3f3f3, @bg_color, 0.5))); + border-image-source: url("assets/backdrop-button-active-disabled.png"); } -.linked .button:active, -.toolbar .button.raised.linked:active, -.toolbar .raised.linked .button:active, -.inline-toolbar.toolbar .button:active, -.inline-toolbar.toolbar GtkToolButton .button:active { - /*box-shadow: inset 1px 0 shade (@bg_color, 0.76);*/ +.button.default { + border-image-source: url("assets/button-default.png"); } -.linked .button:insensitive, -.toolbar .button.raised.linked:insensitive, -.toolbar .raised.linked .button:insensitive, -.inline-toolbar.toolbar .button:insensitive, -.inline-toolbar.toolbar GtkToolButton .button:insensitive { - box-shadow: inset -1px 0 shade (@bg_color, 0.84); +.button.default:hover { + border-image-source: url("assets/button-default-hover.png"); } -.linked .button:backdrop, -.toolbar .button.raised.linked:backdrop, -.toolbar .raised.linked .button:backdrop, -.inline-toolbar.toolbar .button:backdrop, -.inline-toolbar.toolbar GtkToolButton .button:backdrop { - /*box-shadow: inset -1px 0 @unfocused_borders;*/ +.button.default:focus { + border-image-source: url("assets/button-default-focused.png"); } -.linked .button:insensitive:backdrop, -.toolbar .button.raised.linked:insensitive:backdrop, -.toolbar .raised.linked .button:insensitive:backdrop, -.inline-toolbar.toolbar .button:insensitive:backdrop, -.inline-toolbar.toolbar GtkToolButton .button:insensitive:backdrop { - /*box-shadow: inset -1px 0 @unfocused_insensitive_borders;*/ +.button.default:focus:hover { + border-image-source: url("assets/button-default-focused-hover.png"); } - -/* Middle button */ -.linked .entry, -.linked .entry:active, -.linked .entry:focus, -.linked .entry:focus:active, -.linked .button, -.linked .button:active, -.linked .button:active:hover, -.linked .button:focus, -.linked .button:focus:active, -.linked .button:insensitive, -.linked .button:backdrop, -.linked .button:active:backdrop { - border-right-width: 0; - border-left-width: 0; - border-image-width: 10px 0 10px 0; +/****************** + * Linked Widgets * + *****************/ +.linked > .entry, +.linked > .button, +.linked > GtkComboBox > .button { border-radius: 0; + border-image-width: 10px 0 10px 0; + border-width: 1px 0 1px 0; + box-shadow: inset -1px 0 shade (@bg_color, 0.84); } -/* Leftmost button */ -.linked .entry:first-child, -.linked .entry:active:first-child, -.linked .entry:focus:first-child, -.linked .entry:focus:active:first-child, -.linked .button:first-child, -.linked .button:active:first-child, -.linked .button:active:hover:first-child, -.linked .button:focus:first-child, -.linked .button:focus:active:first-child, -.linked .button:insensitive:first-child, -.linked .button:backdrop:first-child, -.linked .button:active:backdrop:first-child { - border-width: 1px; - border-right-width: 0; +.linked > .entry:first-child, +.linked > .button:first-child, +.linked > GtkComboBox:first-child > .button { border-image-width: 10px 0 10px 12px; - border-radius: 8px; - border-bottom-right-radius: 0; - border-top-right-radius: 0; + border-radius: 8px 0 0 8px; } -/* Rightmost button */ -.linked .entry:last-child, -.linked .entry:active:last-child, -.linked .entry:focus:last-child, -.linked .entry:focus:active:last-child, -.linked .button:last-child, -.linked .button:active:last-child, -.linked .button:active:hover:last-child, -.linked .button:focus:last-child, -.linked .button:focus:active:last-child, -.linked .button:insensitive:last-child, -.linked .button:backdrop:last-child, -.linked .button:active:backdrop:last-child { - border-width: 1px; - border-left-width: 0; +.linked > .entry:last-child, +.linked > .button:last-child, +.linked > GtkComboBox:last-child > .button { border-image-width: 10px 12px 10px 0; - border-radius: 8px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; + border-radius: 0 8px 8px 0; + box-shadow: none; } -/* Linked single button */ -.linked .entry:only-child, -.linked .entry:active:only-child, -.linked .entry:focus:only-child, -.linked .entry:focus:active:only-child, -.linked .button:only-child, -.linked .button:active:only-child, -.linked .button:active:hover:only-child, -.linked .button:focus:only-child, -.linked .button:focus:active:only-child, -.linked .button:insensitive:only-child, -.linked .button:backdrop:only-child, -.linked .button:active:backdrop:only-child { - border-right-width: 1px; - border-left-width: 1px; +.linked > .entry:only-child, +.linked > .button:only-child, +.linked > GtkComboBox:only-child > .button { border-image-width: 10px 12px 10px 12px; border-radius: 8px; } -/* Set up shadows and hilights for button visual separation */ .primary-toolbar .linked .button, -.primary-toolbar .button.raised.linked, -.primary-toolbar .raised.linked .button, -.menubar.toolbar .linked .button, -.menubar.toolbar .button.raised.linked, -.menubar.toolbar .raised.linked .button, -.header-bar .linked .button, -.header-bar .button.raised.linked, -.header-bar .raised.linked .button { +.header-bar .linked .button { box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4), inset -1px 0 shade (@dark_bg_color, 0.9); } .primary-toolbar .linked .button:first-child, -.primary-toolbar .button.raised.linked:first-child, -.primary-toolbar .raised.linked .button:first-child, -.menubar.toolbar .linked .button:first-child, -.menubar.toolbar .button.raised.linked:first-child, -.menubar.toolbar .raised.linked .button:first-child, -.header-bar .linked .button:first-child, -.header-bar .button.raised.linked:first-child, -.header-bar .raised.linked .button:first-child { +.header-bar .linked .button:first-child { box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9); } .primary-toolbar .linked .button:last-child, -.primary-toolbar .button.raised.linked:last-child, -.primary-toolbar .raised.linked .button:last-child, -.menubar.toolbar .linked .button:last-child, -.menubar.toolbar .button.raised.linked:last-child, -.menubar.toolbar .raised.linked .button:last-child, -.header-bar .linked .button:last-child, -.header-bar .button.raised.linked:last-child, -.header-bar .raised.linked .button:last-child { +.header-bar .linked .button:last-child { box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4) } .primary-toolbar .linked .button:active, -.primary-toolbar .button.raised.linked:active, -.primary-toolbar .raised.linked .button:active, -.menubar.toolbar .linked .button:active, -.menubar.toolbar .button.raised.linked:active, -.menubar.toolbar .raised.linked .button:active, .header-bar .linked .button:active, -.header-bar .button.raised.linked:active, -.header-bar .raised.linked .button:active { - box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9); -} - .primary-toolbar .linked .button:insensitive, -.primary-toolbar .button.raised.linked:insensitive, -.primary-toolbar .raised.linked .button:insensitive, -.menubar.toolbar .linked .button:insensitive, -.menubar.toolbar .button.raised.linked:insensitive, -.menubar.toolbar .raised.linked .button:insensitive, -.header-bar .linked .button:insensitive, -.header-bar .button.raised.linked:insensitive, -.header-bar .raised.linked .button:insensitive { - box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9); +.header-bar .linked .button:insensitive { + box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9); } -.primary-toolbar .linked .button:backdrop:last-child, -.primary-toolbar .button.raised.linked:backdrop:last-child, -.primary-toolbar .raised.linked .button:backdrop:last-child, -.menubar.toolbar .linked .button:backdrop:last-child, -.menubar.toolbar .button.raised.linked:backdrop:last-child, -.menubar.toolbar .raised.linked .button:backdrop:last-child, -.header-bar .linked .button:backdrop:last-child, -.header-bar .button.raised.linked:backdrop:last-child, -.header-bar .raised.linked .button:backdrop:last-child { - box-shadow: inset 1px 0 shade (@dark_bg_color, 1.2); -} - -/*.primary-toolbar .linked .button:insensitive:backdrop, -.primary-toolbar .button.raised.linked:insensitive:backdrop, -.primary-toolbar .raised.linked .button:insensitive:backdrop, -.menubar.toolbar .linked .button:insensitive:backdrop, -.menubar.toolbar .button.raised.linked:insensitive:backdrop, -.menubar.toolbar .raised.linked .button:insensitive:backdrop, -.header-bar .linked .button:insensitive:backdrop, -.header-bar .button.raised.linked:insensitive:backdrop, -.header-bar .raised.linked .button:insensitive:backdrop { - box-shadow: inset -1px 0 @unfocused_insensitive_borders; -}*/ - - -/* Linked single button */ -.primary-toolbar .linked .entry:only-child, .primary-toolbar .linked .button:only-child, -.primary-toolbar .linked .button:active:only-child, -.primary-toolbar .linked .button:active:hover:only-child, -.primary-toolbar .linked .button:insensitive:only-child, -.menubar.toolbar .linked .entry:only-child, -.menubar.toolbar .linked .button:only-child, -.menubar.toolbar .linked .button:active:only-child, -.menubar.toolbar .linked .button:active:hover:only-child, -.menubar.toolbar .linked .button:insensitive:only-child, -.header-bar .linked .entry:only-child, -.header-bar .linked .button:only-child, -.header-bar .linked .button:active:only-child, -.header-bar .linked .button:active:hover:only-child, -.header-bar .linked .button:insensitive:only-child { - border-radius: 8px; +.header-bar .linked .button:only-child { box-shadow: none; } @@ -486,7 +315,6 @@ GtkSwitch.slider:backdrop, ****************/ .cell { -GtkCheckButton-indicator-size: 16; - -GtkWidget-focus-line-width: 0; background-color: @base_color; border-radius: 0; @@ -502,7 +330,6 @@ row:selected { border-width: 1px 0 0 0; color: @selected_fg_color; - /*text-shadow: 0 -1px shade (@selected_bg_color, 0.7);*/ } row:selected:backdrop { @@ -512,27 +339,27 @@ row:selected:backdrop { border-top-color: shade (@backdrop_selected_bg_color, 0.9); color: @backdrop_selected_fg_color; - /*text-shadow: 0 -1px shade (@selected_bg_color, 0.7);*/ } /******************* * check and radio * *******************/ -.check, -.radio, -.check:insensitive, -.radio:insensitive { - background-color: transparent; - border-style: none; - margin: 1px 0; +/* Draw a focus ring around the contained label ... */ +GtkCheckButton.text-button GtkLabel { + border: 1px solid transparent; + border-radius: 5px; } -GtkCheckButton:hover, -GtkCheckButton:active:hover, -GtkCheckButton:selected, -GtkCheckButton:selected:focus { - background-color: transparent; +GtkCheckButton.text-button:focus GtkLabel { + border-color: @focus_color; + background-color: @focus_bg_color; +} + +/* ... unless it's a proper button, which already has a focus-colored border */ +.button.text-button:focus GtkLabel { + border: none; + background: none; } .menu .radio * { @@ -630,66 +457,18 @@ GdMainIconView.content-view { -GdMainIconView-icon-size: 40; } -GtkIconView.content-view.check { - /*background-image: url("assets/grid-selection-unchecked.svg");*/ - background-color: transparent; -} - -GtkIconView.content-view.check:active { - /*background-image: url("assets/grid-selection-checked.svg");*/ - background-color: transparent; -} - -.content-view.view.check, -.content-view.view.check:active { - background-color: transparent; -} - -GtkIconView.content-view.check:prelight, -GtkIconView.content-view.check:insensitive, -GtkIconView.content-view.check:backdrop, -GtkIconView.content-view.check:selected { - background-color: transparent; -} - -/**************** - * drawing area * - ****************/ -/* -GtkDrawingArea { - background-color: transparent; -} -*/ - /********* * entry * *********/ -GtkComboBox.combobox-entry .button, -.primary-toolbar GtkComboBox.combobox-entry .button, -.menubar.toolbar GtkComboBox.combobox-entry .button, -.header-bar GtkComboBox.combobox-entry .button, .entry { - -GtkWidget-focus-line-width: 0; - background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@base_color, 0.96)), to (@base_color)); 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, -.primary-toolbar GtkComboBox.combobox-entry .button:backdrop, -.menubar.toolbar GtkComboBox.combobox-entry .button:backdrop, -.header-bar GtkComboBox.combobox-entry .button:backdrop, .entry:backdrop { background-image: -gtk-gradient (linear, left top, left bottom, from (mix (shade (@base_color, 0.96), @bg_color, 0.5)), @@ -704,10 +483,6 @@ GtkComboBox.combobox-entry .button:backdrop, color: @selected_fg_color; } -GtkComboBox.combobox-entry .button:insensitive, -.primary-toolbar GtkComboBox.combobox-entry .button:insensitive, -.menubar.toolbar GtkComboBox.combobox-entry .button:insensitive, -.header-bar GtkComboBox.combobox-entry .button:insensitive, .entry:insensitive { background-color: #f5f5f5; background-image: none; @@ -715,10 +490,6 @@ GtkComboBox.combobox-entry .button:insensitive, color: mix (@text_color, @base_color, 0.4); } -GtkComboBox.combobox-entry .button:insensitive:backdrop, -.primary-toolbar GtkComboBox.combobox-entry .button:insensitive:backdrop, -.menubar.toolbar GtkComboBox.combobox-entry .button:insensitive:backdrop, -.header-bar GtkComboBox.combobox-entry .button:insensitive:backdrop, .entry:insensitive:backdrop { background-color: mix (#f5f5f5, @bg_color, 0.5); @@ -727,8 +498,6 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop, .primary-toolbar .entry.progressbar, .primary-toolbar .entry.progressbar, -.menubar.toolbar .entry.progressbar, -.menubar.toolbar .entry.progressbar, .header-bar .entry.progressbar, .header-bar .entry.progressbar, .entry.progressbar { @@ -760,6 +529,20 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop, background: none; } +.frame.flat { + border: none; +} + +/**************** + * window-frame * + ****************/ + +.window-frame.csd.popup { + border-style: none; + border-radius: 0; + box-shadow: 0 3px 8px @shadow_color; +} + /************ * iconview * ************/ @@ -795,11 +578,7 @@ GtkIconView.view.cell:selected:focused { border-width: 1px; } -/********* - * image * - *********/ -GtkImage, -GtkImage:insensitive { +GtkIconView.cell { background-color: transparent; } @@ -878,33 +657,13 @@ GtkImage:insensitive { inset 0 -1px shade (@error_bg_color, 1.04); } -/********* - * label * - *********/ -GtkLabel, -GtkLabel:insensitive { - background-color: transparent; -} - -/********* - * stack * - *********/ - -GtkHeaderBar > GtkStack, -GtkHeaderBar > GtkStack:insensitive { - background-color: transparent; -} - /******** * menu * ********/ GtkTreeMenu.menu, -.toolbar .primary-toolbar .menu, -.toolbar .menubar.toolbar .menu, .toolbar .header-bar .menu, GtkMenuToolButton.menu, .primary-toolbar .button .menu, -.menubar.toolbar .button .menu, .header-bar .button .menu, .menu { background-image: none; @@ -950,25 +709,10 @@ GtkComboBox .menu { } .menu.button:hover, -.menu.button:active, -.menu.button:active:insensitive, +.menu.button:checked, +.menu.button:checked:insensitive, .menu.button:insensitive, .menu.button -/*.primary-toolbar .menu.button:hover, -.primary-toolbar .menu.button:active, -.primary-toolbar .menu.button:active:insensitive, -.primary-toolbar .menu.button:insensitive, -.primary-toolbar .menu.button, -.menubar.toolbar .menu.button:hover, -.menubar.toolbar .menu.button:active, -.menubar.toolbar .menu.button:active:insensitive, -.menubar.toolbar .menu.button:insensitive, -.menubar.toolbar .menu.button, -.header-bar .menu.button:hover, -.header-bar .menu.button:active, -.header-bar .menu.button:active:insensitive, -.header-bar .menu.button:insensitive, -.header-bar .menu.button */ { background-color: shade (@dark_bg_color, 1.08); background-image: none; @@ -1020,10 +764,6 @@ GtkComboBox .menu { /************ * menuitem * ************/ -/*.menuitem { - color: @fg_color; -}*/ - .menuitem { -GtkMenuItem-horizontal-padding: 0; background: transparent; @@ -1033,10 +773,6 @@ GtkComboBox .menu { text-shadow: none; } -.menuitem { - /*color: @dark_fg_color;*/ -} - /* Workaround for lp:949368 */ GtkComboBox .menuitem * { color: @fg_color; @@ -1046,6 +782,7 @@ GtkComboBox .menuitem *:hover { color: @selected_fg_color; } +.popover .menuitem:checked:hover, .menuitem:hover, .menu .menuitem:hover { border-radius: 0; @@ -1065,8 +802,8 @@ GtkComboBox .menuitem *:hover { text-shadow: 0 -1px shade (@selected_bg_color, 0.7); } -.menuitem.check:active, -.menuitem.radio:active { +.menuitem.check:checked, +.menuitem.radio:checked { color: @fg_color; } @@ -1075,26 +812,14 @@ GtkComboBox .menuitem *:hover { box-shadow: none; } -/*.menuitem:insensitive, -.menuitem *:insensitive { - color: mix (@fg_color, @bg_color, 0.5); - text-shadow: 0 1px shade (@bg_color, 1.14); -} -*/ GtkTreeMenu.menu .menuitem:insensitive, GtkTreeMenu.menu .menuitem *:insensitive, -.toolbar .primary-toolbar .menu .menuitem:insensitive, -.toolbar .primary-toolbar .menu .menuitem *:insensitive, -.toolbar .menubar.toolbar .menu .menuitem:insensitive, -.toolbar .menubar.toolbar .menu .menuitem *:insensitive, .toolbar .header-bar .menu .menuitem:insensitive, .toolbar .header-bar .menu .menuitem *:insensitive, GtkMenuToolButton.menu .menuitem:insensitive, GtkMenuToolButton.menu .menuitem *:insensitive, .primary-toolbar .button .menu .menuitem:insensitive, .primary-toolbar .button .menu .menuitem *:insensitive, -.menubar.toolbar .button .menu .menuitem:insensitive, -.menubar.toolbar .button .menu .menuitem *:insensitive, .header-bar .button .menu .menuitem:insensitive, .header-bar .button .menu .menuitem *:insensitive, .menuitem:insensitive, @@ -1148,8 +873,6 @@ GtkComboBox .menu .menuitem *:insensitive { .primary-toolbar GtkScale.trough, .primary-toolbar GtkScale.trough:backdrop, -.menubar.toolbar GtkScale.trough, -.menubar.toolbar GtkScale.trough:backdrop, .header-bar GtkScale.trough, .header-bar GtkScale.trough:backdrop, .menuitem GtkScale.trough { @@ -1181,99 +904,75 @@ GtkComboBox .menu .menuitem *:insensitive { /************ * notebook * ************/ -.notebook { - background-color: shade (@bg_color, 1.02); - background-image: none; - border-radius: 3px; - padding: 2px; - background-clip: border-box; - border-color: shade (@bg_color, 0.82); - border-width: 1px; - border-style: solid; - /*box-shadow: inset 0 1px shade (@bg_color, 1.1);*/ - /*font-weight: 300;*/ -} - -.notebook tab { - background-image: none; - background-color: transparent; - border-style: solid; - border-image: -gtk-gradient (linear, left top, left bottom, - from (alpha (shade (@bg_color, 0.9), 0.0)), - to (shade (@bg_color, 0.9))) 1; - border-image-width: 0 1px; - border-color: transparent; - border-width: 0; - box-shadow: none; - /*color: shade (@fg_color, 1.2);*/ +.notebook tab.top { padding: 4px 6px 2px 6px; } +.notebook tab.top:active { padding-bottom: 3px; } +.notebook tab.bottom { padding: 2px 6px 4px 6px; } +.notebook tab.bottom:active { padding-top: 3px; } +.notebook tab.left { padding: 2px 4px 2px 6px; } +.notebook tab.left:active { padding-right: 5px; } +.notebook tab.right { padding: 2px 6px 2px 4px; } +.notebook tab.right:active { padding-left: 5px; } + +/* give active tab a background, as it might be dragged across of others when reordering */ +.notebook tab:active { + background-color: @bg_color; } -.notebook tab:active { +.notebook.header { + border-width: 0; /* set below depending on position of tab bar */ border-color: shade (@bg_color, 0.82); border-style: solid; - border-width: 1px; - background-color: shade (@bg_color, 1.02); - background-image: none; - /*box-shadow: inset 0 1px shade (@bg_color, 1.1);*/ - - color: @fg_color; } -.notebook tab GtkLabel { - /*padding: 1px;*/ - padding: 1px 1px 2px 1px; -} +/* Draw a border between tabs and content ... */ +.notebook.header.top { border-bottom-width: 1px; } +.notebook.header.right { border-left-width: 1px; } +.notebook.header.left { border-right-width: 1px; } +.notebook.header.bottom { border-top-width: 1px; } -.notebook tab { - color: shade (@bg_color, 0.48); -} - -.notebook tab.top:active { - padding: 3px 7px 1px 7px; -} +/* ... unless the content is in a frame (thus having a border itself */ +.notebook.header.frame.top { border: none; } +.notebook.header.frame.right { border: none; } +.notebook.header.frame.right { border: none; } +.notebook.header.frame.bottom { border: none; } .notebook tab.top { - padding: 2px 5px 0 5px; -} - -.notebook tab.right:active { - padding: 4px 6px 4px 1px; + border-image: -gtk-gradient (linear, left top, left bottom, + from (alpha (shade (@bg_color, 0.9), 0.0)), + to (shade (@bg_color, 0.9))) 1; + border-image-width: 0 1px; } .notebook tab.right { - padding: 3px 4px 3px 0; border-image: -gtk-gradient (linear, right top, left top, from (alpha (shade (@bg_color, 0.9), 0.0)), to (shade (@bg_color, 0.9))) 1; border-image-width: 1px 0; } -.notebook tab.bottom:active { - padding: 1px 7px 4px 7px; +.notebook tab.left { + border-image: -gtk-gradient (linear, left top, right top, + from (alpha (shade (@bg_color, 0.9), 0.0)), + to (shade (@bg_color, 0.9))) 1; + border-image-width: 1px 0; } .notebook tab.bottom { - padding: 0 5px 3px 5px; border-image: -gtk-gradient (linear, left bottom, left top, from (alpha (shade (@bg_color, 0.9), 0.0)), to (shade (@bg_color, 0.9))) 1; border-image-width: 0 1px; } -.notebook tab.left:active { - padding: 4px 1px 4px 6px; -} - -.notebook tab.left { - padding: 3px 0 3px 4px; - border-image: -gtk-gradient (linear, left top, right top, - from (alpha (shade (@bg_color, 0.9), 0.0)), - to (shade (@bg_color, 0.9))) 1; - border-image-width: 1px 0; +/* Draw a focus ring around labels in tabs */ +.notebook tab GtkLabel { + border: 1px solid transparent; + border-radius: 5px; } -.notebook tab .button { - padding: 0; +.notebook:focus tab GtkLabel.active-page { + border-color: @focus_color; + background-color: @focus_bg_color; } .notebook GtkDrawingArea { @@ -1412,28 +1111,6 @@ GtkLevelBar.vertical { margin: 1px 0; } -/* discrete indicator border rounding, - uncomment when :nth-child will be working - on the widget - -.level-bar.indicator-discrete.fill-block.horizontal:first-child { - border-radius: 2px 0 0 2px; -} - -.level-bar.indicator-discrete.fill-block.horizontal:last-child { - border-radius: 0 2px 2px 0; -} - -.level-bar.indicator-discrete.fill-block.vertical:first-child { - border-radius: 2px 2px 0 0; -} - -.level-bar.indicator-discrete.fill-block.vertical:last-child { - border-radius: 0 0 2px 2px; -} - -*/ - .level-bar.fill-block.level-high { border-color: shade(@success_color, 0.85); background-image: linear-gradient(to bottom, @@ -1467,17 +1144,12 @@ GtkScale { -GtkRange-slider-width: 18; -GtkRange-trough-border: 0; -GtkScale-slider-length: 14; - -GtkWidget-focus-line-width: 0; } GtkScale.vertical { -GtkScale-slider-length: 13; } -.scale.slider { - background-color: transparent; -} - .scale.trough.highlight { background-color: #df784e; background-image: none; @@ -1496,10 +1168,8 @@ GtkScale.vertical { .scale.trough.highlight:backdrop { background-color: #dcdcdc; background-image: none; - /*background-clip: padding-box;*/ } - .scale.trough.highlight.bottom { margin: 0 7px 0 7px; } @@ -1559,10 +1229,6 @@ GtkScale.mark { inset 0 -1px shade (@bg_color, 1.01); } -.scrollbar.button, -.scrollbar.button:insensitive { -} - /* overlay scrollbar */ OsThumb { color: shade (@fg_color, 1.6); @@ -1654,12 +1320,9 @@ GtkComboBox .separator { } GtkTreeMenu .menuitem.separator, -.toolbar .primary-toolbar .menuitem.separator, -.toolbar .menubar.toolbar .menuitem.separator, .toolbar .header-bar .menuitem.separator, GtkMenuToolButton .menuitem.separator, .primary-toolbar .button .menuitem.separator, -.menubar.toolbar .button .menuitem.separator, .header-bar .button .menuitem.separator, .menuitem.separator { border-color: shade (@dark_bg_color, 0.99); @@ -1677,10 +1340,6 @@ GtkComboBox .menuitem.separator { /*********** * sidebar * ***********/ -.sidebar, -.sidebar .view { -} - .sidebar row:selected { text-shadow: 0 1px shade (@selected_bg_color, 0.7); } @@ -1742,118 +1401,26 @@ GtkComboBox .menuitem.separator { * spinner * ***********/ @keyframes spinner { - 0.00% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); } - - 12.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); } - - 25.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)); } - - 37.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)); } - - 50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)); } - - 62.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)); } - - 75.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)); } - - 87.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)); } - - 100% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); } + to { -gtk-icon-transform: rotate(1turn); } } .spinner { - background-color: transparent; - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); - background-position: 14% 14%, 0% 50%, 14% 86%, 50% 100%, 86% 86%, 100% 50%, 86% 14%, 50% 0%; - background-size: 20% 20%; - background-repeat: no-repeat; -} - -.menu .spinner, -.menu .spinner:hover, -.primary-toolbar .spinner, -.primary-toolbar .spinner, -.menubar.toolbar .spinner, -.menubar.toolbar .spinner, -.header-bar .spinner, -.header-bar .spinner { + -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); color: @selected_bg_color; - border: none; - box-shadow: none; + opacity: 0; } .spinner:active { animation: spinner 1s infinite linear; + opacity: 1; +} + +.spinner:active:backdrop { + color: @backdrop_fg_color; +} + +.spinner:active:insensitive { + opacity: 0.5; } /************* @@ -1889,6 +1456,12 @@ GtkSwitch.trough:active { text-shadow: 0 1px shade (@selected_bg_color, 0.7); } +GtkSwitch:focus { + outline: 2px solid @focus_color; + outline-offset: -2px; + outline-radius: 6px; +} + /* XXX temporary */ GtkSwitch.trough:backdrop, GtkSwitch.trough:insensitive { @@ -1904,6 +1477,22 @@ GtkSwitch.slider { padding: 1px; border-radius: 6px; border-style: solid; + + background-image: -gtk-gradient (linear, left top, left bottom, + from (shade (@button_bg_color, 1.08)), + color-stop (0.5, @button_bg_color), + to (shade (@button_bg_color, 0.94))); + + color: @fg_color; + text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4); +} + +GtkSwitch.slider:backdrop { + background-image: none; + background-color: @bg_color; + + color: @backdrop_fg_color; + text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.2); } /************ @@ -1913,6 +1502,96 @@ GtkTextView { background-color: @base_color; } +.header-bar { + padding: 2px 6px; +} + +/* + * Header Bars + * + * The following rules only style header bars when they are used as a window's + * titlebar widget (i.e., they have .titlebar set as well). + * + * Some applications reuse their header bar as a primary toolbar on desktops + * that prefer showing traditional title bars. The rules for those are further + * down grouped with normal toolbars. + */ +.titlebar.header-bar { + background-image: -gtk-gradient (linear, left top, left bottom, + from (shade (@dark_bg_color, 1.5)), + to (@dark_bg_color)); + border-color: shade (@dark_bg_color, 1.5); + border-style: solid; + border-width: 1px 0 0 0; + border-radius: 7px 7px 0 0; + + color: @dark_fg_color; + + box-shadow: inset 0 1px shade (@dark_bg_color, 1.65); +} + +.titlebar.header-bar .title { + font: bold; +} + +.titlebar.header-bar .subtitle { + font-size: smaller; + opacity: 0.5; +} + +.titlebar.header-bar:backdrop { + color: @backdrop_fg_color; + background-image: none; + background-color: @dark_bg_color; + border-top-color: @dark_bg_color; +} + +.maximized .titlebar.header-bar { + border-radius: 0; + border: none; +} + +.titlebar.header-bar .button.titlebutton { + background-clip: padding-box; + border: 1px solid #d0c7bf; + color: #8b8379; + icon-shadow: 0 1px rgba(255, 255, 255, 0.5); + border-radius: 9px; + padding: 0; + box-shadow: none; + background-image: linear-gradient(to top, #d5d2ce, #ece8e4 50%, #f7f4f3); +} + +.titlebar.header-bar .button.titlebutton.close { + color: #7f4025; + icon-shadow: 0 1px rgba(255, 255, 255, 0.25); + background-image: linear-gradient(to top, #e77041, #f17d4e 50%, #f9b39c); +} + +.titlebar.header-bar .button.titlebutton.close:hover { + background-image: linear-gradient(to top, #e67144, #ed8b67 50%, #f9cbbd); +} + +.titlebar.header-bar .button.titlebutton:hover, +.titlebar.header-bar .button.titlebutton:backdrop:hover { + background-image: linear-gradient(to top, #e2e1df, #f8f6f3 50%, #fcfbf9); +} + +.titlebar.header-bar .button.titlebutton:active { + icon-shadow: none; + background-image: linear-gradient(to top, #fcfbf8, #fbf9f6); +} + +.titlebar.header-bar .button.titlebutton.close:active { + background-image: linear-gradient(to top, #f08054, #f07c4e); +} + +.titlebar.header-bar .button.titlebutton:backdrop { + color: #8b8379; + icon-shadow: none; + background-image: linear-gradient(to top, #ece9e6, #e8e4e1); +} + /*********** * toolbar * ***********/ @@ -1928,16 +1607,10 @@ GtkTextView { color: @backdrop_fg_color; } -.toolbar .button { - /*padding: 1px;*/ - /*padding: 6px 8px;*/ -} - -/* primary-toolbar */ +/******************* + * primary-toolbar * + *******************/ .primary-toolbar, -.primary-toolbar .toolbar, -.primary-toolbar.toolbar, -.menubar.toolbar, .header-bar { -GtkWidget-window-dragging: true; @@ -1948,6 +1621,7 @@ GtkTextView { border-top-color: shade (@dark_bg_color, 1.09); border-style: solid; border-width: 1px 0 1px 0; + border-radius: 0; color: @dark_fg_color; text-shadow: 0 -1px shade (@dark_bg_color, 0.7); @@ -1955,10 +1629,7 @@ GtkTextView { box-shadow: inset 0 1px shade (@dark_bg_color, 0.94); } -.primary-toolbar .toolbar:backdrop, -.primary-toolbar.toolbar:backdrop, -.menubar.toolbar .toolbar:backdrop, -.menubar.toolbar.toolbar:backdrop, +.primary-toolbar:backdrop, .header-bar:backdrop { background-image: none; background-color: @dark_bg_color; @@ -1970,97 +1641,99 @@ GtkTextView { } .primary-toolbar :insensitive, -.menubar.toolbar .toolbar :insensitive, .header-bar :insensitive { text-shadow: 0 -1px shade (@dark_bg_color, 0.7); } -.primary-toolbar GtkComboBox, .primary-toolbar .button, -.menubar.toolbar GtkComboBox, -.menubar.toolbar .button, -.header-bar GtkComboBox, -.header-bar .button { - background-color: transparent; - background-image: none; - border-color: transparent; - /*border-radius: 3px;*/ - /*border-width: 1px;*/ - /*padding: 3px;*/ - +.header-bar .button, +.primary-toolbar .button.flat:hover { + background: transparent; color: @dark_fg_color; text-shadow: 0 -1px shade (@dark_bg_color, 0.7); + border-image-source: url("assets/radiance-button-toolbar.png"); +} + +.primary-toolbar .button.flat { + border-image-source: none; + background: transparent; +} + +.primary-toolbar .button:focused, +.header-bar .button:focused { + border-image-source: url("assets/radiance-button-toolbar-focused.png"); +} + +.primary-toolbar .button:active, +.primary-toolbar .button:checked, +.header-bar .button:active, +.header-bar .button:checked { + border-image-source: url("assets/radiance-button-toolbar-active.png"); +} + +.primary-toolbar .button:active:focused, +.primary-toolbar .button:checked:focused, +.header-bar .button:active:focused, +.header-bar .button:checked:focused { + border-image-source: url("assets/radiance-button-toolbar-active-focused.png"); } -.primary-toolbar GtkComboBox:backdrop, .primary-toolbar .button:backdrop, -.menubar.toolbar GtkComboBox:backdrop, -.menubar.toolbar .button:backdrop, -.header-bar GtkComboBox:backdrop, .header-bar .button:backdrop { + background-color: transparent; color: @backdrop_dark_fg_color; text-shadow: 0 -1px shade (@dark_bg_color, 0.9); + border-image-source: url("assets/radiance-backdrop-button-toolbar.png"); +} + +.primary-toolbar .button.flat:backdrop { + border-image-source: none; +} + +.primary-toolbar .button:active:backdrop, +.primary-toolbar .button:checked:backdrop, +.header-bar .button:active:backdrop, +.header-bar .button:checked:backdrop { + border-image-source: url("assets/radiance-backdrop-button-toolbar-active.png"); } -.primary-toolbar .raised .button, -.primary-toolbar .raised.button, .primary-toolbar .button:hover, -.primary-toolbar .button:active, -.primary-toolbar .button:insensitive, -.menubar.toolbar .raised .button, -.menubar.toolbar .raised.button, -.menubar.toolbar .button:hover, -.menubar.toolbar .button:active, -.menubar.toolbar .button:insensitive, -.header-bar .raised .button, -.header-bar .raised.button, +.primary-toolbar .button:checked, .header-bar .button:hover, -.header-bar .button:active, -.header-bar .button:insensitive { +.header-bar .button:checked { 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 .button:active, -.menubar.toolbar .button:active, .header-bar .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, -.menubar.toolbar .button:active:hover, -.header-bar .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))); + text-shadow: 0 -1px shade (@dark_bg_color, 0.6); } -.primary-toolbar .button:active:insensitive, +.primary-toolbar .button:checked:insensitive, .primary-toolbar .button:insensitive, -.menubar.toolbar .button:active:insensitive, -.menubar.toolbar .button:insensitive, -.header-bar .button:active:insensitive, +.header-bar .button:checked:insensitive, .header-bar .button:insensitive { text-shadow: none; } .primary-toolbar .button:insensitive, -.menubar.toolbar .button:insensitive, .header-bar .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, -.menubar.toolbar .button:active:insensitive, -.header-bar .button:active:insensitive { +.primary-toolbar .button.flat:insensitive { + background-image: none; +} + +.primary-toolbar .button:checked:insensitive, +.header-bar .button:checked:insensitive { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 0.94)), to (shade (@dark_bg_color, 1.02))); @@ -2069,9 +1742,6 @@ GtkTextView { .primary-toolbar GtkSeparatorToolItem, .primary-toolbar .separator, .primary-toolbar .separator:insensitive, -.menubar.toolbar GtkSeparatorToolItem, -.menubar.toolbar .separator, -.menubar.toolbar .separator:insensitive, .header-bar GtkSeparatorToolItem, .header-bar .separator, .header-bar .separator:insensitive { @@ -2106,10 +1776,6 @@ GtkTextView { icon-shadow: 0 1px shade (@bg_color, 1.16); } -.inline-toolbar.toolbar .button *:insensitive, -.inline-toolbar.toolbar GtkToolButton .button:insensitive { -} - /* Middle button */ .inline-toolbar.toolbar .button, .inline-toolbar.toolbar .button:active, @@ -2175,7 +1841,6 @@ GtkTextView { 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 */ @@ -2197,19 +1862,6 @@ GtkTextView { border-left-width: 1px; border-image-width: 10px 12px 10px 12px; border-radius: 8px; - /*box-shadow: none;*/ -} - - -.header-bar { - padding: 5px; - border-width: 0 0 1px; - border-style: solid; - border-color: shade(@toolbar_bg_color, 0.7); - background-image: linear-gradient(to bottom, - shade(@toolbar_bg_color, 1.00), - shade(@toolbar_bg_color, 0.90) - ); } /*********** @@ -2227,10 +1879,6 @@ GtkTextView { color: @tooltip_fg_color; } -.tooltip * { - background-color: transparent; -} - /************ * treeview * ************/ @@ -2243,24 +1891,122 @@ GtkTreeView.dnd { GtkTreeView .entry { background-image: none; - /*border-radius: 0;*/ } -GtkTreeView row:nth-child(even){ - /*background-color: @base_color;*/ +/************ + * viewport * + ************/ +GtkViewport.frame { + border-width: 0; +} + +/************ + * listbox * + ************/ +.list-row.button { + border-image: none; + border-style: none; + border-radius: 0; + background-image: none; } -GtkTreeView row:nth-child(odd) { - /*background-color: shade (@base_color, 0.965);*/ +.list-row.button:selected { + text-shadow: none; } /************ - * viewport * + * popover * ************/ -GtkViewport.frame { - border-width: 0; +.popover { + background-clip: border-box; + + border-radius: 5px; + border: 1px solid darker(@bg_color); + + box-shadow: 0 2px 3px @shadow_color; + margin: 10px; + padding: 2px; +} + +.popover:backdrop { + box-shadow: none; +} + +/* Popover menuitems are actually buttons. The following rules reset most of + * the button styles for them. + */ +.popover .menuitem, +.popover .menuitem:checked, +.popover .menuitem:hover, +.popover .menuitem:active, +.popover .menuitem:insensitive, +.popover .menuitem:backdrop { + border-image: none; + border: none; + text-shadow: none; + border-radius: 3px; +} + +.popover .menuitem:backdrop:hover { + border: none; + border-image: none; + background: transparent; + color: @fg_color; } +.popover .menuitem:checked, +.popover .menuitem.check, +.popover .menuitem.check:checked, +.popover .menuitem.radio, +.popover .menuitem.radio:checked { + background-image: none; + border: none; +} + +.popover .menuitem:insensitive, +.popover .menuitem *:insensitive { + text-shadow: none; + background: none; +} + + +/* OSD overlays */ +.osd, +.osd:backdrop { + color: @osd_fg_color; + background-color: @osd_bg_color; + border-color: @osd_border_color; +} + +.osd.toolbar { + padding: 12px; + border-radius: 8px; +} + +.osd .button, +.osd .button:backdrop { + color: @osd_fg_color; + background: none; + border: none; + padding: 12px; + border-radius: 8px; + transition: all 100ms ease-in-out; +} + +.osd .button:hover { + color: lighter(@osd_fg_color); + icon-shadow: 0 0 3px @osd_fg_color; +} + +.osd .button:active { + color: darker(@osd_fg_color); + icon-shadow: none; +} + +.osd .scale { + margin-left: 9px; + margin-right: 9px; +} /***************************************************************************** * states [please keep this section at the end of the file (CSS precedence)] * @@ -2283,3 +2029,4 @@ GtkViewport.frame { color: @backdrop_selected_fg_color; } + diff --git a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/public-colors.css b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/public-colors.css new file mode 100644 index 0000000..33c3db0 --- /dev/null +++ b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/public-colors.css @@ -0,0 +1,23 @@ +/* + * Some applications depend on these named colors. + */ + +@define-color theme_fg_color @fg_color; +@define-color theme_bg_color @bg_color; +@define-color theme_base_color @base_color; +@define-color theme_selected_bg_color @selected_bg_color; +@define-color theme_selected_fg_color @selected_fg_color; +@define-color insensitive_bg_color @bg_color; +@define-color insensitive_fg_color @fg_color; +@define-color insensitive_base_color @base_color; +@define-color theme_unfocused_fg_color @backdrop_fg_color; +@define-color theme_unfocused_bg_color @bg_color; +@define-color theme_unfocused_base_color @base_color; +@define-color theme_unfocused_selected_bg_color @selected_bg_color; +@define-color theme_unfocused_selected_fg_color @selected_fg_color; +@define-color borders shade(@bg_color, 0.82); +@define-color unfocused_borders transparent; + +@define-color warning_color @warning_fg_color; +@define-color error_color @error_fg_color; +@define-color success_color @success_color; diff --git a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/settings.ini b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/settings.ini index f2b44e5..5cb1301 100644 --- a/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/settings.ini +++ b/src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/settings.ini @@ -1,4 +1,4 @@ [Settings] -gtk-color-scheme = "base_color:#ffffff\nbg_color:#f6f4f2\ntooltip_bg_color:#000000\nselected_bg_color:#f07746\ntext_color:#3C3C3C\nfg_color:#4c4c4c\ntooltip_fg_color:#ffffff\nselected_fg_color:#ffffff\nlink_color:#DD4814\nbg_color_dark:#3c3b37\nfg_color_dark:#dfdbd2" +gtk-color-scheme = "base_color:#ffffff\nbg_color:#f6f4f2\ntooltip_bg_color:#000000\nselected_bg_color:#f07746\ntext_color:#3C3C3C\nfg_color:#4c4c4c\ntooltip_fg_color:#ffffff\nselected_fg_color:#ffffff\nlink_color:#148ADD\nbg_color_dark:#3c3b37\nfg_color_dark:#dfdbd2" gtk-auto-mnemonics = 1 gtk-alternative-sort-arrows = true diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/geary.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/geary.css new file mode 100644 index 0000000..f6d1964 --- /dev/null +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/geary.css @@ -0,0 +1,5 @@ + +/* for overlay-scrollbars */ +ComposerWidget { + background-color: @bg_color; +} diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/nautilus.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/nautilus.css index 55b04f7..c68ad20 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/nautilus.css +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/nautilus.css @@ -105,6 +105,10 @@ NautilusFloatingBar .button { -GtkButton-inner-border: 0; } +NautilusWindow .header-bar .button { + padding: 9px; +} + /* sidebar */ NautilusWindow .sidebar, NautilusWindow .sidebar .view { diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css index 8b0722d..050a438 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css @@ -20,7 +20,7 @@ UnityDecoration { } UnityDecoration.top { - border: 1px solid rgba (72, 33, 0, 0.3568); /* shade (@dark_bg_color, 0.8) - shade (#edebe6, 1.06) */ + border: 1px solid rgba (72, 72, 72, 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; @@ -40,12 +40,12 @@ UnityDecoration.top { } UnityDecoration.top:backdrop { - border: 1px solid rgba (74, 29, 0, 0.2784); /* shade (@dark_bg_color, 0.8) - shade (#edebe6, 0.96) */ + border: 1px solid rgba (74, 74, 74, 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)), + from (shade (#e0e0e0, 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; @@ -62,8 +62,8 @@ UnityDecoration.right { /* 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 (0, #a8a8a8), + color-stop (0.5, #a8a8a8), color-stop (1, shade (@bg_color, 0.7))); } @@ -71,8 +71,8 @@ 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 (0, #b5b5b5), + color-stop (0.5, #b5b5b5), color-stop (1, shade (@bg_color, 0.7))); } @@ -86,7 +86,7 @@ UnityDecoration.bottom { UnityPanelWidget, .unity-panel { background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (#edebe6, 1.06)), + from (shade (#e0e0e0, 1.06)), to (@dark_bg_color)); border-top-color: shade (#edebe6, 1.08); border-style: solid; diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css index f7a7ee3..f916d10 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css @@ -62,6 +62,7 @@ @import url("gtk-widgets-assets-radiance.css"); @import url("gtk-widgets.css"); @import url("gtk-widgets-radiance.css"); +@import url("apps/geary.css"); @import url("apps/unity.css"); @import url("apps/baobab.css"); @import url("apps/gedit.css"); @@ -69,5 +70,6 @@ @import url("apps/gnome-panel.css"); @import url("apps/gnome-terminal.css"); @import url("apps/gnome-system-log.css"); +@import url("public-colors.css"); @import url("gtk-lubuntu.css"); diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets-radiance.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets-radiance.css index 69e73d6..8d0092c 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets-radiance.css +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets-radiance.css @@ -1,23 +1,23 @@ .menu .check { - background-image: url("assets/check-menuitem-unselected.png"); + -gtk-icon-source: url("assets/check-menuitem-unselected.png"); } .menu .radio { - background-image: url("assets/check-menuitem-unselected.png"); + -gtk-icon-source: url("assets/check-menuitem-unselected.png"); } -.menu .check:active { - background-image: url("assets/check-menuitem-dark.png"); +.menu .check:checked { + -gtk-icon-source: url("assets/check-menuitem-dark.png"); } -.menu .check:active:insensitive { - background-image: url("assets/check-menuitem-insensitive-dark.png"); +.menu .check:checked:insensitive { + -gtk-icon-source: url("assets/check-menuitem-insensitive-dark.png"); } -.menu .radio:active { - background-image: url("assets/radio-menuitem-dark.png"); +.menu .radio:checked { + -gtk-icon-source: url("assets/radio-menuitem-dark.png"); } -.menu .radio:active:insensitive { - background-image: url("assets/radio-menuitem-insensitive-dark.png"); -} \ No newline at end of file +.menu .radio:checked:insensitive { + -gtk-icon-source: url("assets/radio-menuitem-insensitive-dark.png"); +} diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets.css index ab8f695..c1c3d63 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets.css +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets.css @@ -12,33 +12,28 @@ *************************/ /* draw regular check and radio items using our SVG assets */ -.radio, .check { - /*background-clip: border-box;*/ -} - -.check { - background-image: url("assets/check-unselected.png"); + -gtk-icon-source: url("assets/check-unselected.png"); } .check:hover { - background-image: url("assets/check-unselected-hover.png"); + -gtk-icon-source: url("assets/check-unselected-hover.png"); } .check row, .check row:selected, .check row:selected:focus { - background-image: url("assets/check-unselected-alt.png"); + -gtk-icon-source: url("assets/check-unselected-alt.png"); } .check row:hover, .check row:selected:hover, .check row:selected:focus:hover { - background-image: url("assets/check-unselected-hover-alt.png"); + -gtk-icon-source: url("assets/check-unselected-hover-alt.png"); } .check:insensitive { - background-image: url("assets/check-unselected-disabled.png"); + -gtk-icon-source: url("assets/check-unselected-disabled.png"); } .check row:insensitive { @@ -49,169 +44,169 @@ .check row:selected:insensitive, .check row:selected:focus:insensitive { background-color: transparent; - background-image: url("assets/check-unselected-disabled-alt.png"); + -gtk-icon-source: url("assets/check-unselected-disabled-alt.png"); } .check:backdrop { - background-image: url("assets/backdrop-check-unselected.png"); + -gtk-icon-source: url("assets/backdrop-check-unselected.png"); } .check:hover:backdrop { - background-image: url("assets/backdrop-check-unselected-hover.png"); + -gtk-icon-source: url("assets/backdrop-check-unselected-hover.png"); } .check row:backdrop, .check row:selected:backdrop { - background-image: url("assets/backdrop-check-unselected-alt.png"); + -gtk-icon-source: url("assets/backdrop-check-unselected-alt.png"); } .check row:hover:backdrop, .check row:selected:hover:backdrop { - background-image: url("assets/backdrop-check-unselected-hover-alt.png"); + -gtk-icon-source: url("assets/backdrop-check-unselected-hover-alt.png"); } .check:insensitive:backdrop { - background-image: url("assets/backdrop-check-unselected-disabled.png"); + -gtk-icon-source: url("assets/backdrop-check-unselected-disabled.png"); } .check row:selected:insensitive:backdrop { - background-image: url("assets/backdrop-check-unselected-disabled-alt.png"); + -gtk-icon-source: url("assets/backdrop-check-unselected-disabled-alt.png"); } -.check:active { - background-image: url("assets/check-selected.png"); +.check:checked { + -gtk-icon-source: url("assets/check-selected.png"); } -.check:active:hover { - background-image: url("assets/check-selected-hover.png"); +.check:checked:hover { + -gtk-icon-source: url("assets/check-selected-hover.png"); } -.check row:active, -.check row:selected:active, -.check row:selected:focus:active { - background-image: url("assets/check-selected-alt.png"); +.check row:checked, +.check row:selected:checked, +.check row:selected:focus:checked { + -gtk-icon-source: url("assets/check-selected-alt.png"); } -.check row:active:hover, -.check row:selected:active:hover, -.check row:selected:active:focus:hover { - background-image: url("assets/check-selected-hover-alt.png"); +.check row:checked:hover, +.check row:selected:checked:hover, +.check row:selected:checked:focus:hover { + -gtk-icon-source: url("assets/check-selected-hover-alt.png"); } -.check:active:insensitive { - background-image: url("assets/check-selected-disabled.png"); +.check:checked:insensitive { + -gtk-icon-source: url("assets/check-selected-disabled.png"); } -.check row:active:insensitive, -.check row:selected:active:insensitive, -.check row:selected:focus:active:insensitive { - background-image: url("assets/check-selected-disabled-alt.png"); +.check row:checked:insensitive, +.check row:selected:checked:insensitive, +.check row:selected:focus:checked:insensitive { + -gtk-icon-source: url("assets/check-selected-disabled-alt.png"); } -.check:active:backdrop { - background-image: url("assets/backdrop-check-selected.png"); +.check:checked:backdrop { + -gtk-icon-source: url("assets/backdrop-check-selected.png"); } -.check:active:backdrop { - background-image: url("assets/backdrop-check-selected-hover.png"); +.check:checked:backdrop { + -gtk-icon-source: url("assets/backdrop-check-selected-hover.png"); } -.check row:active:backdrop, -.check row:selected:active:backdrop { - background-image: url("assets/backdrop-check-selected-alt.png"); +.check row:checked:backdrop, +.check row:selected:checked:backdrop { + -gtk-icon-source: url("assets/backdrop-check-selected-alt.png"); } -.check row:active:hover:backdrop, -.check row:selected:active:hover:backdrop { - background-image: url("assets/backdrop-check-selected-hover-alt.png"); +.check row:checked:hover:backdrop, +.check row:selected:checked:hover:backdrop { + -gtk-icon-source: url("assets/backdrop-check-selected-hover-alt.png"); } -.check:active:insensitive:backdrop { - background-image: url("assets/backdrop-check-selected-disabled.png"); +.check:checked:insensitive:backdrop { + -gtk-icon-source: url("assets/backdrop-check-selected-disabled.png"); } -.check row:selected:active:insensitive:backdrop { - background-image: url("assets/backdrop-check-selected-disabled-alt.png"); +.check row:selected:checked:insensitive:backdrop { + -gtk-icon-source: url("assets/backdrop-check-selected-disabled-alt.png"); } .check:inconsistent { - background-image: url("assets/check-mixed.png"); + -gtk-icon-source: url("assets/check-mixed.png"); } .check:inconsistent:hover { - background-image: url("assets/check-mixed-hover.png"); + -gtk-icon-source: url("assets/check-mixed-hover.png"); } .check row:inconsistent, .check row:selected:inconsistent, .check row:selected:focus:inconsistent { - background-image: url("assets/check-mixed-alt.png"); + -gtk-icon-source: url("assets/check-mixed-alt.png"); } .check row:inconsistent:hover, .check row:selected:inconsistent:hover, .check row:selected:focus:inconsistent:hover { - background-image: url("assets/check-mixed-hover-alt.png"); + -gtk-icon-source: url("assets/check-mixed-hover-alt.png"); } .check:inconsistent:insensitive { - background-image: url("assets/check-mixed-disabled.png"); + -gtk-icon-source: url("assets/check-mixed-disabled.png"); } .check row:inconsistent:insensitive, .check row:selected:inconsistent:insensitive, .check row:selected:focus:inconsistent:insensitive { - background-image: url("assets/check-mixed-disabled-alt.png"); + -gtk-icon-source: url("assets/check-mixed-disabled-alt.png"); } .check:inconsistent:backdrop { - background-image: url("assets/backdrop-check-mixed.png"); + -gtk-icon-source: url("assets/backdrop-check-mixed.png"); } .check:inconsistent:hover:backdrop { - background-image: url("assets/backdrop-check-mixed-hover.png"); + -gtk-icon-source: url("assets/backdrop-check-mixed-hover.png"); } .check row:inconsistent:backdrop, .check row:selected:inconsistent:backdrop { - background-image: url("assets/backdrop-check-mixed-alt.png"); + -gtk-icon-source: url("assets/backdrop-check-mixed-alt.png"); } .check row:inconsistent:hover:backdrop, .check row:selected:inconsistent:hover:backdrop { - background-image: url("assets/backdrop-check-mixed-hover-alt.png"); + -gtk-icon-source: url("assets/backdrop-check-mixed-hover-alt.png"); } .check:inconsistent:insensitive:backdrop { - background-image: url("assets/backdrop-check-mixed-disabled.png"); + -gtk-icon-source: url("assets/backdrop-check-mixed-disabled.png"); } .check row:selected:inconsistent:insensitive:backdrop { - background-image: url("assets/backdrop-check-mixed-disabled-alt.png"); + -gtk-icon-source: url("assets/backdrop-check-mixed-disabled-alt.png"); } .radio { - background-image: url("assets/radio-unselected.png"); + -gtk-icon-source: url("assets/radio-unselected.png"); } .radio:hover { - background-image: url("assets/radio-unselected-hover.png"); + -gtk-icon-source: url("assets/radio-unselected-hover.png"); } .radio row, .radio row:selected, .radio row:selected:focus { - background-image: url("assets/radio-unselected-alt.png"); + -gtk-icon-source: url("assets/radio-unselected-alt.png"); } .radio row:hover, .radio row:selected:hover, .radio row:selected:focus:hover { - background-image: url("assets/radio-unselected-hover-alt.png"); + -gtk-icon-source: url("assets/radio-unselected-hover-alt.png"); } .radio:insensitive { - background-image: url("assets/radio-unselected-disabled.png"); + -gtk-icon-source: url("assets/radio-unselected-disabled.png"); } .radio row:insensitive { @@ -221,238 +216,218 @@ .radio row:insensitive, .radio row:selected:insensitive, .radio row:selected:focus:insensitive { - background-image: url("assets/radio-unselected-disabled-alt.png"); + -gtk-icon-source: url("assets/radio-unselected-disabled-alt.png"); } .radio:backdrop { - background-image: url("assets/backdrop-radio-unselected.png"); + -gtk-icon-source: url("assets/backdrop-radio-unselected.png"); } .radio:hover:backdrop { - background-image: url("assets/backdrop-radio-unselected-hover.png"); + -gtk-icon-source: url("assets/backdrop-radio-unselected-hover.png"); } .radio row:backdrop, .radio row:selected:backdrop { - background-image: url("assets/backdrop-radio-unselected-alt.png"); + -gtk-icon-source: url("assets/backdrop-radio-unselected-alt.png"); } .radio row:hover:backdrop, .radio row:selected:hover:backdrop { - background-image: url("assets/backdrop-radio-unselected-hover-alt.png"); + -gtk-icon-source: url("assets/backdrop-radio-unselected-hover-alt.png"); } .radio:insensitive:backdrop { - background-image: url("assets/backdrop-radio-unselected-disabled.png"); + -gtk-icon-source: url("assets/backdrop-radio-unselected-disabled.png"); } .radio row:selected:insensitive:backdrop { - background-image: url("assets/backdrop-radio-unselected-disabled-alt.png"); + -gtk-icon-source: url("assets/backdrop-radio-unselected-disabled-alt.png"); } -.radio:active { - background-image: url("assets/radio-selected.png"); +.radio:checked { + -gtk-icon-source: url("assets/radio-selected.png"); } -.radio:active:hover { - background-image: url("assets/radio-selected-hover.png"); +.radio:checked:hover { + -gtk-icon-source: url("assets/radio-selected-hover.png"); } -.radio row:active, -.radio row:selected:active, -.radio row:selected:focus:active { - background-image: url("assets/radio-selected-alt.png"); +.radio row:checked, +.radio row:selected:checked, +.radio row:selected:focus:checked { + -gtk-icon-source: url("assets/radio-selected-alt.png"); } -.radio row:active:hover, -.radio row:selected:active:hover, -.radio row:selected:focus:active:hover { - background-image: url("assets/radio-selected-hover-alt.png"); +.radio row:checked:hover, +.radio row:selected:checked:hover, +.radio row:selected:focus:checked:hover { + -gtk-icon-source: url("assets/radio-selected-hover-alt.png"); } -.radio:active:insensitive { - background-image: url("assets/radio-selected-disabled.png"); +.radio:checked:insensitive { + -gtk-icon-source: url("assets/radio-selected-disabled.png"); } .radio row:insensitive, -.radio row:selected:active:insensitive, -.radio row:selected:focus:active:insensitive { - background-image: url("assets/radio-selected-disabled-alt.png"); +.radio row:selected:checked:insensitive, +.radio row:selected:focus:checked:insensitive { + -gtk-icon-source: url("assets/radio-selected-disabled-alt.png"); } -.radio:active:backdrop { - background-image: url("assets/backdrop-radio-selected.png"); +.radio:checked:backdrop { + -gtk-icon-source: url("assets/backdrop-radio-selected.png"); } -.radio:active:hover:backdrop { - background-image: url("assets/backdrop-radio-selected-hover.png"); +.radio:checked:hover:backdrop { + -gtk-icon-source: url("assets/backdrop-radio-selected-hover.png"); } -.radio row:active:backdrop, -.radio row:selected:active:backdrop { - background-image: url("assets/backdrop-radio-selected-alt.png"); +.radio row:checked:backdrop, +.radio row:selected:checked:backdrop { + -gtk-icon-source: url("assets/backdrop-radio-selected-alt.png"); } -.radio row:active:hover:backdrop, -.radio row:selected:active:hover:backdrop { - background-image: url("assets/backdrop-radio-selected-hover-alt.png"); +.radio row:checked:hover:backdrop, +.radio row:selected:checked:hover:backdrop { + -gtk-icon-source: url("assets/backdrop-radio-selected-hover-alt.png"); } -.radio:active:insensitive:backdrop { - background-image: url("assets/backdrop-radio-selected-disabled.png"); +.radio:checked:insensitive:backdrop { + -gtk-icon-source: url("assets/backdrop-radio-selected-disabled.png"); } -.radio row:selected:active:insensitive:backdrop { - background-image: url("assets/backdrop-radio-selected-disabled-alt.png"); +.radio row:selected:checked:insensitive:backdrop { + -gtk-icon-source: url("assets/backdrop-radio-selected-disabled-alt.png"); } .radio:inconsistent { - background-image: url("assets/radio-mixed.png"); + -gtk-icon-source: url("assets/radio-mixed.png"); } .radio:inconsistent:hover { - background-image: url("assets/radio-mixed-hover.png"); + -gtk-icon-source: url("assets/radio-mixed-hover.png"); } .radio row:inconsistent, .radio row:selected:inconsistent, .radio row:selected:focus:inconsistent { - background-image: url("assets/radio-mixed-alt.png"); + -gtk-icon-source: url("assets/radio-mixed-alt.png"); } .radio row:inconsistent:hover, .radio row:selected:inconsistent:hover, .radio row:selected:focus:inconsistent:hover { - background-image: url("assets/radio-mixed-hover-alt.png"); + -gtk-icon-source: url("assets/radio-mixed-hover-alt.png"); } .radio:inconsistent:insensitive { - background-image: url("assets/radio-mixed-disabled.png"); + -gtk-icon-source: url("assets/radio-mixed-disabled.png"); } .radio row:inconsistent:insensitive, .radio row:selected:inconsistent:insensitive, .radio row:selected:focus:inconsistent:insensitive { - background-image: url("assets/radio-mixed-disabled-alt.png"); + -gtk-icon-source: url("assets/radio-mixed-disabled-alt.png"); } .radio:inconsistent:backdrop { - background-image: url("assets/backdrop-radio-mixed.png"); + -gtk-icon-source: url("assets/backdrop-radio-mixed.png"); } .radio:inconsistent:hover:backdrop { - background-image: url("assets/backdrop-radio-mixed-hover.png"); + -gtk-icon-source: url("assets/backdrop-radio-mixed-hover.png"); } .radio row:inconsistent:backdrop, .radio row:selected:inconsistent:backdrop { - background-image: url("assets/backdrop-radio-mixed-alt.png"); + -gtk-icon-source: url("assets/backdrop-radio-mixed-alt.png"); } .radio row:inconsistent:hover:backdrop, .radio row:selected:inconsistent:hover:backdrop { - background-image: url("assets/backdrop-radio-mixed-hover-alt.png"); + -gtk-icon-source: url("assets/backdrop-radio-mixed-hover-alt.png"); } .radio:inconsistent:insensitive:backdrop { - background-image: url("assets/backdrop-radio-mixed-disabled.png"); + -gtk-icon-source: url("assets/backdrop-radio-mixed-disabled.png"); } .radio row:selected:inconsistent:insensitive:backdrop { - background-image: url("assets/backdrop-radio-mixed-disabled-alt.png"); + -gtk-icon-source: url("assets/backdrop-radio-mixed-disabled-alt.png"); } -/*.sidebar .radio:active, -.sidebar .radio:active:focus, -.sidebar .radio:active:hover { - background-image: url("assets/sidebar-radio-selected.svg"); -} - -.sidebar .radio:hover { - background-image: url("assets/sidebar-radio-prelight.svg"); -} - -.sidebar .radio:active:selected, -.sidebar .radio:active:selected:focus { - background-image: url("assets/sidebar-radio-selected.svg"); -} - -.sidebar .radio:selected:hover, -.sidebar .radio:selected:focus { - background-image: url("assets/sidebar-radio-selected-prelight.svg"); -}*/ - .primary-toolbar .menu .check, .menubar.toolbar .menu .check, .header-bar .menu .check, .menu .check { - background-image: url("assets/check-menuitem-unselected.png"); + -gtk-icon-source: url("assets/check-menuitem-unselected.png"); } .primary-toolbar .menu .radio, .menubar.toolbar .menu .radio, .header-bar .menu .radio, .menu .radio { - background-image: url("assets/check-menuitem-unselected.png"); + -gtk-icon-source: url("assets/check-menuitem-unselected.png"); } -.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"); +.primary-toolbar .menu .check:checked, +.menubar.toolbar .menu .check:checked, +.header-bar .menu .check:checked, +.menu .check:checked { + -gtk-icon-source: url("assets/check-menuitem-dark.png"); } -.toolbar .menu .check:active:hover, -.menu .check:active:hover { - background-image: url("assets/check-menuitem.png"); +.toolbar .menu .check:checked:hover, +.menu .check:checked:hover { + -gtk-icon-source: url("assets/check-menuitem.png"); } -.primary-toolbar .menu .check:active:insensitive, -.menubar.toolbar .menu .check:active:insensitive, -.header-bar .menu .check:active:insensitive, -.toolbar .menu .check:active:hover:insensitive, -.menu .check:active:insensitive, -.menu .check:active:hover:insensitive { - background-image: url("assets/check-menuitem-insensitive.png"); +.primary-toolbar .menu .check:checked:insensitive, +.menubar.toolbar .menu .check:checked:insensitive, +.header-bar .menu .check:checked:insensitive, +.toolbar .menu .check:checked:hover:insensitive, +.menu .check:checked:insensitive, +.menu .check:checked:hover:insensitive { + -gtk-icon-source: url("assets/check-menuitem-insensitive.png"); } -.toolbar .menu .radio:active:hover, -.menu .radio:active { - background-image: url("assets/radio-menuitem.png"); +.toolbar .menu .radio:checked:hover, +.menu .radio:checked { + -gtk-icon-source: url("assets/radio-menuitem.png"); } -.primary-toolbar .menu .radio:active:insensitive, -.menubar.toolbar .menu .radio:active:insensitive, -.header-bar .menu .radio:active:insensitive, -.toolbar .menu .radio:active:hover:insensitive, -.menu .radio:active:insensitive, -.menu .radio:active:hover:insensitive { - background-image: url("assets/radio-menuitem-insensitive.png"); +.primary-toolbar .menu .radio:checked:insensitive, +.menubar.toolbar .menu .radio:checked:insensitive, +.header-bar .menu .radio:checked:insensitive, +.toolbar .menu .radio:checked:hover:insensitive, +.menu .radio:checked:insensitive, +.menu .radio:checked:hover:insensitive { + -gtk-icon-source: url("assets/radio-menuitem-insensitive.png"); } .toolbar .menu .check { - background-image: url("assets/check-menuitem-unselected.png"); + -gtk-icon-source: url("assets/check-menuitem-unselected.png"); } .toolbar .menu .radio { - background-image: url("assets/check-menuitem-unselected.png"); + -gtk-icon-source: url("assets/check-menuitem-unselected.png"); } -.toolbar .menu .check:active { - background-image: url("assets/check-menuitem-dark.png"); +.toolbar .menu .check:checked { + -gtk-icon-source: url("assets/check-menuitem-dark.png"); } -.toolbar .menu .check:active:insensitive { - background-image: url("assets/check-menuitem-insensitive-dark.png"); +.toolbar .menu .check:checked:insensitive { + -gtk-icon-source: url("assets/check-menuitem-insensitive-dark.png"); } -.toolbar .menu .radio:active { - background-image: url("assets/radio-menuitem-dark.png"); +.toolbar .menu .radio:checked { + -gtk-icon-source: url("assets/radio-menuitem-dark.png"); } -.toolbar .menu .radio:active:insensitive { - background-image: url("assets/radio-menuitem-insensitive-dark.png"); +.toolbar .menu .radio:checked:insensitive { + -gtk-icon-source: url("assets/radio-menuitem-insensitive-dark.png"); } /********************* diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders-radiance.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders-radiance.css index cc1f946..63c840e 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders-radiance.css +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders-radiance.css @@ -1,38 +1,3 @@ -.primary-toolbar .button, -.menubar.toolbar .button, -.header-bar .button { - border-image: url("assets/radiance-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:focused, -.menubar.toolbar .button:focused, -.header-bar .button:focused { - border-image: url("assets/radiance-button-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:active, -.menubar.toolbar .button:active, -.header-bar .button:active { - border-image: url("assets/radiance-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:active:focused, -.menubar.toolbar .button:active:focused, -.header-bar .button:active:focused { - border-image: url("assets/radiance-button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:backdrop, -.menubar.toolbar .button:backdrop, -.header-bar .button:backdrop { - border-image: url("assets/radiance-backdrop-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:active:backdrop, -.menubar.toolbar .button:active:backdrop, -.header-bar .button:active:backdrop { - border-image: url("assets/radiance-backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} .primary-toolbar .entry, .menubar.toolbar .entry, @@ -70,4 +35,4 @@ .menubar.menuitem:hover, .menubar .menuitem:hover { border-color: #b8ab9c; -} \ No newline at end of file +} diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders.css index e14c0eb..ef48d1b 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders.css +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders.css @@ -1,151 +1,4 @@ /* Borders */ - -.frame { -/* border-radius: 7px; - border-width: 1px;*/ - - /*border-image: url("assets/frame.png") 8 10 8 10 / 8px 10px 8px 10px stretch;*/ -} - -/* focused element borders */ -.entry:focus, -GtkComboBox.combobox-entry .entry:focus, -.button:focus:active, -.button.default:active, -GtkSwitch.trough:active { -} - -/********** - * button * - **********/ -.button { - border-radius: 8px; - border-width: 1px; - border-style: solid; - border-color: transparent; -} - -.button { - border-image: url("assets/button.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:backdrop { - border-image: url("assets/backdrop-button.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:focus { - border-image: url("assets/button-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:hover { - border-image: url("assets/button-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:hover:backdrop { - border-image: url("assets/backdrop-button-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:hover:focus { - border-image: url("assets/button-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:insensitive { - border-image: url("assets/button-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:insensitive:backdrop { - border-image: url("assets/backdrop-button-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:active { - border-image: url("assets/button-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:active:backdrop { - border-image: url("assets/backdrop-button-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:active:hover { - border-image: url("assets/button-active-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:active:hover:backdrop { - border-image: url("assets/backdrop-button-active-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:active:focus { - border-image: url("assets/button-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:active:hover:focus { - border-image: url("assets/button-active-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:active:insensitive { - border-image: url("assets/button-active-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button:active:insensitive:backdrop { - border-image: url("assets/backdrop-button-active-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -/* focused button borders */ -.button:focus, -.button.default { -} - -.button.default { - border-image: url("assets/button-default.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button.default:hover { - border-image: url("assets/button-default-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button.default:focus { - border-image: url("assets/button-default-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.button.default:focus:hover { - border-image: url("assets/button-default-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button, -.menubar.toolbar .button, -.header-bar .button { - border-image: url("assets/button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:focused, -.menubar.toolbar .button:focused, -.header-bar .button:focused { - border-image: url("assets/button-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:active, -.menubar.toolbar .button:active, -.header-bar .button:active { - border-image: url("assets/button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:active:focused, -.menubar.toolbar .button:active:focused, -.header-bar .button:active:focused { - border-image: url("assets/button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:backdrop, -.menubar.toolbar .button:backdrop, -.header-bar .button:backdrop { - border-image: url("assets/backdrop-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - -.primary-toolbar .button:active:backdrop, -.menubar.toolbar .button:active:backdrop, -.header-bar .button:active:backdrop { - border-image: url("assets/backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; -} - .menubar.menuitem:hover, .menubar .menuitem:hover { border: 1px solid #2e2e2c; diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css index aa5251a..338bf83 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css @@ -1,7 +1,3 @@ -/* NOTES to contributors: - * use 4 spaces intends, and keep code ALIGNED and ORDERED */ - -/* default */ * { -GtkArrow-arrow-scaling: 0.6; -GtkButton-child-displacement-x: 1; @@ -15,8 +11,8 @@ -GtkEntry-inner-border: 2; -GtkEntry-progress-border: 0; -GtkExpander-expander-size: 8; - -GtkHTML-link-color: @link_color; - -GtkIMHtml-hyperlink-color: @link_color; + -GtkHTML-link-color: #f07746; /* @link_color */ + -GtkIMHtml-hyperlink-color: #f07746; /* @link_color */ -GtkMenu-horizontal-padding: 0; -GtkMenu-vertical-padding: 5px; -GtkMenuBar-internal-padding: 0; @@ -38,7 +34,7 @@ -GtkScrolledWindow-scrollbars-within-bevel: 1; -GtkSeparatorMenuItem-horizontal-padding: 0; -GtkStatusbar-shadow-type: none; - -GtkTextView-error-underline-color: @error_color; + -GtkTextView-error-underline-color: #df382c; /* @error_color */ -GtkToolButton-icon-spacing: 6; -GtkToolItemGroup-expander-size: 11; -GtkToolbar-internal-padding: 0; @@ -46,32 +42,27 @@ -GtkTreeView-vertical-separator: 0; -GtkWidget-separator-width: 2; -GtkWidget-separator-height: 2; - -GtkWidget-focus-padding: 0; - -GtkWidget-focus-line-width: 1px; - -GtkWidget-link-color: @link_color; - -GtkWidget-visited-link-color: @link_color; - -GtkWindow-decoration-button-layout: "close:"; + -GtkWidget-link-color: #f07746; /* @link_color */ + -GtkWidget-visited-link-color: #f07746; /* @link_color */ -GtkWindow-resize-grip-width: 0; -GtkWindow-resize-grip-height: 0; -WnckTasklist-fade-overlay-rect: 0; background-origin: border-box; background-clip: padding-box; - border-width: 1px; - - engine: unico; +} - /*-unico-arrow-texture: url("assets/combobox-arrow.png");*/ +.background { + color: @fg_color; + background-color: @bg_color; +} - /* 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; +.background:backdrop { + color: @backdrop_fg_color; } -GtkWindow { - color: @fg_color; +/* LP: #1285783 */ +GtkScrolledWindow { background-color: @bg_color; } @@ -79,21 +70,18 @@ GtkPaned { background-color: @bg_color; } -GtkWindow:backdrop { - color: @backdrop_fg_color; +/* Background hack to make DejaDup Assistant windows not turn black when + * overlay scrollbars are enabled. + */ +Assistant GtkEventBox { + background-color: @bg_color; } -GtkEventBox { +/* ... and for Evolution's mail preferences window */ +EPreferencesWindow GtkNotebook GtkAlignment GtkVBox { background-color: @bg_color; } -/********* - * arrow * - *********/ -/*.arrow * { - background-image: url("assets/combobox-arrow.png"); -}*/ - /************* * assistant * *************/ @@ -116,25 +104,12 @@ GtkAssistant .sidebar { box-shadow: inset -1px 0 shade (@bg_color, 0.94); } -/************** - * background * - **************/ -.background { - background-color: @bg_color; - border-width: 0; -} - /********** * button * **********/ .button { - -GtkWidget-focus-line-width: 0; - padding: 5px 6px; -} -GtkSwitch.slider, -.button { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@button_bg_color, 1.08)), color-stop (0.5, @button_bg_color), @@ -142,27 +117,54 @@ GtkSwitch.slider, color: @fg_color; text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4); + + border: 1px solid transparent; + border-radius: 8px; + border-image-source: url("assets/button.png"); + + /* all button border images have the same size and are sliced in the same way */ + border-image-width: 10px 12px 10px 12px; + border-image-slice: 10 12 10 12; + border-image-repeat: stretch; +} + +.button.flat { + background-image: none; + border-image-source: none; } -GtkSwitch.slider:backdrop, .button:backdrop { background-image: none; background-color: @bg_color; + border-image-source: url("assets/backdrop-button.png"); color: @backdrop_fg_color; text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.2); } +.button.flat:backdrop { + border-image-source: none; +} + +.button:focus { + border-image-source: url("assets/button-focused.png"); +} + .button:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@button_bg_color, 1.12)), color-stop (0.5, @button_bg_color), to (shade (@button_bg_color, 0.96))); + border-image-source: url("assets/button-hover.png"); } .button:hover:backdrop { - background-image: none; background-color: shade (@bg_color, 1.04); + border-image-source: url("assets/backdrop-button-hover.png"); +} + +.button:hover:focus { + border-image-source: url("assets/button-focused-hover.png"); } .button:insensitive { @@ -170,314 +172,141 @@ GtkSwitch.slider:backdrop, background-color: mix (#ebebeb, @bg_color, 0.5); text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4); + border-image-source: url("assets/button-disabled.png"); } .button:insensitive:backdrop { - background-image: none; background-color: #ebebeb; text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.2); + border-image-source: url("assets/backdrop-button-disabled.png"); } -.button:active { +.button.flat:insensitive, +.button.flat:insensitive:backdrop { + background-color: transparent; + border-image-source: none; +} + +.button:checked { background-image: -gtk-gradient (linear, left top, left bottom, from (#cecece), to (#e8e8e8)); + border-image-source: url("assets/button-active.png"); } -.button:active:hover { - background-image: -gtk-gradient (linear, left top, left bottom, - from (#dcdcdc), - to (#f3f3f3)); +.button:checked:focus { + border-image-source: url("assets/button-active-focused.png"); } -.button:active:insensitive { +.button:active { background-image: -gtk-gradient (linear, left top, left bottom, - from (#e3e3e3), + from (#dcdcdc), to (#f3f3f3)); + border-image-source: url("assets/button-active-hover.png"); } -.button:active:insensitive:backdrop { - background-image: -gtk-gradient (linear, left top, left bottom, - from (mix (#e3e3e3, @bg_color, 0.5)), - to (mix (#f3f3f3, @bg_color, 0.5))); +.button:active:focus { + border-image-source: url("assets/button-active-focused-hover.png"); } -/* default button */ - -/* -.button.default { +.button:active:insensitive { background-image: -gtk-gradient (linear, left top, left bottom, - from (mix (shade (@selected_bg_color, 1.16), @bg_color, 0.3)), - to (mix (shade (@selected_bg_color, 0.84), @bg_color, 0.3))); - - text-shadow: 0 1px alpha (shade (@selected_bg_color, 1.26), 0.4); + from (#e3e3e3), + to (#f3f3f3)); + border-image-source: url("assets/button-active-disabled.png"); } -.button.default:hover { - background-image: -gtk-gradient (linear, left top, left bottom, - from (mix (shade (@selected_bg_color, 1.21), @bg_color, 0.3)), - to (mix (shade (@selected_bg_color, 0.89), @bg_color, 0.3))); +.button:checked:backdrop { + border-image-source: url("assets/backdrop-button-active.png"); } -.button.default:active { - background-image: -gtk-gradient (linear, left top, left bottom, - from (mix (shade (@selected_bg_color, 0.95), @bg_color, 0.3)), - to (mix (shade (@selected_bg_color, 1.05), @bg_color, 0.3))); +.button:active:backdrop { + border-image-source: url("assets/backdrop-button-active-hover.png"); } -.button.default:active:hover { +.button:checked:insensitive:backdrop { background-image: -gtk-gradient (linear, left top, left bottom, - from (mix (shade (@selected_bg_color, 1.0), @bg_color, 0.3)), - to (mix (shade (@selected_bg_color, 1.1), @bg_color, 0.3))); -} - -.button.default:insensitive { -} -*/ - -/* Set up shadows and hilights for button visual separation */ -.linked .button, -.toolbar .button.raised.linked, -.toolbar .raised.linked .button, -.inline-toolbar.toolbar .button, -.inline-toolbar.toolbar GtkToolButton .button { - box-shadow: inset -1px 0 shade (@bg_color, 0.84); -} - -.linked .button:first-child, -.toolbar .button.raised.linked:first-child, -.toolbar .raised.linked .button:first-child, -.inline-toolbar.toolbar .button:first-child, -.inline-toolbar.toolbar GtkToolButton:first-child .button { - box-shadow: inset -1px 0 shade (@bg_color, 0.84); -} - -.linked .button:last-child, -.toolbar .button.raised.linked:last-child, -.toolbar .raised.linked .button:last-child, -.inline-toolbar.toolbar .button:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child .button { - /*box-shadow: inset 1px 0 shade (@bg_color, 1.06);*/ + from (mix (#e3e3e3, @bg_color, 0.5)), + to (mix (#f3f3f3, @bg_color, 0.5))); + border-image-source: url("assets/backdrop-button-active-disabled.png"); } -.linked .button:active, -.toolbar .button.raised.linked:active, -.toolbar .raised.linked .button:active, -.inline-toolbar.toolbar .button:active, -.inline-toolbar.toolbar GtkToolButton .button:active { - /*box-shadow: inset 1px 0 shade (@bg_color, 0.76);*/ +.button.default { + border-image-source: url("assets/button-default.png"); } -.linked .button:insensitive, -.toolbar .button.raised.linked:insensitive, -.toolbar .raised.linked .button:insensitive, -.inline-toolbar.toolbar .button:insensitive, -.inline-toolbar.toolbar GtkToolButton .button:insensitive { - box-shadow: inset -1px 0 shade (@bg_color, 0.84); +.button.default:hover { + border-image-source: url("assets/button-default-hover.png"); } -.linked .button:backdrop, -.toolbar .button.raised.linked:backdrop, -.toolbar .raised.linked .button:backdrop, -.inline-toolbar.toolbar .button:backdrop, -.inline-toolbar.toolbar GtkToolButton .button:backdrop { - /*box-shadow: inset -1px 0 @unfocused_borders;*/ +.button.default:focus { + border-image-source: url("assets/button-default-focused.png"); } -.linked .button:insensitive:backdrop, -.toolbar .button.raised.linked:insensitive:backdrop, -.toolbar .raised.linked .button:insensitive:backdrop, -.inline-toolbar.toolbar .button:insensitive:backdrop, -.inline-toolbar.toolbar GtkToolButton .button:insensitive:backdrop { - /*box-shadow: inset -1px 0 @unfocused_insensitive_borders;*/ +.button.default:focus:hover { + border-image-source: url("assets/button-default-focused-hover.png"); } - -/* Middle button */ -.linked .entry, -.linked .entry:active, -.linked .entry:focus, -.linked .entry:focus:active, -.linked .button, -.linked .button:active, -.linked .button:active:hover, -.linked .button:focus, -.linked .button:focus:active, -.linked .button:insensitive, -.linked .button:backdrop, -.linked .button:active:backdrop { - border-right-width: 0; - border-left-width: 0; - border-image-width: 10px 0 10px 0; +/****************** + * Linked Widgets * + *****************/ +.linked > .entry, +.linked > .button, +.linked > GtkComboBox > .button { border-radius: 0; + border-image-width: 10px 0 10px 0; + border-width: 1px 0 1px 0; + box-shadow: inset -1px 0 shade (@bg_color, 0.84); } -/* Leftmost button */ -.linked .entry:first-child, -.linked .entry:active:first-child, -.linked .entry:focus:first-child, -.linked .entry:focus:active:first-child, -.linked .button:first-child, -.linked .button:active:first-child, -.linked .button:active:hover:first-child, -.linked .button:focus:first-child, -.linked .button:focus:active:first-child, -.linked .button:insensitive:first-child, -.linked .button:backdrop:first-child, -.linked .button:active:backdrop:first-child { - border-width: 1px; - border-right-width: 0; +.linked > .entry:first-child, +.linked > .button:first-child, +.linked > GtkComboBox:first-child > .button { border-image-width: 10px 0 10px 12px; - border-radius: 8px; - border-bottom-right-radius: 0; - border-top-right-radius: 0; + border-radius: 8px 0 0 8px; } -/* Rightmost button */ -.linked .entry:last-child, -.linked .entry:active:last-child, -.linked .entry:focus:last-child, -.linked .entry:focus:active:last-child, -.linked .button:last-child, -.linked .button:active:last-child, -.linked .button:active:hover:last-child, -.linked .button:focus:last-child, -.linked .button:focus:active:last-child, -.linked .button:insensitive:last-child, -.linked .button:backdrop:last-child, -.linked .button:active:backdrop:last-child { - border-width: 1px; - border-left-width: 0; +.linked > .entry:last-child, +.linked > .button:last-child, +.linked > GtkComboBox:last-child > .button { border-image-width: 10px 12px 10px 0; - border-radius: 8px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; + border-radius: 0 8px 8px 0; + box-shadow: none; } -/* Linked single button */ -.linked .entry:only-child, -.linked .entry:active:only-child, -.linked .entry:focus:only-child, -.linked .entry:focus:active:only-child, -.linked .button:only-child, -.linked .button:active:only-child, -.linked .button:active:hover:only-child, -.linked .button:focus:only-child, -.linked .button:focus:active:only-child, -.linked .button:insensitive:only-child, -.linked .button:backdrop:only-child, -.linked .button:active:backdrop:only-child { - border-right-width: 1px; - border-left-width: 1px; +.linked > .entry:only-child, +.linked > .button:only-child, +.linked > GtkComboBox:only-child > .button { border-image-width: 10px 12px 10px 12px; border-radius: 8px; } -/* Set up shadows and hilights for button visual separation */ .primary-toolbar .linked .button, -.primary-toolbar .button.raised.linked, -.primary-toolbar .raised.linked .button, -.menubar.toolbar .linked .button, -.menubar.toolbar .button.raised.linked, -.menubar.toolbar .raised.linked .button, -.header-bar .linked .button, -.header-bar .button.raised.linked, -.header-bar .raised.linked .button { +.header-bar .linked .button { box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4), inset -1px 0 shade (@dark_bg_color, 0.9); } .primary-toolbar .linked .button:first-child, -.primary-toolbar .button.raised.linked:first-child, -.primary-toolbar .raised.linked .button:first-child, -.menubar.toolbar .linked .button:first-child, -.menubar.toolbar .button.raised.linked:first-child, -.menubar.toolbar .raised.linked .button:first-child, -.header-bar .linked .button:first-child, -.header-bar .button.raised.linked:first-child, -.header-bar .raised.linked .button:first-child { +.header-bar .linked .button:first-child { box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9); } .primary-toolbar .linked .button:last-child, -.primary-toolbar .button.raised.linked:last-child, -.primary-toolbar .raised.linked .button:last-child, -.menubar.toolbar .linked .button:last-child, -.menubar.toolbar .button.raised.linked:last-child, -.menubar.toolbar .raised.linked .button:last-child, -.header-bar .linked .button:last-child, -.header-bar .button.raised.linked:last-child, -.header-bar .raised.linked .button:last-child { +.header-bar .linked .button:last-child { box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4) } .primary-toolbar .linked .button:active, -.primary-toolbar .button.raised.linked:active, -.primary-toolbar .raised.linked .button:active, -.menubar.toolbar .linked .button:active, -.menubar.toolbar .button.raised.linked:active, -.menubar.toolbar .raised.linked .button:active, .header-bar .linked .button:active, -.header-bar .button.raised.linked:active, -.header-bar .raised.linked .button:active { - box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9); -} - .primary-toolbar .linked .button:insensitive, -.primary-toolbar .button.raised.linked:insensitive, -.primary-toolbar .raised.linked .button:insensitive, -.menubar.toolbar .linked .button:insensitive, -.menubar.toolbar .button.raised.linked:insensitive, -.menubar.toolbar .raised.linked .button:insensitive, -.header-bar .linked .button:insensitive, -.header-bar .button.raised.linked:insensitive, -.header-bar .raised.linked .button:insensitive { - box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9); +.header-bar .linked .button:insensitive { + box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9); } -.primary-toolbar .linked .button:backdrop:last-child, -.primary-toolbar .button.raised.linked:backdrop:last-child, -.primary-toolbar .raised.linked .button:backdrop:last-child, -.menubar.toolbar .linked .button:backdrop:last-child, -.menubar.toolbar .button.raised.linked:backdrop:last-child, -.menubar.toolbar .raised.linked .button:backdrop:last-child, -.header-bar .linked .button:backdrop:last-child, -.header-bar .button.raised.linked:backdrop:last-child, -.header-bar .raised.linked .button:backdrop:last-child { - box-shadow: inset 1px 0 shade (@dark_bg_color, 1.2); -} - -/*.primary-toolbar .linked .button:insensitive:backdrop, -.primary-toolbar .button.raised.linked:insensitive:backdrop, -.primary-toolbar .raised.linked .button:insensitive:backdrop, -.menubar.toolbar .linked .button:insensitive:backdrop, -.menubar.toolbar .button.raised.linked:insensitive:backdrop, -.menubar.toolbar .raised.linked .button:insensitive:backdrop, -.header-bar .linked .button:insensitive:backdrop, -.header-bar .button.raised.linked:insensitive:backdrop, -.header-bar .raised.linked .button:insensitive:backdrop { - box-shadow: inset -1px 0 @unfocused_insensitive_borders; -}*/ - - -/* Linked single button */ -.primary-toolbar .linked .entry:only-child, .primary-toolbar .linked .button:only-child, -.primary-toolbar .linked .button:active:only-child, -.primary-toolbar .linked .button:active:hover:only-child, -.primary-toolbar .linked .button:insensitive:only-child, -.menubar.toolbar .linked .entry:only-child, -.menubar.toolbar .linked .button:only-child, -.menubar.toolbar .linked .button:active:only-child, -.menubar.toolbar .linked .button:active:hover:only-child, -.menubar.toolbar .linked .button:insensitive:only-child, -.header-bar .linked .entry:only-child, -.header-bar .linked .button:only-child, -.header-bar .linked .button:active:only-child, -.header-bar .linked .button:active:hover:only-child, -.header-bar .linked .button:insensitive:only-child { - border-radius: 8px; +.header-bar .linked .button:only-child { box-shadow: none; } @@ -486,7 +315,6 @@ GtkSwitch.slider:backdrop, ****************/ .cell { -GtkCheckButton-indicator-size: 16; - -GtkWidget-focus-line-width: 0; background-color: @base_color; border-radius: 0; @@ -502,7 +330,6 @@ row:selected { border-width: 1px 0 0 0; color: @selected_fg_color; - /*text-shadow: 0 -1px shade (@selected_bg_color, 0.7);*/ } row:selected:backdrop { @@ -512,27 +339,27 @@ row:selected:backdrop { border-top-color: shade (@backdrop_selected_bg_color, 0.9); color: @backdrop_selected_fg_color; - /*text-shadow: 0 -1px shade (@selected_bg_color, 0.7);*/ } /******************* * check and radio * *******************/ -.check, -.radio, -.check:insensitive, -.radio:insensitive { - background-color: transparent; - border-style: none; - margin: 1px 0; +/* Draw a focus ring around the contained label ... */ +GtkCheckButton.text-button GtkLabel { + border: 1px solid transparent; + border-radius: 5px; } -GtkCheckButton:hover, -GtkCheckButton:active:hover, -GtkCheckButton:selected, -GtkCheckButton:selected:focus { - background-color: transparent; +GtkCheckButton.text-button:focus GtkLabel { + border-color: @focus_color; + background-color: @focus_bg_color; +} + +/* ... unless it's a proper button, which already has a focus-colored border */ +.button.text-button:focus GtkLabel { + border: none; + background: none; } .menu .radio * { @@ -630,66 +457,18 @@ GdMainIconView.content-view { -GdMainIconView-icon-size: 40; } -GtkIconView.content-view.check { - /*background-image: url("assets/grid-selection-unchecked.svg");*/ - background-color: transparent; -} - -GtkIconView.content-view.check:active { - /*background-image: url("assets/grid-selection-checked.svg");*/ - background-color: transparent; -} - -.content-view.view.check, -.content-view.view.check:active { - background-color: transparent; -} - -GtkIconView.content-view.check:prelight, -GtkIconView.content-view.check:insensitive, -GtkIconView.content-view.check:backdrop, -GtkIconView.content-view.check:selected { - background-color: transparent; -} - -/**************** - * drawing area * - ****************/ -/* -GtkDrawingArea { - background-color: transparent; -} -*/ - /********* * entry * *********/ -GtkComboBox.combobox-entry .button, -.primary-toolbar GtkComboBox.combobox-entry .button, -.menubar.toolbar GtkComboBox.combobox-entry .button, -.header-bar GtkComboBox.combobox-entry .button, .entry { - -GtkWidget-focus-line-width: 0; - background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@base_color, 0.96)), to (@base_color)); 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, -.primary-toolbar GtkComboBox.combobox-entry .button:backdrop, -.menubar.toolbar GtkComboBox.combobox-entry .button:backdrop, -.header-bar GtkComboBox.combobox-entry .button:backdrop, .entry:backdrop { background-image: -gtk-gradient (linear, left top, left bottom, from (mix (shade (@base_color, 0.96), @bg_color, 0.5)), @@ -704,10 +483,6 @@ GtkComboBox.combobox-entry .button:backdrop, color: @selected_fg_color; } -GtkComboBox.combobox-entry .button:insensitive, -.primary-toolbar GtkComboBox.combobox-entry .button:insensitive, -.menubar.toolbar GtkComboBox.combobox-entry .button:insensitive, -.header-bar GtkComboBox.combobox-entry .button:insensitive, .entry:insensitive { background-color: #f5f5f5; background-image: none; @@ -715,10 +490,6 @@ GtkComboBox.combobox-entry .button:insensitive, color: mix (@text_color, @base_color, 0.4); } -GtkComboBox.combobox-entry .button:insensitive:backdrop, -.primary-toolbar GtkComboBox.combobox-entry .button:insensitive:backdrop, -.menubar.toolbar GtkComboBox.combobox-entry .button:insensitive:backdrop, -.header-bar GtkComboBox.combobox-entry .button:insensitive:backdrop, .entry:insensitive:backdrop { background-color: mix (#f5f5f5, @bg_color, 0.5); @@ -727,8 +498,6 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop, .primary-toolbar .entry.progressbar, .primary-toolbar .entry.progressbar, -.menubar.toolbar .entry.progressbar, -.menubar.toolbar .entry.progressbar, .header-bar .entry.progressbar, .header-bar .entry.progressbar, .entry.progressbar { @@ -760,6 +529,20 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop, background: none; } +.frame.flat { + border: none; +} + +/**************** + * window-frame * + ****************/ + +.window-frame.csd.popup { + border-style: none; + border-radius: 0; + box-shadow: 0 3px 8px @shadow_color; +} + /************ * iconview * ************/ @@ -795,11 +578,7 @@ GtkIconView.view.cell:selected:focused { border-width: 1px; } -/********* - * image * - *********/ -GtkImage, -GtkImage:insensitive { +GtkIconView.cell { background-color: transparent; } @@ -878,33 +657,13 @@ GtkImage:insensitive { inset 0 -1px shade (@error_bg_color, 1.04); } -/********* - * label * - *********/ -GtkLabel, -GtkLabel:insensitive { - background-color: transparent; -} - -/********* - * stack * - *********/ - -GtkHeaderBar > GtkStack, -GtkHeaderBar > GtkStack:insensitive { - background-color: transparent; -} - /******** * menu * ********/ GtkTreeMenu.menu, -.toolbar .primary-toolbar .menu, -.toolbar .menubar.toolbar .menu, .toolbar .header-bar .menu, GtkMenuToolButton.menu, .primary-toolbar .button .menu, -.menubar.toolbar .button .menu, .header-bar .button .menu, .menu { background-image: none; @@ -950,25 +709,10 @@ GtkComboBox .menu { } .menu.button:hover, -.menu.button:active, -.menu.button:active:insensitive, +.menu.button:checked, +.menu.button:checked:insensitive, .menu.button:insensitive, .menu.button -/*.primary-toolbar .menu.button:hover, -.primary-toolbar .menu.button:active, -.primary-toolbar .menu.button:active:insensitive, -.primary-toolbar .menu.button:insensitive, -.primary-toolbar .menu.button, -.menubar.toolbar .menu.button:hover, -.menubar.toolbar .menu.button:active, -.menubar.toolbar .menu.button:active:insensitive, -.menubar.toolbar .menu.button:insensitive, -.menubar.toolbar .menu.button, -.header-bar .menu.button:hover, -.header-bar .menu.button:active, -.header-bar .menu.button:active:insensitive, -.header-bar .menu.button:insensitive, -.header-bar .menu.button */ { background-color: shade (@dark_bg_color, 1.08); background-image: none; @@ -1020,10 +764,6 @@ GtkComboBox .menu { /************ * menuitem * ************/ -/*.menuitem { - color: @fg_color; -}*/ - .menuitem { -GtkMenuItem-horizontal-padding: 0; background: transparent; @@ -1033,10 +773,6 @@ GtkComboBox .menu { text-shadow: none; } -.menuitem { - /*color: @dark_fg_color;*/ -} - /* Workaround for lp:949368 */ GtkComboBox .menuitem * { color: @fg_color; @@ -1046,6 +782,7 @@ GtkComboBox .menuitem *:hover { color: @selected_fg_color; } +.popover .menuitem:checked:hover, .menuitem:hover, .menu .menuitem:hover { border-radius: 0; @@ -1065,8 +802,8 @@ GtkComboBox .menuitem *:hover { text-shadow: 0 -1px shade (@selected_bg_color, 0.7); } -.menuitem.check:active, -.menuitem.radio:active { +.menuitem.check:checked, +.menuitem.radio:checked { color: @fg_color; } @@ -1075,26 +812,14 @@ GtkComboBox .menuitem *:hover { box-shadow: none; } -/*.menuitem:insensitive, -.menuitem *:insensitive { - color: mix (@fg_color, @bg_color, 0.5); - text-shadow: 0 1px shade (@bg_color, 1.14); -} -*/ GtkTreeMenu.menu .menuitem:insensitive, GtkTreeMenu.menu .menuitem *:insensitive, -.toolbar .primary-toolbar .menu .menuitem:insensitive, -.toolbar .primary-toolbar .menu .menuitem *:insensitive, -.toolbar .menubar.toolbar .menu .menuitem:insensitive, -.toolbar .menubar.toolbar .menu .menuitem *:insensitive, .toolbar .header-bar .menu .menuitem:insensitive, .toolbar .header-bar .menu .menuitem *:insensitive, GtkMenuToolButton.menu .menuitem:insensitive, GtkMenuToolButton.menu .menuitem *:insensitive, .primary-toolbar .button .menu .menuitem:insensitive, .primary-toolbar .button .menu .menuitem *:insensitive, -.menubar.toolbar .button .menu .menuitem:insensitive, -.menubar.toolbar .button .menu .menuitem *:insensitive, .header-bar .button .menu .menuitem:insensitive, .header-bar .button .menu .menuitem *:insensitive, .menuitem:insensitive, @@ -1148,8 +873,6 @@ GtkComboBox .menu .menuitem *:insensitive { .primary-toolbar GtkScale.trough, .primary-toolbar GtkScale.trough:backdrop, -.menubar.toolbar GtkScale.trough, -.menubar.toolbar GtkScale.trough:backdrop, .header-bar GtkScale.trough, .header-bar GtkScale.trough:backdrop, .menuitem GtkScale.trough { @@ -1181,99 +904,75 @@ GtkComboBox .menu .menuitem *:insensitive { /************ * notebook * ************/ -.notebook { - background-color: shade (@bg_color, 1.02); - background-image: none; - border-radius: 3px; - padding: 2px; - background-clip: border-box; - border-color: shade (@bg_color, 0.82); - border-width: 1px; - border-style: solid; - /*box-shadow: inset 0 1px shade (@bg_color, 1.1);*/ - /*font-weight: 300;*/ -} - -.notebook tab { - background-image: none; - background-color: transparent; - border-style: solid; - border-image: -gtk-gradient (linear, left top, left bottom, - from (alpha (shade (@bg_color, 0.9), 0.0)), - to (shade (@bg_color, 0.9))) 1; - border-image-width: 0 1px; - border-color: transparent; - border-width: 0; - box-shadow: none; - /*color: shade (@fg_color, 1.2);*/ +.notebook tab.top { padding: 4px 6px 2px 6px; } +.notebook tab.top:active { padding-bottom: 3px; } +.notebook tab.bottom { padding: 2px 6px 4px 6px; } +.notebook tab.bottom:active { padding-top: 3px; } +.notebook tab.left { padding: 2px 4px 2px 6px; } +.notebook tab.left:active { padding-right: 5px; } +.notebook tab.right { padding: 2px 6px 2px 4px; } +.notebook tab.right:active { padding-left: 5px; } + +/* give active tab a background, as it might be dragged across of others when reordering */ +.notebook tab:active { + background-color: @bg_color; } -.notebook tab:active { +.notebook.header { + border-width: 0; /* set below depending on position of tab bar */ border-color: shade (@bg_color, 0.82); border-style: solid; - border-width: 1px; - background-color: shade (@bg_color, 1.02); - background-image: none; - /*box-shadow: inset 0 1px shade (@bg_color, 1.1);*/ - - color: @fg_color; } -.notebook tab GtkLabel { - /*padding: 1px;*/ - padding: 1px 1px 2px 1px; -} +/* Draw a border between tabs and content ... */ +.notebook.header.top { border-bottom-width: 1px; } +.notebook.header.right { border-left-width: 1px; } +.notebook.header.left { border-right-width: 1px; } +.notebook.header.bottom { border-top-width: 1px; } -.notebook tab { - color: shade (@bg_color, 0.48); -} - -.notebook tab.top:active { - padding: 3px 7px 1px 7px; -} +/* ... unless the content is in a frame (thus having a border itself */ +.notebook.header.frame.top { border: none; } +.notebook.header.frame.right { border: none; } +.notebook.header.frame.right { border: none; } +.notebook.header.frame.bottom { border: none; } .notebook tab.top { - padding: 2px 5px 0 5px; -} - -.notebook tab.right:active { - padding: 4px 6px 4px 1px; + border-image: -gtk-gradient (linear, left top, left bottom, + from (alpha (shade (@bg_color, 0.9), 0.0)), + to (shade (@bg_color, 0.9))) 1; + border-image-width: 0 1px; } .notebook tab.right { - padding: 3px 4px 3px 0; border-image: -gtk-gradient (linear, right top, left top, from (alpha (shade (@bg_color, 0.9), 0.0)), to (shade (@bg_color, 0.9))) 1; border-image-width: 1px 0; } -.notebook tab.bottom:active { - padding: 1px 7px 4px 7px; +.notebook tab.left { + border-image: -gtk-gradient (linear, left top, right top, + from (alpha (shade (@bg_color, 0.9), 0.0)), + to (shade (@bg_color, 0.9))) 1; + border-image-width: 1px 0; } .notebook tab.bottom { - padding: 0 5px 3px 5px; border-image: -gtk-gradient (linear, left bottom, left top, from (alpha (shade (@bg_color, 0.9), 0.0)), to (shade (@bg_color, 0.9))) 1; border-image-width: 0 1px; } -.notebook tab.left:active { - padding: 4px 1px 4px 6px; -} - -.notebook tab.left { - padding: 3px 0 3px 4px; - border-image: -gtk-gradient (linear, left top, right top, - from (alpha (shade (@bg_color, 0.9), 0.0)), - to (shade (@bg_color, 0.9))) 1; - border-image-width: 1px 0; +/* Draw a focus ring around labels in tabs */ +.notebook tab GtkLabel { + border: 1px solid transparent; + border-radius: 5px; } -.notebook tab .button { - padding: 0; +.notebook:focus tab GtkLabel.active-page { + border-color: @focus_color; + background-color: @focus_bg_color; } .notebook GtkDrawingArea { @@ -1412,28 +1111,6 @@ GtkLevelBar.vertical { margin: 1px 0; } -/* discrete indicator border rounding, - uncomment when :nth-child will be working - on the widget - -.level-bar.indicator-discrete.fill-block.horizontal:first-child { - border-radius: 2px 0 0 2px; -} - -.level-bar.indicator-discrete.fill-block.horizontal:last-child { - border-radius: 0 2px 2px 0; -} - -.level-bar.indicator-discrete.fill-block.vertical:first-child { - border-radius: 2px 2px 0 0; -} - -.level-bar.indicator-discrete.fill-block.vertical:last-child { - border-radius: 0 0 2px 2px; -} - -*/ - .level-bar.fill-block.level-high { border-color: shade(@success_color, 0.85); background-image: linear-gradient(to bottom, @@ -1467,17 +1144,12 @@ GtkScale { -GtkRange-slider-width: 18; -GtkRange-trough-border: 0; -GtkScale-slider-length: 14; - -GtkWidget-focus-line-width: 0; } GtkScale.vertical { -GtkScale-slider-length: 13; } -.scale.slider { - background-color: transparent; -} - .scale.trough.highlight { background-color: #df784e; background-image: none; @@ -1496,10 +1168,8 @@ GtkScale.vertical { .scale.trough.highlight:backdrop { background-color: #dcdcdc; background-image: none; - /*background-clip: padding-box;*/ } - .scale.trough.highlight.bottom { margin: 0 7px 0 7px; } @@ -1559,10 +1229,6 @@ GtkScale.mark { inset 0 -1px shade (@bg_color, 1.01); } -.scrollbar.button, -.scrollbar.button:insensitive { -} - /* overlay scrollbar */ OsThumb { color: shade (@fg_color, 1.6); @@ -1654,12 +1320,9 @@ GtkComboBox .separator { } GtkTreeMenu .menuitem.separator, -.toolbar .primary-toolbar .menuitem.separator, -.toolbar .menubar.toolbar .menuitem.separator, .toolbar .header-bar .menuitem.separator, GtkMenuToolButton .menuitem.separator, .primary-toolbar .button .menuitem.separator, -.menubar.toolbar .button .menuitem.separator, .header-bar .button .menuitem.separator, .menuitem.separator { border-color: shade (@dark_bg_color, 0.99); @@ -1677,10 +1340,6 @@ GtkComboBox .menuitem.separator { /*********** * sidebar * ***********/ -.sidebar, -.sidebar .view { -} - .sidebar row:selected { text-shadow: 0 1px shade (@selected_bg_color, 0.7); } @@ -1742,118 +1401,26 @@ GtkComboBox .menuitem.separator { * spinner * ***********/ @keyframes spinner { - 0.00% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); } - - 12.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); } - - 25.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)); } - - 37.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)); } - - 50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)); } - - 62.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)); } - - 75.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)); } - - 87.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)); } - - 100% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); } + to { -gtk-icon-transform: rotate(1turn); } } .spinner { - background-color: transparent; - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); - background-position: 14% 14%, 0% 50%, 14% 86%, 50% 100%, 86% 86%, 100% 50%, 86% 14%, 50% 0%; - background-size: 20% 20%; - background-repeat: no-repeat; -} - -.menu .spinner, -.menu .spinner:hover, -.primary-toolbar .spinner, -.primary-toolbar .spinner, -.menubar.toolbar .spinner, -.menubar.toolbar .spinner, -.header-bar .spinner, -.header-bar .spinner { + -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); color: @selected_bg_color; - border: none; - box-shadow: none; + opacity: 0; } .spinner:active { animation: spinner 1s infinite linear; + opacity: 1; +} + +.spinner:active:backdrop { + color: @backdrop_fg_color; +} + +.spinner:active:insensitive { + opacity: 0.5; } /************* @@ -1889,6 +1456,12 @@ GtkSwitch.trough:active { text-shadow: 0 1px shade (@selected_bg_color, 0.7); } +GtkSwitch:focus { + outline: 2px solid @focus_color; + outline-offset: -2px; + outline-radius: 6px; +} + /* XXX temporary */ GtkSwitch.trough:backdrop, GtkSwitch.trough:insensitive { @@ -1904,6 +1477,22 @@ GtkSwitch.slider { padding: 1px; border-radius: 6px; border-style: solid; + + background-image: -gtk-gradient (linear, left top, left bottom, + from (shade (@button_bg_color, 1.08)), + color-stop (0.5, @button_bg_color), + to (shade (@button_bg_color, 0.94))); + + color: @fg_color; + text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4); +} + +GtkSwitch.slider:backdrop { + background-image: none; + background-color: @bg_color; + + color: @backdrop_fg_color; + text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.2); } /************ @@ -1913,6 +1502,96 @@ GtkTextView { background-color: @base_color; } +.header-bar { + padding: 2px 6px; +} + +/* + * Header Bars + * + * The following rules only style header bars when they are used as a window's + * titlebar widget (i.e., they have .titlebar set as well). + * + * Some applications reuse their header bar as a primary toolbar on desktops + * that prefer showing traditional title bars. The rules for those are further + * down grouped with normal toolbars. + */ +.titlebar.header-bar { + background-image: -gtk-gradient (linear, left top, left bottom, + from (shade (@dark_bg_color, 1.5)), + to (@dark_bg_color)); + border-color: shade (@dark_bg_color, 1.5); + border-style: solid; + border-width: 1px 0 0 0; + border-radius: 7px 7px 0 0; + + color: @dark_fg_color; + + box-shadow: inset 0 1px shade (@dark_bg_color, 1.65); +} + +.titlebar.header-bar .title { + font: bold; +} + +.titlebar.header-bar .subtitle { + font-size: smaller; + opacity: 0.5; +} + +.titlebar.header-bar:backdrop { + color: @backdrop_fg_color; + background-image: none; + background-color: @dark_bg_color; + border-top-color: @dark_bg_color; +} + +.maximized .titlebar.header-bar { + border-radius: 0; + border: none; +} + +.titlebar.header-bar .button.titlebutton { + background-clip: padding-box; + border: 1px solid #d0c7bf; + color: #8b8379; + icon-shadow: 0 1px rgba(255, 255, 255, 0.5); + border-radius: 9px; + padding: 0; + box-shadow: none; + background-image: linear-gradient(to top, #d5d2ce, #ece8e4 50%, #f7f4f3); +} + +.titlebar.header-bar .button.titlebutton.close { + color: #7f4025; + icon-shadow: 0 1px rgba(255, 255, 255, 0.25); + background-image: linear-gradient(to top, #e77041, #f17d4e 50%, #f9b39c); +} + +.titlebar.header-bar .button.titlebutton.close:hover { + background-image: linear-gradient(to top, #e67144, #ed8b67 50%, #f9cbbd); +} + +.titlebar.header-bar .button.titlebutton:hover, +.titlebar.header-bar .button.titlebutton:backdrop:hover { + background-image: linear-gradient(to top, #e2e1df, #f8f6f3 50%, #fcfbf9); +} + +.titlebar.header-bar .button.titlebutton:active { + icon-shadow: none; + background-image: linear-gradient(to top, #fcfbf8, #fbf9f6); +} + +.titlebar.header-bar .button.titlebutton.close:active { + background-image: linear-gradient(to top, #f08054, #f07c4e); +} + +.titlebar.header-bar .button.titlebutton:backdrop { + color: #8b8379; + icon-shadow: none; + background-image: linear-gradient(to top, #ece9e6, #e8e4e1); +} + /*********** * toolbar * ***********/ @@ -1928,16 +1607,10 @@ GtkTextView { color: @backdrop_fg_color; } -.toolbar .button { - /*padding: 1px;*/ - /*padding: 6px 8px;*/ -} - -/* primary-toolbar */ +/******************* + * primary-toolbar * + *******************/ .primary-toolbar, -.primary-toolbar .toolbar, -.primary-toolbar.toolbar, -.menubar.toolbar, .header-bar { -GtkWidget-window-dragging: true; @@ -1948,6 +1621,7 @@ GtkTextView { border-top-color: shade (@dark_bg_color, 1.09); border-style: solid; border-width: 1px 0 1px 0; + border-radius: 0; color: @dark_fg_color; text-shadow: 0 -1px shade (@dark_bg_color, 0.7); @@ -1955,10 +1629,7 @@ GtkTextView { box-shadow: inset 0 1px shade (@dark_bg_color, 0.94); } -.primary-toolbar .toolbar:backdrop, -.primary-toolbar.toolbar:backdrop, -.menubar.toolbar .toolbar:backdrop, -.menubar.toolbar.toolbar:backdrop, +.primary-toolbar:backdrop, .header-bar:backdrop { background-image: none; background-color: @dark_bg_color; @@ -1970,97 +1641,99 @@ GtkTextView { } .primary-toolbar :insensitive, -.menubar.toolbar .toolbar :insensitive, .header-bar :insensitive { text-shadow: 0 -1px shade (@dark_bg_color, 0.7); } -.primary-toolbar GtkComboBox, .primary-toolbar .button, -.menubar.toolbar GtkComboBox, -.menubar.toolbar .button, -.header-bar GtkComboBox, -.header-bar .button { - background-color: transparent; - background-image: none; - border-color: transparent; - /*border-radius: 3px;*/ - /*border-width: 1px;*/ - /*padding: 3px;*/ - +.header-bar .button, +.primary-toolbar .button.flat:hover { + background: transparent; color: @dark_fg_color; text-shadow: 0 -1px shade (@dark_bg_color, 0.7); + border-image-source: url("assets/radiance-button-toolbar.png"); +} + +.primary-toolbar .button.flat { + border-image-source: none; + background: transparent; +} + +.primary-toolbar .button:focused, +.header-bar .button:focused { + border-image-source: url("assets/radiance-button-toolbar-focused.png"); +} + +.primary-toolbar .button:active, +.primary-toolbar .button:checked, +.header-bar .button:active, +.header-bar .button:checked { + border-image-source: url("assets/radiance-button-toolbar-active.png"); +} + +.primary-toolbar .button:active:focused, +.primary-toolbar .button:checked:focused, +.header-bar .button:active:focused, +.header-bar .button:checked:focused { + border-image-source: url("assets/radiance-button-toolbar-active-focused.png"); } -.primary-toolbar GtkComboBox:backdrop, .primary-toolbar .button:backdrop, -.menubar.toolbar GtkComboBox:backdrop, -.menubar.toolbar .button:backdrop, -.header-bar GtkComboBox:backdrop, .header-bar .button:backdrop { + background-color: transparent; color: @backdrop_dark_fg_color; text-shadow: 0 -1px shade (@dark_bg_color, 0.9); + border-image-source: url("assets/radiance-backdrop-button-toolbar.png"); +} + +.primary-toolbar .button.flat:backdrop { + border-image-source: none; +} + +.primary-toolbar .button:active:backdrop, +.primary-toolbar .button:checked:backdrop, +.header-bar .button:active:backdrop, +.header-bar .button:checked:backdrop { + border-image-source: url("assets/radiance-backdrop-button-toolbar-active.png"); } -.primary-toolbar .raised .button, -.primary-toolbar .raised.button, .primary-toolbar .button:hover, -.primary-toolbar .button:active, -.primary-toolbar .button:insensitive, -.menubar.toolbar .raised .button, -.menubar.toolbar .raised.button, -.menubar.toolbar .button:hover, -.menubar.toolbar .button:active, -.menubar.toolbar .button:insensitive, -.header-bar .raised .button, -.header-bar .raised.button, +.primary-toolbar .button:checked, .header-bar .button:hover, -.header-bar .button:active, -.header-bar .button:insensitive { +.header-bar .button:checked { 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 .button:active, -.menubar.toolbar .button:active, .header-bar .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, -.menubar.toolbar .button:active:hover, -.header-bar .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))); + text-shadow: 0 -1px shade (@dark_bg_color, 0.6); } -.primary-toolbar .button:active:insensitive, +.primary-toolbar .button:checked:insensitive, .primary-toolbar .button:insensitive, -.menubar.toolbar .button:active:insensitive, -.menubar.toolbar .button:insensitive, -.header-bar .button:active:insensitive, +.header-bar .button:checked:insensitive, .header-bar .button:insensitive { text-shadow: none; } .primary-toolbar .button:insensitive, -.menubar.toolbar .button:insensitive, .header-bar .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, -.menubar.toolbar .button:active:insensitive, -.header-bar .button:active:insensitive { +.primary-toolbar .button.flat:insensitive { + background-image: none; +} + +.primary-toolbar .button:checked:insensitive, +.header-bar .button:checked:insensitive { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 0.94)), to (shade (@dark_bg_color, 1.02))); @@ -2069,9 +1742,6 @@ GtkTextView { .primary-toolbar GtkSeparatorToolItem, .primary-toolbar .separator, .primary-toolbar .separator:insensitive, -.menubar.toolbar GtkSeparatorToolItem, -.menubar.toolbar .separator, -.menubar.toolbar .separator:insensitive, .header-bar GtkSeparatorToolItem, .header-bar .separator, .header-bar .separator:insensitive { @@ -2106,10 +1776,6 @@ GtkTextView { icon-shadow: 0 1px shade (@bg_color, 1.16); } -.inline-toolbar.toolbar .button *:insensitive, -.inline-toolbar.toolbar GtkToolButton .button:insensitive { -} - /* Middle button */ .inline-toolbar.toolbar .button, .inline-toolbar.toolbar .button:active, @@ -2175,7 +1841,6 @@ GtkTextView { 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 */ @@ -2197,19 +1862,6 @@ GtkTextView { border-left-width: 1px; border-image-width: 10px 12px 10px 12px; border-radius: 8px; - /*box-shadow: none;*/ -} - - -.header-bar { - padding: 5px; - border-width: 0 0 1px; - border-style: solid; - border-color: shade(@toolbar_bg_color, 0.7); - background-image: linear-gradient(to bottom, - shade(@toolbar_bg_color, 1.00), - shade(@toolbar_bg_color, 0.90) - ); } /*********** @@ -2227,10 +1879,6 @@ GtkTextView { color: @tooltip_fg_color; } -.tooltip * { - background-color: transparent; -} - /************ * treeview * ************/ @@ -2243,24 +1891,122 @@ GtkTreeView.dnd { GtkTreeView .entry { background-image: none; - /*border-radius: 0;*/ } -GtkTreeView row:nth-child(even){ - /*background-color: @base_color;*/ +/************ + * viewport * + ************/ +GtkViewport.frame { + border-width: 0; +} + +/************ + * listbox * + ************/ +.list-row.button { + border-image: none; + border-style: none; + border-radius: 0; + background-image: none; } -GtkTreeView row:nth-child(odd) { - /*background-color: shade (@base_color, 0.965);*/ +.list-row.button:selected { + text-shadow: none; } /************ - * viewport * + * popover * ************/ -GtkViewport.frame { - border-width: 0; +.popover { + background-clip: border-box; + + border-radius: 5px; + border: 1px solid darker(@bg_color); + + box-shadow: 0 2px 3px @shadow_color; + margin: 10px; + padding: 2px; +} + +.popover:backdrop { + box-shadow: none; +} + +/* Popover menuitems are actually buttons. The following rules reset most of + * the button styles for them. + */ +.popover .menuitem, +.popover .menuitem:checked, +.popover .menuitem:hover, +.popover .menuitem:active, +.popover .menuitem:insensitive, +.popover .menuitem:backdrop { + border-image: none; + border: none; + text-shadow: none; + border-radius: 3px; +} + +.popover .menuitem:backdrop:hover { + border: none; + border-image: none; + background: transparent; + color: @fg_color; } +.popover .menuitem:checked, +.popover .menuitem.check, +.popover .menuitem.check:checked, +.popover .menuitem.radio, +.popover .menuitem.radio:checked { + background-image: none; + border: none; +} + +.popover .menuitem:insensitive, +.popover .menuitem *:insensitive { + text-shadow: none; + background: none; +} + + +/* OSD overlays */ +.osd, +.osd:backdrop { + color: @osd_fg_color; + background-color: @osd_bg_color; + border-color: @osd_border_color; +} + +.osd.toolbar { + padding: 12px; + border-radius: 8px; +} + +.osd .button, +.osd .button:backdrop { + color: @osd_fg_color; + background: none; + border: none; + padding: 12px; + border-radius: 8px; + transition: all 100ms ease-in-out; +} + +.osd .button:hover { + color: lighter(@osd_fg_color); + icon-shadow: 0 0 3px @osd_fg_color; +} + +.osd .button:active { + color: darker(@osd_fg_color); + icon-shadow: none; +} + +.osd .scale { + margin-left: 9px; + margin-right: 9px; +} /***************************************************************************** * states [please keep this section at the end of the file (CSS precedence)] * @@ -2283,3 +2029,4 @@ GtkViewport.frame { color: @backdrop_selected_fg_color; } + diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/public-colors.css b/src/usr/share/themes/Lubuntu-default/gtk-3.0/public-colors.css new file mode 100644 index 0000000..33c3db0 --- /dev/null +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/public-colors.css @@ -0,0 +1,23 @@ +/* + * Some applications depend on these named colors. + */ + +@define-color theme_fg_color @fg_color; +@define-color theme_bg_color @bg_color; +@define-color theme_base_color @base_color; +@define-color theme_selected_bg_color @selected_bg_color; +@define-color theme_selected_fg_color @selected_fg_color; +@define-color insensitive_bg_color @bg_color; +@define-color insensitive_fg_color @fg_color; +@define-color insensitive_base_color @base_color; +@define-color theme_unfocused_fg_color @backdrop_fg_color; +@define-color theme_unfocused_bg_color @bg_color; +@define-color theme_unfocused_base_color @base_color; +@define-color theme_unfocused_selected_bg_color @selected_bg_color; +@define-color theme_unfocused_selected_fg_color @selected_fg_color; +@define-color borders shade(@bg_color, 0.82); +@define-color unfocused_borders transparent; + +@define-color warning_color @warning_fg_color; +@define-color error_color @error_fg_color; +@define-color success_color @success_color; diff --git a/src/usr/share/themes/Lubuntu-default/gtk-3.0/settings.ini b/src/usr/share/themes/Lubuntu-default/gtk-3.0/settings.ini index f2b44e5..5cb1301 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-3.0/settings.ini +++ b/src/usr/share/themes/Lubuntu-default/gtk-3.0/settings.ini @@ -1,4 +1,4 @@ [Settings] -gtk-color-scheme = "base_color:#ffffff\nbg_color:#f6f4f2\ntooltip_bg_color:#000000\nselected_bg_color:#f07746\ntext_color:#3C3C3C\nfg_color:#4c4c4c\ntooltip_fg_color:#ffffff\nselected_fg_color:#ffffff\nlink_color:#DD4814\nbg_color_dark:#3c3b37\nfg_color_dark:#dfdbd2" +gtk-color-scheme = "base_color:#ffffff\nbg_color:#f6f4f2\ntooltip_bg_color:#000000\nselected_bg_color:#f07746\ntext_color:#3C3C3C\nfg_color:#4c4c4c\ntooltip_fg_color:#ffffff\nselected_fg_color:#ffffff\nlink_color:#148ADD\nbg_color_dark:#3c3b37\nfg_color_dark:#dfdbd2" gtk-auto-mnemonics = 1 gtk-alternative-sort-arrows = true