From 954f41f19f3c851796b743c38c1300612b0ed525 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 3 Aug 2015 20:18:19 +0200 Subject: [PATCH 01/10] smaller menu border-radius --- common/gtk-3.0/3.14/gtk-contained-dark.css | 4 ++-- common/gtk-3.0/3.14/gtk-contained-darker.css | 4 ++-- common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 4 ++-- common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 4 ++-- common/gtk-3.0/3.14/gtk-contained-solid.css | 4 ++-- common/gtk-3.0/3.14/gtk-contained.css | 4 ++-- common/gtk-3.0/3.14/sass/_common.scss | 4 ++-- common/gtk-3.0/3.16/gtk-contained-dark.css | 4 ++-- common/gtk-3.0/3.16/gtk-contained-darker.css | 4 ++-- common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 4 ++-- common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 4 ++-- common/gtk-3.0/3.16/gtk-contained-solid.css | 4 ++-- common/gtk-3.0/3.16/gtk-contained.css | 4 ++-- common/gtk-3.0/3.16/sass/_common.scss | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css index 5ca613b..e091bb4 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -1309,7 +1309,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #2d3036; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -2250,7 +2250,7 @@ GtkVolumeButton.button { .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #212429; } .window-frame.csd.tooltip { border-radius: 2px; diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css index d296129..d933516 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -1310,7 +1310,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #dbdfe3; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -2251,7 +2251,7 @@ GtkVolumeButton.button { .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { border-radius: 2px; diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css index be70c84..1419d47 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css @@ -1309,7 +1309,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #2d3036; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -2250,7 +2250,7 @@ GtkVolumeButton.button { .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #212429; } .window-frame.csd.tooltip { border-radius: 2px; diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css index 98a78c9..4499de0 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css @@ -1310,7 +1310,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #dbdfe3; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -2251,7 +2251,7 @@ GtkVolumeButton.button { .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { border-radius: 2px; diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css index 4f72252..b13e7ba 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -1309,7 +1309,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #dbdfe3; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -2250,7 +2250,7 @@ GtkVolumeButton.button { .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { border-radius: 2px; diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 2628d67..a17f928 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -1309,7 +1309,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #dbdfe3; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -2250,7 +2250,7 @@ GtkVolumeButton.button { .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { border-radius: 2px; diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index b9f2863..20189f8 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -1480,7 +1480,7 @@ column-header.button.dnd { // for treeview-like derive widgets .csd & { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } @@ -2591,7 +2591,7 @@ GtkVolumeButton.button { padding: 8px; } } &.csd { &.popup, &.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.1)), 0 0 0 1px if($variant == 'light', $_wm_border, darken($base_color, 10%)); } diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index 0a7e5a9..21827fd 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -1325,7 +1325,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #2d3036; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -2343,7 +2343,7 @@ GtkVolumeButton.button { .window-frame.ssd.maximized { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #212429; } .window-frame.csd.tooltip { border-radius: 2px; diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css index 6c62bf8..c931495 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -1326,7 +1326,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #dbdfe3; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -2344,7 +2344,7 @@ GtkVolumeButton.button { .window-frame.ssd.maximized { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { border-radius: 2px; diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css index f92eb1c..a0f41af 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css @@ -1325,7 +1325,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #2d3036; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -2343,7 +2343,7 @@ GtkVolumeButton.button { .window-frame.ssd.maximized { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #212429; } .window-frame.csd.tooltip { border-radius: 2px; diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css index 9724413..f4d76fc 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css @@ -1326,7 +1326,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #dbdfe3; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -2344,7 +2344,7 @@ GtkVolumeButton.button { .window-frame.ssd.maximized { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { border-radius: 2px; diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css index e587370..99cd85b 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -1325,7 +1325,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #dbdfe3; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -2343,7 +2343,7 @@ GtkVolumeButton.button { .window-frame.ssd.maximized { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { border-radius: 2px; diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index eab47fb..4aef20c 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -1325,7 +1325,7 @@ column-header .button, column-header .button:hover, column-header .button:active border: 1px solid #dbdfe3; } .csd .menu, .csd .popup { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } .menu .menuitem, .popup .menuitem { padding: 5px; } @@ -2343,7 +2343,7 @@ GtkVolumeButton.button { .window-frame.ssd.maximized { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { border-radius: 2px; diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 27956f6..d7baa9d 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -1502,7 +1502,7 @@ column-header.button.dnd { // for treeview-like derive widgets .csd & { padding: 4px 0px; - border-radius: 3px; + border-radius: 2px; border: none; } @@ -2721,7 +2721,7 @@ GtkVolumeButton.button { padding: 8px; } } &.csd { &.popup, &.menu { - border-radius: 3px; + border-radius: 2px; box-shadow: 0 3px 6px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.1)), 0 0 0 1px if($variant == 'light', $_wm_border, darken($base_color, 10%)); } From cbbd23ec075997c5b2ffb634ee03724759fbe58e Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 10 Aug 2015 20:31:22 +0200 Subject: [PATCH 02/10] gnome-shell theme improvements and some osd redesign --- common/gnome-shell/3.14/.nvmrc | 1 + common/gnome-shell/3.14/README | 19 + .../dash/button-active-bottom.svg | 12 +- .../dash/button-active-right.svg | 10 +- .../dash/button-active-top.svg | 10 +- .../dash/button-active.svg | 14 +- .../dash/button-hover-bottom.svg | 10 +- .../dash/button-hover-right.svg | 10 +- .../dash/button-hover-top.svg | 10 +- .../{ => common-assets}/dash/button-hover.svg | 10 +- .../dash/button-running-active-bottom.svg | 0 .../dash/button-running-active-right.svg | 0 .../dash/button-running-active-top.svg | 0 .../dash/button-running-active.svg | 0 .../dash/button-running-bottom.svg | 0 .../dash/button-running-hover-bottom.svg | 0 .../dash/button-running-hover-right.svg | 0 .../dash/button-running-hover-top.svg | 0 .../dash/button-running-hover.svg | 0 .../dash/button-running-right.svg | 0 .../dash/button-running-top.svg | 0 .../dash/button-running.svg | 0 .../3.14/common-assets/dash/dash-bottom.svg | 76 + .../dash/dash-extended-bottom.svg | 77 + .../common-assets/dash/dash-extended-left.svg | 76 + .../dash/dash-extended-right.svg | 77 + .../common-assets/dash/dash-extended-top.svg | 77 + .../3.14/common-assets/dash/dash-left.svg | 72 + .../dash/dash-placeholder.svg | 0 .../3.14/common-assets/dash/dash-right.svg | 72 + .../3.14/common-assets/dash/dash-top.svg | 76 + .../3.14/common-assets/dash/running1.svg | 142 + .../3.14/common-assets/dash/running2.svg | 149 + .../3.14/common-assets/dash/running3.svg | 156 + .../3.14/common-assets/dash/running4.svg | 163 + .../menu/menu-separator.svg | 0 .../3.14/common-assets/misc/bg.svg | 127 + .../3.14/common-assets/misc/button-box.svg | 99 + .../{ => common-assets}/misc/close-active.svg | 26 +- .../common-assets}/misc/close-hover.svg | 26 +- .../3.14/{ => common-assets}/misc/close.svg | 24 +- .../common-assets}/misc/corner-ripple-ltr.svg | 2 +- .../common-assets}/misc/corner-ripple-rtl.svg | 2 +- .../common-assets}/misc/more-results.svg | 14 +- .../3.14/common-assets/misc/notification.svg | 151 + .../3.14/{ => common-assets}/misc/null.svg | 0 .../3.14/common-assets/misc/osd.svg | 127 + .../misc/page-indicator-active.svg | 0 .../misc/page-indicator-checked.svg | 2 +- .../misc/page-indicator-hover.svg | 2 +- .../misc/page-indicator-inactive.svg | 2 +- .../common-assets/misc/process-working.svg | 287 + .../misc/summary-counter.svg | 0 .../misc/ws-switch-arrow-down.png | Bin .../misc/ws-switch-arrow-up.png | Bin .../common-assets/panel/activities-active.svg | 158 + .../common-assets/panel}/activities.svg | 51 +- .../common-assets/panel/panel-overview.svg | 75 + .../3.14/common-assets/panel/panel.svg | 75 + .../checkbox/checkbox-checked-focused.svg | 195 + .../dark-assets/checkbox/checkbox-checked.svg | 195 + .../checkbox/checkbox-unchecked-focused.svg | 141 + .../checkbox/checkbox-unchecked.svg | 141 + .../3.14/dark-assets/menu/menu-hover.svg | 97 + .../3.14/dark-assets/menu/menu.svg | 127 + .../3.14/dark-assets/menu/submenu-open.svg | 109 + .../3.14/dark-assets/menu/submenu.svg | 109 + .../misc/calendar-arrow-left-hover.svg | 0 .../misc/calendar-arrow-left.svg | 0 .../misc/calendar-arrow-right-hover.svg | 0 .../misc/calendar-arrow-right.svg | 0 .../3.14/dark-assets/misc/message-active.svg | 70 + .../dark-assets/misc/message-close-active.svg | 118 + .../dark-assets/misc/message-close-hover.svg | 118 + .../3.14/dark-assets/misc/message-close.svg | 118 + .../3.14/dark-assets/misc/message-hover.svg | 76 + .../3.14/dark-assets/misc/message.svg | 76 + .../3.14/dark-assets/misc/modal.svg | 143 + .../3.14/dark-assets/switch/switch-off.svg | 201 + .../3.14/dark-assets/switch/switch-on.svg | 220 + common/gnome-shell/3.14/gnome-shell.css | 4679 +++++++---------- common/gnome-shell/3.14/gulpfile.js | 18 + .../checkbox/checkbox-checked-focused.svg | 0 .../checkbox/checkbox-checked.svg | 0 .../checkbox/checkbox-unchecked-focused.svg | 0 .../checkbox/checkbox-unchecked.svg | 0 .../light-assets}/menu/menu-hover.svg | 14 +- .../3.14/light-assets/menu/menu.svg | 127 + .../light-assets}/menu/submenu-open.svg | 22 +- .../3.14/{ => light-assets}/menu/submenu.svg | 20 +- .../misc/calendar-arrow-left-hover.svg | 0 .../misc/calendar-arrow-left.svg | 0 .../misc/calendar-arrow-right-hover.svg | 0 .../misc/calendar-arrow-right.svg | 0 .../3.14/light-assets/misc/message-active.svg | 70 + .../misc/message-close-active.svg | 118 + .../light-assets/misc/message-close-hover.svg | 118 + .../3.14/light-assets/misc/message-close.svg | 118 + .../3.14/light-assets/misc/message-hover.svg | 76 + .../3.14/light-assets/misc/message.svg | 76 + .../3.14/light-assets/misc/modal.svg | 143 + .../light-assets}/switch/switch-off.svg | 12 +- .../{ => light-assets}/switch/switch-on.svg | 16 +- .../3.14/menu/menu-arrow-symbolic.svg | 90 - common/gnome-shell/3.14/menu/menu.svg | 115 - common/gnome-shell/3.14/misc/bg.svg | 132 - .../3.14/misc/logged-in-indicator.svg | 130 - common/gnome-shell/3.14/misc/modal.svg | 141 - .../gnome-shell/3.14/misc/noise-texture.png | Bin 79464 -> 0 bytes common/gnome-shell/3.14/misc/osd.svg | 132 - .../3.14/misc/panel-button-highlight.svg | 102 - .../gnome-shell/3.14/misc/process-working.svg | 811 --- .../3.14/misc/running-indicator.svg | 127 - common/gnome-shell/3.14/package.json | 7 + common/gnome-shell/3.14/sass/_colors.scss | 90 + common/gnome-shell/3.14/sass/_common.scss | 2431 +++++++++ common/gnome-shell/3.14/sass/_drawing.scss | 157 + common/gnome-shell/3.14/sass/gnome-shell.scss | 7 + common/gnome-shell/3.16/.nvmrc | 2 +- .../3.16/common-assets/dash/dash-bottom.svg | 76 + .../dash/dash-extended-bottom.svg | 77 + .../common-assets/dash/dash-extended-left.svg | 76 + .../dash/dash-extended-right.svg | 77 + .../common-assets/dash/dash-extended-top.svg | 77 + .../3.16/common-assets/dash/dash-left.svg | 72 + .../dash/dash-placeholder.svg | 0 .../3.16/common-assets/dash/dash-right.svg | 72 + .../3.16/common-assets/dash/dash-top.svg | 76 + .../3.16/common-assets/dash/running1.svg | 142 + .../3.16/common-assets/dash/running2.svg | 149 + .../3.16/common-assets/dash/running3.svg | 156 + .../3.16/common-assets/dash/running4.svg | 163 + .../menu/menu-separator.svg | 0 .../3.16/common-assets/misc/bg.svg | 127 + .../3.16/common-assets/misc/button-box.svg | 99 + .../{ => common-assets}/misc/close-active.svg | 26 +- .../common-assets}/misc/close-hover.svg | 26 +- .../3.16/{ => common-assets}/misc/close.svg | 24 +- .../common-assets}/misc/corner-ripple-ltr.svg | 2 +- .../common-assets}/misc/corner-ripple-rtl.svg | 2 +- .../common-assets}/misc/more-results.svg | 14 +- .../3.16/common-assets/misc/osd.svg | 127 + .../misc/page-indicator-active.svg | 0 .../misc/page-indicator-checked.svg | 2 +- .../misc/page-indicator-hover.svg | 2 +- .../misc/page-indicator-inactive.svg | 2 +- .../common-assets/misc/process-working.svg | 287 + .../misc/ws-switch-arrow-down.png | Bin .../misc/ws-switch-arrow-up.png | Bin .../common-assets/panel/activities-active.svg | 158 + .../common-assets/panel}/activities.svg | 51 +- .../common-assets/panel/panel-overview.svg | 75 + .../3.16/common-assets/panel/panel.svg | 75 + .../checkbox/checkbox-checked-focused.svg | 195 + .../dark-assets/checkbox/checkbox-checked.svg | 195 + .../checkbox/checkbox-unchecked-focused.svg | 141 + .../checkbox/checkbox-unchecked.svg | 141 + .../3.16/dark-assets/menu/menu-hover.svg | 97 + .../3.16/dark-assets/menu/menu.svg | 127 + .../3.16/dark-assets/menu/submenu-open.svg | 109 + .../3.16/dark-assets/menu/submenu.svg | 109 + .../misc/calendar-arrow-left-hover.svg | 169 + .../dark-assets/misc/calendar-arrow-left.svg | 169 + .../misc/calendar-arrow-right-hover.svg | 171 + .../dark-assets/misc/calendar-arrow-right.svg | 171 + .../3.16/dark-assets/misc/message-active.svg | 70 + .../dark-assets/misc/message-close-active.svg | 118 + .../dark-assets/misc/message-close-hover.svg | 118 + .../3.16/dark-assets/misc/message-close.svg | 118 + .../3.16/dark-assets/misc/message-hover.svg | 76 + .../3.16/dark-assets/misc/message.svg | 76 + .../3.16/dark-assets/misc/modal.svg | 143 + .../3.16/dark-assets/switch/switch-off.svg | 201 + .../3.16/dark-assets/switch/switch-on.svg | 220 + common/gnome-shell/3.16/gnome-shell.css | 651 +-- .../checkbox/checkbox-checked-focused.svg | 0 .../checkbox/checkbox-checked.svg | 0 .../checkbox/checkbox-unchecked-focused.svg | 0 .../checkbox/checkbox-unchecked.svg | 0 .../light-assets}/menu/menu-hover.svg | 14 +- .../3.16/light-assets/menu/menu.svg | 127 + .../light-assets}/menu/submenu-open.svg | 22 +- .../3.16/{ => light-assets}/menu/submenu.svg | 20 +- .../misc/calendar-arrow-left-hover.svg | 169 + .../light-assets/misc/calendar-arrow-left.svg | 169 + .../misc/calendar-arrow-right-hover.svg | 171 + .../misc/calendar-arrow-right.svg | 171 + .../3.16/light-assets/misc/message-active.svg | 70 + .../misc/message-close-active.svg | 118 + .../light-assets/misc/message-close-hover.svg | 118 + .../3.16/light-assets/misc/message-close.svg | 118 + .../3.16/light-assets/misc/message-hover.svg | 76 + .../3.16/light-assets/misc/message.svg | 76 + .../3.16/light-assets/misc/modal.svg | 143 + .../light-assets}/switch/switch-off.svg | 12 +- .../{ => light-assets}/switch/switch-on.svg | 16 +- .../3.16/menu/menu-arrow-symbolic.svg | 90 - common/gnome-shell/3.16/menu/menu.svg | 115 - common/gnome-shell/3.16/misc/bg.svg | 132 - .../3.16/misc/logged-in-indicator.svg | 130 - common/gnome-shell/3.16/misc/modal.svg | 141 - .../gnome-shell/3.16/misc/noise-texture.png | Bin 79464 -> 0 bytes common/gnome-shell/3.16/misc/osd.svg | 132 - .../gnome-shell/3.16/misc/process-working.svg | 811 --- common/gnome-shell/3.16/sass/_colors.scss | 96 +- common/gnome-shell/3.16/sass/_common.scss | 731 +-- common/gnome-shell/3.16/sass/_drawing.scss | 37 +- common/gnome-shell/3.16/sass/gnome-shell.scss | 4 + common/gtk-2.0/apps.rc | 2 +- common/gtk-2.0/panel.rc | 10 +- common/gtk-3.0/3.14/.nvmrc | 2 +- common/gtk-3.0/3.14/gtk-contained-dark.css | 352 +- common/gtk-3.0/3.14/gtk-contained-darker.css | 326 +- .../gtk-3.0/3.14/gtk-contained-solid-dark.css | 356 +- .../3.14/gtk-contained-solid-darker.css | 330 +- common/gtk-3.0/3.14/gtk-contained-solid.css | 330 +- common/gtk-3.0/3.14/gtk-contained.css | 326 +- common/gtk-3.0/3.14/sass/_colors.scss | 32 +- common/gtk-3.0/3.14/sass/_common.scss | 28 +- common/gtk-3.0/3.14/sass/_drawing.scss | 33 +- common/gtk-3.0/3.14/sass/_lightdm.scss | 63 +- .../3.14/sass/_transparent_widgets.scss | 2 +- common/gtk-3.0/3.16/.nvmrc | 2 +- common/gtk-3.0/3.16/gtk-contained-dark.css | 356 +- common/gtk-3.0/3.16/gtk-contained-darker.css | 330 +- .../gtk-3.0/3.16/gtk-contained-solid-dark.css | 360 +- .../3.16/gtk-contained-solid-darker.css | 334 +- common/gtk-3.0/3.16/gtk-contained-solid.css | 334 +- common/gtk-3.0/3.16/gtk-contained.css | 330 +- common/gtk-3.0/3.16/sass/_colors.scss | 32 +- common/gtk-3.0/3.16/sass/_common.scss | 20 +- common/gtk-3.0/3.16/sass/_drawing.scss | 33 +- common/gtk-3.0/3.16/sass/_lightdm.scss | 63 +- .../3.16/sass/_transparent_widgets.scss | 2 +- 234 files changed, 19741 insertions(+), 9497 deletions(-) create mode 100644 common/gnome-shell/3.14/.nvmrc create mode 100644 common/gnome-shell/3.14/README rename common/gnome-shell/3.14/{ => common-assets}/dash/button-active-bottom.svg (95%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-active-right.svg (95%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-active-top.svg (96%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-active.svg (94%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-hover-bottom.svg (96%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-hover-right.svg (95%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-hover-top.svg (96%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-hover.svg (95%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-running-active-bottom.svg (100%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-running-active-right.svg (100%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-running-active-top.svg (100%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-running-active.svg (100%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-running-bottom.svg (100%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-running-hover-bottom.svg (100%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-running-hover-right.svg (100%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-running-hover-top.svg (100%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-running-hover.svg (100%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-running-right.svg (100%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-running-top.svg (100%) rename common/gnome-shell/3.14/{ => common-assets}/dash/button-running.svg (100%) create mode 100644 common/gnome-shell/3.14/common-assets/dash/dash-bottom.svg create mode 100644 common/gnome-shell/3.14/common-assets/dash/dash-extended-bottom.svg create mode 100644 common/gnome-shell/3.14/common-assets/dash/dash-extended-left.svg create mode 100644 common/gnome-shell/3.14/common-assets/dash/dash-extended-right.svg create mode 100644 common/gnome-shell/3.14/common-assets/dash/dash-extended-top.svg create mode 100644 common/gnome-shell/3.14/common-assets/dash/dash-left.svg rename common/gnome-shell/3.14/{ => common-assets}/dash/dash-placeholder.svg (100%) mode change 100755 => 100644 create mode 100644 common/gnome-shell/3.14/common-assets/dash/dash-right.svg create mode 100644 common/gnome-shell/3.14/common-assets/dash/dash-top.svg create mode 100644 common/gnome-shell/3.14/common-assets/dash/running1.svg create mode 100644 common/gnome-shell/3.14/common-assets/dash/running2.svg create mode 100644 common/gnome-shell/3.14/common-assets/dash/running3.svg create mode 100644 common/gnome-shell/3.14/common-assets/dash/running4.svg rename common/gnome-shell/3.14/{ => common-assets}/menu/menu-separator.svg (100%) create mode 100644 common/gnome-shell/3.14/common-assets/misc/bg.svg create mode 100644 common/gnome-shell/3.14/common-assets/misc/button-box.svg rename common/gnome-shell/3.14/{ => common-assets}/misc/close-active.svg (83%) rename common/gnome-shell/{3.16 => 3.14/common-assets}/misc/close-hover.svg (83%) rename common/gnome-shell/3.14/{ => common-assets}/misc/close.svg (84%) rename common/gnome-shell/{3.16 => 3.14/common-assets}/misc/corner-ripple-ltr.svg (98%) rename common/gnome-shell/{3.16 => 3.14/common-assets}/misc/corner-ripple-rtl.svg (98%) rename common/gnome-shell/{3.16 => 3.14/common-assets}/misc/more-results.svg (92%) mode change 100755 => 100644 create mode 100644 common/gnome-shell/3.14/common-assets/misc/notification.svg rename common/gnome-shell/3.14/{ => common-assets}/misc/null.svg (100%) create mode 100644 common/gnome-shell/3.14/common-assets/misc/osd.svg rename common/gnome-shell/3.14/{ => common-assets}/misc/page-indicator-active.svg (100%) mode change 100755 => 100644 rename common/gnome-shell/{3.16 => 3.14/common-assets}/misc/page-indicator-checked.svg (98%) mode change 100755 => 100644 rename common/gnome-shell/{3.16 => 3.14/common-assets}/misc/page-indicator-hover.svg (98%) mode change 100755 => 100644 rename common/gnome-shell/{3.16 => 3.14/common-assets}/misc/page-indicator-inactive.svg (98%) mode change 100755 => 100644 create mode 100644 common/gnome-shell/3.14/common-assets/misc/process-working.svg rename common/gnome-shell/3.14/{ => common-assets}/misc/summary-counter.svg (100%) rename common/gnome-shell/3.14/{ => common-assets}/misc/ws-switch-arrow-down.png (100%) rename common/gnome-shell/3.14/{ => common-assets}/misc/ws-switch-arrow-up.png (100%) create mode 100644 common/gnome-shell/3.14/common-assets/panel/activities-active.svg rename common/gnome-shell/{3.16/misc => 3.14/common-assets/panel}/activities.svg (79%) create mode 100644 common/gnome-shell/3.14/common-assets/panel/panel-overview.svg create mode 100644 common/gnome-shell/3.14/common-assets/panel/panel.svg create mode 100644 common/gnome-shell/3.14/dark-assets/checkbox/checkbox-checked-focused.svg create mode 100644 common/gnome-shell/3.14/dark-assets/checkbox/checkbox-checked.svg create mode 100644 common/gnome-shell/3.14/dark-assets/checkbox/checkbox-unchecked-focused.svg create mode 100644 common/gnome-shell/3.14/dark-assets/checkbox/checkbox-unchecked.svg create mode 100644 common/gnome-shell/3.14/dark-assets/menu/menu-hover.svg create mode 100644 common/gnome-shell/3.14/dark-assets/menu/menu.svg create mode 100644 common/gnome-shell/3.14/dark-assets/menu/submenu-open.svg create mode 100644 common/gnome-shell/3.14/dark-assets/menu/submenu.svg rename common/gnome-shell/3.14/{ => dark-assets}/misc/calendar-arrow-left-hover.svg (100%) rename common/gnome-shell/3.14/{ => dark-assets}/misc/calendar-arrow-left.svg (100%) rename common/gnome-shell/3.14/{ => dark-assets}/misc/calendar-arrow-right-hover.svg (100%) rename common/gnome-shell/3.14/{ => dark-assets}/misc/calendar-arrow-right.svg (100%) create mode 100644 common/gnome-shell/3.14/dark-assets/misc/message-active.svg create mode 100644 common/gnome-shell/3.14/dark-assets/misc/message-close-active.svg create mode 100644 common/gnome-shell/3.14/dark-assets/misc/message-close-hover.svg create mode 100644 common/gnome-shell/3.14/dark-assets/misc/message-close.svg create mode 100644 common/gnome-shell/3.14/dark-assets/misc/message-hover.svg create mode 100644 common/gnome-shell/3.14/dark-assets/misc/message.svg create mode 100644 common/gnome-shell/3.14/dark-assets/misc/modal.svg create mode 100644 common/gnome-shell/3.14/dark-assets/switch/switch-off.svg create mode 100644 common/gnome-shell/3.14/dark-assets/switch/switch-on.svg create mode 100644 common/gnome-shell/3.14/gulpfile.js rename common/gnome-shell/3.14/{ => light-assets}/checkbox/checkbox-checked-focused.svg (100%) rename common/gnome-shell/3.14/{ => light-assets}/checkbox/checkbox-checked.svg (100%) rename common/gnome-shell/3.14/{ => light-assets}/checkbox/checkbox-unchecked-focused.svg (100%) rename common/gnome-shell/3.14/{ => light-assets}/checkbox/checkbox-unchecked.svg (100%) rename common/gnome-shell/{3.16 => 3.14/light-assets}/menu/menu-hover.svg (93%) create mode 100644 common/gnome-shell/3.14/light-assets/menu/menu.svg rename common/gnome-shell/{3.16 => 3.14/light-assets}/menu/submenu-open.svg (85%) rename common/gnome-shell/3.14/{ => light-assets}/menu/submenu.svg (86%) rename common/gnome-shell/{3.16 => 3.14/light-assets}/misc/calendar-arrow-left-hover.svg (100%) rename common/gnome-shell/{3.16 => 3.14/light-assets}/misc/calendar-arrow-left.svg (100%) rename common/gnome-shell/{3.16 => 3.14/light-assets}/misc/calendar-arrow-right-hover.svg (100%) rename common/gnome-shell/{3.16 => 3.14/light-assets}/misc/calendar-arrow-right.svg (100%) create mode 100644 common/gnome-shell/3.14/light-assets/misc/message-active.svg create mode 100644 common/gnome-shell/3.14/light-assets/misc/message-close-active.svg create mode 100644 common/gnome-shell/3.14/light-assets/misc/message-close-hover.svg create mode 100644 common/gnome-shell/3.14/light-assets/misc/message-close.svg create mode 100644 common/gnome-shell/3.14/light-assets/misc/message-hover.svg create mode 100644 common/gnome-shell/3.14/light-assets/misc/message.svg create mode 100644 common/gnome-shell/3.14/light-assets/misc/modal.svg rename common/gnome-shell/{3.16 => 3.14/light-assets}/switch/switch-off.svg (97%) rename common/gnome-shell/3.14/{ => light-assets}/switch/switch-on.svg (96%) delete mode 100644 common/gnome-shell/3.14/menu/menu-arrow-symbolic.svg delete mode 100644 common/gnome-shell/3.14/menu/menu.svg delete mode 100644 common/gnome-shell/3.14/misc/bg.svg delete mode 100755 common/gnome-shell/3.14/misc/logged-in-indicator.svg delete mode 100644 common/gnome-shell/3.14/misc/modal.svg delete mode 100755 common/gnome-shell/3.14/misc/noise-texture.png delete mode 100644 common/gnome-shell/3.14/misc/osd.svg delete mode 100644 common/gnome-shell/3.14/misc/panel-button-highlight.svg delete mode 100755 common/gnome-shell/3.14/misc/process-working.svg delete mode 100644 common/gnome-shell/3.14/misc/running-indicator.svg create mode 100644 common/gnome-shell/3.14/package.json create mode 100644 common/gnome-shell/3.14/sass/_colors.scss create mode 100644 common/gnome-shell/3.14/sass/_common.scss create mode 100644 common/gnome-shell/3.14/sass/_drawing.scss create mode 100644 common/gnome-shell/3.14/sass/gnome-shell.scss create mode 100644 common/gnome-shell/3.16/common-assets/dash/dash-bottom.svg create mode 100644 common/gnome-shell/3.16/common-assets/dash/dash-extended-bottom.svg create mode 100644 common/gnome-shell/3.16/common-assets/dash/dash-extended-left.svg create mode 100644 common/gnome-shell/3.16/common-assets/dash/dash-extended-right.svg create mode 100644 common/gnome-shell/3.16/common-assets/dash/dash-extended-top.svg create mode 100644 common/gnome-shell/3.16/common-assets/dash/dash-left.svg rename common/gnome-shell/3.16/{ => common-assets}/dash/dash-placeholder.svg (100%) create mode 100644 common/gnome-shell/3.16/common-assets/dash/dash-right.svg create mode 100644 common/gnome-shell/3.16/common-assets/dash/dash-top.svg create mode 100644 common/gnome-shell/3.16/common-assets/dash/running1.svg create mode 100644 common/gnome-shell/3.16/common-assets/dash/running2.svg create mode 100644 common/gnome-shell/3.16/common-assets/dash/running3.svg create mode 100644 common/gnome-shell/3.16/common-assets/dash/running4.svg rename common/gnome-shell/3.16/{ => common-assets}/menu/menu-separator.svg (100%) create mode 100644 common/gnome-shell/3.16/common-assets/misc/bg.svg create mode 100644 common/gnome-shell/3.16/common-assets/misc/button-box.svg rename common/gnome-shell/3.16/{ => common-assets}/misc/close-active.svg (83%) rename common/gnome-shell/{3.14 => 3.16/common-assets}/misc/close-hover.svg (83%) rename common/gnome-shell/3.16/{ => common-assets}/misc/close.svg (84%) rename common/gnome-shell/{3.14 => 3.16/common-assets}/misc/corner-ripple-ltr.svg (98%) rename common/gnome-shell/{3.14 => 3.16/common-assets}/misc/corner-ripple-rtl.svg (98%) rename common/gnome-shell/{3.14 => 3.16/common-assets}/misc/more-results.svg (92%) create mode 100644 common/gnome-shell/3.16/common-assets/misc/osd.svg rename common/gnome-shell/3.16/{ => common-assets}/misc/page-indicator-active.svg (100%) rename common/gnome-shell/{3.14 => 3.16/common-assets}/misc/page-indicator-checked.svg (98%) rename common/gnome-shell/{3.14 => 3.16/common-assets}/misc/page-indicator-hover.svg (98%) rename common/gnome-shell/{3.14 => 3.16/common-assets}/misc/page-indicator-inactive.svg (98%) create mode 100755 common/gnome-shell/3.16/common-assets/misc/process-working.svg rename common/gnome-shell/3.16/{ => common-assets}/misc/ws-switch-arrow-down.png (100%) rename common/gnome-shell/3.16/{ => common-assets}/misc/ws-switch-arrow-up.png (100%) create mode 100644 common/gnome-shell/3.16/common-assets/panel/activities-active.svg rename common/gnome-shell/{3.14/misc => 3.16/common-assets/panel}/activities.svg (79%) create mode 100644 common/gnome-shell/3.16/common-assets/panel/panel-overview.svg create mode 100644 common/gnome-shell/3.16/common-assets/panel/panel.svg create mode 100644 common/gnome-shell/3.16/dark-assets/checkbox/checkbox-checked-focused.svg create mode 100644 common/gnome-shell/3.16/dark-assets/checkbox/checkbox-checked.svg create mode 100644 common/gnome-shell/3.16/dark-assets/checkbox/checkbox-unchecked-focused.svg create mode 100644 common/gnome-shell/3.16/dark-assets/checkbox/checkbox-unchecked.svg create mode 100644 common/gnome-shell/3.16/dark-assets/menu/menu-hover.svg create mode 100644 common/gnome-shell/3.16/dark-assets/menu/menu.svg create mode 100644 common/gnome-shell/3.16/dark-assets/menu/submenu-open.svg create mode 100644 common/gnome-shell/3.16/dark-assets/menu/submenu.svg create mode 100644 common/gnome-shell/3.16/dark-assets/misc/calendar-arrow-left-hover.svg create mode 100644 common/gnome-shell/3.16/dark-assets/misc/calendar-arrow-left.svg create mode 100644 common/gnome-shell/3.16/dark-assets/misc/calendar-arrow-right-hover.svg create mode 100644 common/gnome-shell/3.16/dark-assets/misc/calendar-arrow-right.svg create mode 100644 common/gnome-shell/3.16/dark-assets/misc/message-active.svg create mode 100644 common/gnome-shell/3.16/dark-assets/misc/message-close-active.svg create mode 100644 common/gnome-shell/3.16/dark-assets/misc/message-close-hover.svg create mode 100644 common/gnome-shell/3.16/dark-assets/misc/message-close.svg create mode 100644 common/gnome-shell/3.16/dark-assets/misc/message-hover.svg create mode 100644 common/gnome-shell/3.16/dark-assets/misc/message.svg create mode 100644 common/gnome-shell/3.16/dark-assets/misc/modal.svg create mode 100644 common/gnome-shell/3.16/dark-assets/switch/switch-off.svg create mode 100644 common/gnome-shell/3.16/dark-assets/switch/switch-on.svg rename common/gnome-shell/3.16/{ => light-assets}/checkbox/checkbox-checked-focused.svg (100%) rename common/gnome-shell/3.16/{ => light-assets}/checkbox/checkbox-checked.svg (100%) rename common/gnome-shell/3.16/{ => light-assets}/checkbox/checkbox-unchecked-focused.svg (100%) rename common/gnome-shell/3.16/{ => light-assets}/checkbox/checkbox-unchecked.svg (100%) rename common/gnome-shell/{3.14 => 3.16/light-assets}/menu/menu-hover.svg (93%) create mode 100644 common/gnome-shell/3.16/light-assets/menu/menu.svg rename common/gnome-shell/{3.14 => 3.16/light-assets}/menu/submenu-open.svg (85%) rename common/gnome-shell/3.16/{ => light-assets}/menu/submenu.svg (86%) create mode 100644 common/gnome-shell/3.16/light-assets/misc/calendar-arrow-left-hover.svg create mode 100644 common/gnome-shell/3.16/light-assets/misc/calendar-arrow-left.svg create mode 100644 common/gnome-shell/3.16/light-assets/misc/calendar-arrow-right-hover.svg create mode 100644 common/gnome-shell/3.16/light-assets/misc/calendar-arrow-right.svg create mode 100644 common/gnome-shell/3.16/light-assets/misc/message-active.svg create mode 100644 common/gnome-shell/3.16/light-assets/misc/message-close-active.svg create mode 100644 common/gnome-shell/3.16/light-assets/misc/message-close-hover.svg create mode 100644 common/gnome-shell/3.16/light-assets/misc/message-close.svg create mode 100644 common/gnome-shell/3.16/light-assets/misc/message-hover.svg create mode 100644 common/gnome-shell/3.16/light-assets/misc/message.svg create mode 100644 common/gnome-shell/3.16/light-assets/misc/modal.svg rename common/gnome-shell/{3.14 => 3.16/light-assets}/switch/switch-off.svg (97%) rename common/gnome-shell/3.16/{ => light-assets}/switch/switch-on.svg (96%) delete mode 100644 common/gnome-shell/3.16/menu/menu-arrow-symbolic.svg delete mode 100644 common/gnome-shell/3.16/menu/menu.svg delete mode 100644 common/gnome-shell/3.16/misc/bg.svg delete mode 100755 common/gnome-shell/3.16/misc/logged-in-indicator.svg delete mode 100644 common/gnome-shell/3.16/misc/modal.svg delete mode 100755 common/gnome-shell/3.16/misc/noise-texture.png delete mode 100644 common/gnome-shell/3.16/misc/osd.svg delete mode 100755 common/gnome-shell/3.16/misc/process-working.svg diff --git a/common/gnome-shell/3.14/.nvmrc b/common/gnome-shell/3.14/.nvmrc new file mode 100644 index 0000000..2bf5ad0 --- /dev/null +++ b/common/gnome-shell/3.14/.nvmrc @@ -0,0 +1 @@ +stable diff --git a/common/gnome-shell/3.14/README b/common/gnome-shell/3.14/README new file mode 100644 index 0000000..f040030 --- /dev/null +++ b/common/gnome-shell/3.14/README @@ -0,0 +1,19 @@ +This theme uses libsass/gulp to process the sass/*.scss. Never edit any of the .css files manually. + +How to edit this theme: + +1. Install `nodejs` and `npm` + +2. Install `gulp` + + sudo npm install --global gulp + +3. Execute the following from the directory containing `gulpfile.js` + + npm install + +4. Edit the sass/*.scss files + +5. Regenerate the .css files by executing from the directory containing `gulpfile.js` + + gulp diff --git a/common/gnome-shell/3.14/dash/button-active-bottom.svg b/common/gnome-shell/3.14/common-assets/dash/button-active-bottom.svg similarity index 95% rename from common/gnome-shell/3.14/dash/button-active-bottom.svg rename to common/gnome-shell/3.14/common-assets/dash/button-active-bottom.svg index 7f1eb9a..04b11ec 100644 --- a/common/gnome-shell/3.14/dash/button-active-bottom.svg +++ b/common/gnome-shell/3.14/common-assets/dash/button-active-bottom.svg @@ -37,13 +37,13 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="716" + inkscape:window-width="1324" + inkscape:window-height="604" id="namedview4173" showgrid="true" inkscape:zoom="23.008712" - inkscape:cx="1.8476908" - inkscape:cy="6.3204436" + inkscape:cx="7.4203783" + inkscape:cy="11.448936" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -125,8 +125,8 @@ height="8.6348953" x="11.000002" y="162.13155" - ry="1.8503314" - rx="1.8503358" /> + ry="1.2335529" + rx="1.2335573" /> diff --git a/common/gnome-shell/3.14/dash/button-active-right.svg b/common/gnome-shell/3.14/common-assets/dash/button-active-right.svg similarity index 95% rename from common/gnome-shell/3.14/dash/button-active-right.svg rename to common/gnome-shell/3.14/common-assets/dash/button-active-right.svg index 37e65fc..d47baa0 100644 --- a/common/gnome-shell/3.14/dash/button-active-right.svg +++ b/common/gnome-shell/3.14/common-assets/dash/button-active-right.svg @@ -37,13 +37,13 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="716" + inkscape:window-width="1324" + inkscape:window-height="604" id="namedview4173" showgrid="true" inkscape:zoom="23.008712" - inkscape:cx="12.278522" - inkscape:cy="6.3204436" + inkscape:cx="5.6288669" + inkscape:cy="11.448936" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -125,7 +125,7 @@ height="9.8684559" x="11.000002" y="162.13155" - ry="1.8503314" /> + ry="1.2335529" /> diff --git a/common/gnome-shell/3.14/dash/button-active-top.svg b/common/gnome-shell/3.14/common-assets/dash/button-active-top.svg similarity index 96% rename from common/gnome-shell/3.14/dash/button-active-top.svg rename to common/gnome-shell/3.14/common-assets/dash/button-active-top.svg index 7a5ec02..6ca3bad 100644 --- a/common/gnome-shell/3.14/dash/button-active-top.svg +++ b/common/gnome-shell/3.14/common-assets/dash/button-active-top.svg @@ -37,13 +37,13 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="716" + inkscape:window-width="1324" + inkscape:window-height="604" id="namedview4173" showgrid="true" inkscape:zoom="23.008712" - inkscape:cx="8.8015785" - inkscape:cy="6.3204436" + inkscape:cx="2.1519234" + inkscape:cy="6.23352" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -125,7 +125,7 @@ height="9.8684559" x="163.3651" y="-20.868458" - ry="1.8503314" + ry="1.2335573" transform="matrix(0,1,-1,0,0,0)" /> diff --git a/common/gnome-shell/3.14/dash/button-active.svg b/common/gnome-shell/3.14/common-assets/dash/button-active.svg similarity index 94% rename from common/gnome-shell/3.14/dash/button-active.svg rename to common/gnome-shell/3.14/common-assets/dash/button-active.svg index f8308ce..a979d1d 100644 --- a/common/gnome-shell/3.14/dash/button-active.svg +++ b/common/gnome-shell/3.14/common-assets/dash/button-active.svg @@ -24,7 +24,7 @@ image/svg+xml - + @@ -37,13 +37,13 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="716" + inkscape:window-width="1324" + inkscape:window-height="604" id="namedview4173" showgrid="true" - inkscape:zoom="23.008712" - inkscape:cx="1.5434582" - inkscape:cy="6.4073672" + inkscape:zoom="32.539233" + inkscape:cx="4.868656" + inkscape:cy="11.433325" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -125,7 +125,7 @@ height="9.8684559" x="12.233559" y="162.13155" - ry="1.8503314" /> + ry="1.2335529" /> diff --git a/common/gnome-shell/3.14/dash/button-hover-bottom.svg b/common/gnome-shell/3.14/common-assets/dash/button-hover-bottom.svg similarity index 96% rename from common/gnome-shell/3.14/dash/button-hover-bottom.svg rename to common/gnome-shell/3.14/common-assets/dash/button-hover-bottom.svg index ebcb5e5..e37be0c 100644 --- a/common/gnome-shell/3.14/dash/button-hover-bottom.svg +++ b/common/gnome-shell/3.14/common-assets/dash/button-hover-bottom.svg @@ -37,13 +37,13 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="716" + inkscape:window-width="1324" + inkscape:window-height="604" id="namedview4173" showgrid="true" inkscape:zoom="23.008712" - inkscape:cx="1.8476908" - inkscape:cy="6.3204436" + inkscape:cx="6.9397244" + inkscape:cy="7.9719919" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -125,7 +125,7 @@ height="9.8684559" x="162.13155" y="-20.868458" - ry="1.8503314" + ry="1.2335573" transform="matrix(0,1,-1,0,0,0)" /> diff --git a/common/gnome-shell/3.14/dash/button-hover-right.svg b/common/gnome-shell/3.14/common-assets/dash/button-hover-right.svg similarity index 95% rename from common/gnome-shell/3.14/dash/button-hover-right.svg rename to common/gnome-shell/3.14/common-assets/dash/button-hover-right.svg index a7965ca..63a16c3 100644 --- a/common/gnome-shell/3.14/dash/button-hover-right.svg +++ b/common/gnome-shell/3.14/common-assets/dash/button-hover-right.svg @@ -37,13 +37,13 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="716" + inkscape:window-width="1324" + inkscape:window-height="604" id="namedview4173" showgrid="true" inkscape:zoom="23.008712" - inkscape:cx="8.8015785" - inkscape:cy="6.3204436" + inkscape:cx="2.1519234" + inkscape:cy="6.23352" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -125,7 +125,7 @@ height="9.8684559" x="11.000002" y="162.13155" - ry="1.8503314" /> + ry="1.2335529" /> diff --git a/common/gnome-shell/3.14/dash/button-hover-top.svg b/common/gnome-shell/3.14/common-assets/dash/button-hover-top.svg similarity index 96% rename from common/gnome-shell/3.14/dash/button-hover-top.svg rename to common/gnome-shell/3.14/common-assets/dash/button-hover-top.svg index f1f23e6..a9d012c 100644 --- a/common/gnome-shell/3.14/dash/button-hover-top.svg +++ b/common/gnome-shell/3.14/common-assets/dash/button-hover-top.svg @@ -37,13 +37,13 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="716" + inkscape:window-width="1324" + inkscape:window-height="604" id="namedview4173" showgrid="true" inkscape:zoom="23.008712" - inkscape:cx="5.3246347" - inkscape:cy="6.3204436" + inkscape:cx="-1.3250204" + inkscape:cy="6.23352" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -125,7 +125,7 @@ height="9.8684559" x="163.3651" y="-20.868458" - ry="1.8503314" + ry="1.2335573" transform="matrix(0,1,-1,0,0,0)" /> diff --git a/common/gnome-shell/3.14/dash/button-hover.svg b/common/gnome-shell/3.14/common-assets/dash/button-hover.svg similarity index 95% rename from common/gnome-shell/3.14/dash/button-hover.svg rename to common/gnome-shell/3.14/common-assets/dash/button-hover.svg index 15d0596..45d457a 100644 --- a/common/gnome-shell/3.14/dash/button-hover.svg +++ b/common/gnome-shell/3.14/common-assets/dash/button-hover.svg @@ -37,13 +37,13 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="716" + inkscape:window-width="1324" + inkscape:window-height="604" id="namedview4173" showgrid="true" inkscape:zoom="23.008712" - inkscape:cx="1.5434582" - inkscape:cy="6.4073672" + inkscape:cx="8.7585229" + inkscape:cy="6.3204436" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -125,7 +125,7 @@ height="9.8684559" x="12.233559" y="162.13155" - ry="1.8503314" /> + ry="1.2335529" /> diff --git a/common/gnome-shell/3.14/dash/button-running-active-bottom.svg b/common/gnome-shell/3.14/common-assets/dash/button-running-active-bottom.svg similarity index 100% rename from common/gnome-shell/3.14/dash/button-running-active-bottom.svg rename to common/gnome-shell/3.14/common-assets/dash/button-running-active-bottom.svg diff --git a/common/gnome-shell/3.14/dash/button-running-active-right.svg b/common/gnome-shell/3.14/common-assets/dash/button-running-active-right.svg similarity index 100% rename from common/gnome-shell/3.14/dash/button-running-active-right.svg rename to common/gnome-shell/3.14/common-assets/dash/button-running-active-right.svg diff --git a/common/gnome-shell/3.14/dash/button-running-active-top.svg b/common/gnome-shell/3.14/common-assets/dash/button-running-active-top.svg similarity index 100% rename from common/gnome-shell/3.14/dash/button-running-active-top.svg rename to common/gnome-shell/3.14/common-assets/dash/button-running-active-top.svg diff --git a/common/gnome-shell/3.14/dash/button-running-active.svg b/common/gnome-shell/3.14/common-assets/dash/button-running-active.svg similarity index 100% rename from common/gnome-shell/3.14/dash/button-running-active.svg rename to common/gnome-shell/3.14/common-assets/dash/button-running-active.svg diff --git a/common/gnome-shell/3.14/dash/button-running-bottom.svg b/common/gnome-shell/3.14/common-assets/dash/button-running-bottom.svg similarity index 100% rename from common/gnome-shell/3.14/dash/button-running-bottom.svg rename to common/gnome-shell/3.14/common-assets/dash/button-running-bottom.svg diff --git a/common/gnome-shell/3.14/dash/button-running-hover-bottom.svg b/common/gnome-shell/3.14/common-assets/dash/button-running-hover-bottom.svg similarity index 100% rename from common/gnome-shell/3.14/dash/button-running-hover-bottom.svg rename to common/gnome-shell/3.14/common-assets/dash/button-running-hover-bottom.svg diff --git a/common/gnome-shell/3.14/dash/button-running-hover-right.svg b/common/gnome-shell/3.14/common-assets/dash/button-running-hover-right.svg similarity index 100% rename from common/gnome-shell/3.14/dash/button-running-hover-right.svg rename to common/gnome-shell/3.14/common-assets/dash/button-running-hover-right.svg diff --git a/common/gnome-shell/3.14/dash/button-running-hover-top.svg b/common/gnome-shell/3.14/common-assets/dash/button-running-hover-top.svg similarity index 100% rename from common/gnome-shell/3.14/dash/button-running-hover-top.svg rename to common/gnome-shell/3.14/common-assets/dash/button-running-hover-top.svg diff --git a/common/gnome-shell/3.14/dash/button-running-hover.svg b/common/gnome-shell/3.14/common-assets/dash/button-running-hover.svg similarity index 100% rename from common/gnome-shell/3.14/dash/button-running-hover.svg rename to common/gnome-shell/3.14/common-assets/dash/button-running-hover.svg diff --git a/common/gnome-shell/3.14/dash/button-running-right.svg b/common/gnome-shell/3.14/common-assets/dash/button-running-right.svg similarity index 100% rename from common/gnome-shell/3.14/dash/button-running-right.svg rename to common/gnome-shell/3.14/common-assets/dash/button-running-right.svg diff --git a/common/gnome-shell/3.14/dash/button-running-top.svg b/common/gnome-shell/3.14/common-assets/dash/button-running-top.svg similarity index 100% rename from common/gnome-shell/3.14/dash/button-running-top.svg rename to common/gnome-shell/3.14/common-assets/dash/button-running-top.svg diff --git a/common/gnome-shell/3.14/dash/button-running.svg b/common/gnome-shell/3.14/common-assets/dash/button-running.svg similarity index 100% rename from common/gnome-shell/3.14/dash/button-running.svg rename to common/gnome-shell/3.14/common-assets/dash/button-running.svg diff --git a/common/gnome-shell/3.14/common-assets/dash/dash-bottom.svg b/common/gnome-shell/3.14/common-assets/dash/dash-bottom.svg new file mode 100644 index 0000000..b9e8761 --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/dash/dash-bottom.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/common-assets/dash/dash-extended-bottom.svg b/common/gnome-shell/3.14/common-assets/dash/dash-extended-bottom.svg new file mode 100644 index 0000000..2d7ca3b --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/dash/dash-extended-bottom.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.14/common-assets/dash/dash-extended-left.svg b/common/gnome-shell/3.14/common-assets/dash/dash-extended-left.svg new file mode 100644 index 0000000..e80ed3f --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/dash/dash-extended-left.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.14/common-assets/dash/dash-extended-right.svg b/common/gnome-shell/3.14/common-assets/dash/dash-extended-right.svg new file mode 100644 index 0000000..5c68f7f --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/dash/dash-extended-right.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.14/common-assets/dash/dash-extended-top.svg b/common/gnome-shell/3.14/common-assets/dash/dash-extended-top.svg new file mode 100644 index 0000000..b56904e --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/dash/dash-extended-top.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.14/common-assets/dash/dash-left.svg b/common/gnome-shell/3.14/common-assets/dash/dash-left.svg new file mode 100644 index 0000000..12d3b6b --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/dash/dash-left.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.14/dash/dash-placeholder.svg b/common/gnome-shell/3.14/common-assets/dash/dash-placeholder.svg old mode 100755 new mode 100644 similarity index 100% rename from common/gnome-shell/3.14/dash/dash-placeholder.svg rename to common/gnome-shell/3.14/common-assets/dash/dash-placeholder.svg diff --git a/common/gnome-shell/3.14/common-assets/dash/dash-right.svg b/common/gnome-shell/3.14/common-assets/dash/dash-right.svg new file mode 100644 index 0000000..e7f7551 --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/dash/dash-right.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.14/common-assets/dash/dash-top.svg b/common/gnome-shell/3.14/common-assets/dash/dash-top.svg new file mode 100644 index 0000000..1d05a3c --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/dash/dash-top.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/common-assets/dash/running1.svg b/common/gnome-shell/3.14/common-assets/dash/running1.svg new file mode 100644 index 0000000..322dc8d --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/dash/running1.svg @@ -0,0 +1,142 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/common/gnome-shell/3.14/common-assets/dash/running2.svg b/common/gnome-shell/3.14/common-assets/dash/running2.svg new file mode 100644 index 0000000..731f8e0 --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/dash/running2.svg @@ -0,0 +1,149 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/common/gnome-shell/3.14/common-assets/dash/running3.svg b/common/gnome-shell/3.14/common-assets/dash/running3.svg new file mode 100644 index 0000000..ca85562 --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/dash/running3.svg @@ -0,0 +1,156 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.14/common-assets/dash/running4.svg b/common/gnome-shell/3.14/common-assets/dash/running4.svg new file mode 100644 index 0000000..7393122 --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/dash/running4.svg @@ -0,0 +1,163 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/menu/menu-separator.svg b/common/gnome-shell/3.14/common-assets/menu/menu-separator.svg similarity index 100% rename from common/gnome-shell/3.14/menu/menu-separator.svg rename to common/gnome-shell/3.14/common-assets/menu/menu-separator.svg diff --git a/common/gnome-shell/3.14/common-assets/misc/bg.svg b/common/gnome-shell/3.14/common-assets/misc/bg.svg new file mode 100644 index 0000000..cf27958 --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/misc/bg.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/common-assets/misc/button-box.svg b/common/gnome-shell/3.14/common-assets/misc/button-box.svg new file mode 100644 index 0000000..7435084 --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/misc/button-box.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.14/misc/close-active.svg b/common/gnome-shell/3.14/common-assets/misc/close-active.svg similarity index 83% rename from common/gnome-shell/3.14/misc/close-active.svg rename to common/gnome-shell/3.14/common-assets/misc/close-active.svg index a541886..95822bf 100644 --- a/common/gnome-shell/3.14/misc/close-active.svg +++ b/common/gnome-shell/3.14/common-assets/misc/close-active.svg @@ -20,32 +20,12 @@ xml:space="preserve" sodipodi:version="0.32" inkscape:version="0.91 r13725" - sodipodi:docname="message-list-close-active.svg" + sodipodi:docname="close-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape">image/svg+xmlimage/svg+xmlimage/svg+xml diff --git a/common/gnome-shell/3.16/misc/corner-ripple-rtl.svg b/common/gnome-shell/3.14/common-assets/misc/corner-ripple-rtl.svg similarity index 98% rename from common/gnome-shell/3.16/misc/corner-ripple-rtl.svg rename to common/gnome-shell/3.14/common-assets/misc/corner-ripple-rtl.svg index 408edb3..57176d2 100644 --- a/common/gnome-shell/3.16/misc/corner-ripple-rtl.svg +++ b/common/gnome-shell/3.14/common-assets/misc/corner-ripple-rtl.svg @@ -14,7 +14,7 @@ width="52" height="52" id="svg2" - inkscape:version="0.48.5 r10040" + inkscape:version="0.91 r13725" sodipodi:docname="corner-ripple-rtl.svg"> - - - - - + id="defs12432" /> + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/misc/null.svg b/common/gnome-shell/3.14/common-assets/misc/null.svg similarity index 100% rename from common/gnome-shell/3.14/misc/null.svg rename to common/gnome-shell/3.14/common-assets/misc/null.svg diff --git a/common/gnome-shell/3.14/common-assets/misc/osd.svg b/common/gnome-shell/3.14/common-assets/misc/osd.svg new file mode 100644 index 0000000..e7a4202 --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/misc/osd.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/misc/page-indicator-active.svg b/common/gnome-shell/3.14/common-assets/misc/page-indicator-active.svg old mode 100755 new mode 100644 similarity index 100% rename from common/gnome-shell/3.14/misc/page-indicator-active.svg rename to common/gnome-shell/3.14/common-assets/misc/page-indicator-active.svg diff --git a/common/gnome-shell/3.16/misc/page-indicator-checked.svg b/common/gnome-shell/3.14/common-assets/misc/page-indicator-checked.svg old mode 100755 new mode 100644 similarity index 98% rename from common/gnome-shell/3.16/misc/page-indicator-checked.svg rename to common/gnome-shell/3.14/common-assets/misc/page-indicator-checked.svg index 05984c2..249100d --- a/common/gnome-shell/3.16/misc/page-indicator-checked.svg +++ b/common/gnome-shell/3.14/common-assets/misc/page-indicator-checked.svg @@ -48,7 +48,7 @@ image/svg+xml - + diff --git a/common/gnome-shell/3.16/misc/page-indicator-hover.svg b/common/gnome-shell/3.14/common-assets/misc/page-indicator-hover.svg old mode 100755 new mode 100644 similarity index 98% rename from common/gnome-shell/3.16/misc/page-indicator-hover.svg rename to common/gnome-shell/3.14/common-assets/misc/page-indicator-hover.svg index 3aad35d..b560780 --- a/common/gnome-shell/3.16/misc/page-indicator-hover.svg +++ b/common/gnome-shell/3.14/common-assets/misc/page-indicator-hover.svg @@ -48,7 +48,7 @@ image/svg+xml - + diff --git a/common/gnome-shell/3.16/misc/page-indicator-inactive.svg b/common/gnome-shell/3.14/common-assets/misc/page-indicator-inactive.svg old mode 100755 new mode 100644 similarity index 98% rename from common/gnome-shell/3.16/misc/page-indicator-inactive.svg rename to common/gnome-shell/3.14/common-assets/misc/page-indicator-inactive.svg index a3e418b..712573b --- a/common/gnome-shell/3.16/misc/page-indicator-inactive.svg +++ b/common/gnome-shell/3.14/common-assets/misc/page-indicator-inactive.svg @@ -48,7 +48,7 @@ image/svg+xml - + diff --git a/common/gnome-shell/3.14/common-assets/misc/process-working.svg b/common/gnome-shell/3.14/common-assets/misc/process-working.svg new file mode 100644 index 0000000..33ebb09 --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/misc/process-working.svg @@ -0,0 +1,287 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/misc/summary-counter.svg b/common/gnome-shell/3.14/common-assets/misc/summary-counter.svg similarity index 100% rename from common/gnome-shell/3.14/misc/summary-counter.svg rename to common/gnome-shell/3.14/common-assets/misc/summary-counter.svg diff --git a/common/gnome-shell/3.14/misc/ws-switch-arrow-down.png b/common/gnome-shell/3.14/common-assets/misc/ws-switch-arrow-down.png similarity index 100% rename from common/gnome-shell/3.14/misc/ws-switch-arrow-down.png rename to common/gnome-shell/3.14/common-assets/misc/ws-switch-arrow-down.png diff --git a/common/gnome-shell/3.14/misc/ws-switch-arrow-up.png b/common/gnome-shell/3.14/common-assets/misc/ws-switch-arrow-up.png similarity index 100% rename from common/gnome-shell/3.14/misc/ws-switch-arrow-up.png rename to common/gnome-shell/3.14/common-assets/misc/ws-switch-arrow-up.png diff --git a/common/gnome-shell/3.14/common-assets/panel/activities-active.svg b/common/gnome-shell/3.14/common-assets/panel/activities-active.svg new file mode 100644 index 0000000..6986f5c --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/panel/activities-active.svg @@ -0,0 +1,158 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.16/misc/activities.svg b/common/gnome-shell/3.14/common-assets/panel/activities.svg similarity index 79% rename from common/gnome-shell/3.16/misc/activities.svg rename to common/gnome-shell/3.14/common-assets/panel/activities.svg index 4586285..b4a4b0d 100644 --- a/common/gnome-shell/3.16/misc/activities.svg +++ b/common/gnome-shell/3.14/common-assets/panel/activities.svg @@ -24,19 +24,19 @@ stroke="#ef2929" fill="#f57900" id="base" - pagecolor="#8c8c8c" - bordercolor="#ff5e00" + pagecolor="#bebebe" + bordercolor="#525252" borderopacity="1" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="45.254834" - inkscape:cx="18.117513" - inkscape:cy="8.8930078" + inkscape:zoom="22.627417" + inkscape:cx="11.305916" + inkscape:cy="11.635941" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" inkscape:document-units="px" - inkscape:showpageshadow="false" + inkscape:showpageshadow="true" inkscape:window-width="1600" inkscape:window-height="848" inkscape:window-x="0" @@ -133,23 +133,26 @@ inkscape:label="Base" id="layer1" transform="translate(0,-276)"> - - - + + + diff --git a/common/gnome-shell/3.14/common-assets/panel/panel-overview.svg b/common/gnome-shell/3.14/common-assets/panel/panel-overview.svg new file mode 100644 index 0000000..7e48535 --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/panel/panel-overview.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.14/common-assets/panel/panel.svg b/common/gnome-shell/3.14/common-assets/panel/panel.svg new file mode 100644 index 0000000..106ffac --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/panel/panel.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.14/dark-assets/checkbox/checkbox-checked-focused.svg b/common/gnome-shell/3.14/dark-assets/checkbox/checkbox-checked-focused.svg new file mode 100644 index 0000000..d1b59ee --- /dev/null +++ b/common/gnome-shell/3.14/dark-assets/checkbox/checkbox-checked-focused.svg @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/dark-assets/checkbox/checkbox-checked.svg b/common/gnome-shell/3.14/dark-assets/checkbox/checkbox-checked.svg new file mode 100644 index 0000000..fee35ec --- /dev/null +++ b/common/gnome-shell/3.14/dark-assets/checkbox/checkbox-checked.svg @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/dark-assets/checkbox/checkbox-unchecked-focused.svg b/common/gnome-shell/3.14/dark-assets/checkbox/checkbox-unchecked-focused.svg new file mode 100644 index 0000000..513b1ad --- /dev/null +++ b/common/gnome-shell/3.14/dark-assets/checkbox/checkbox-unchecked-focused.svg @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/dark-assets/checkbox/checkbox-unchecked.svg b/common/gnome-shell/3.14/dark-assets/checkbox/checkbox-unchecked.svg new file mode 100644 index 0000000..1a34771 --- /dev/null +++ b/common/gnome-shell/3.14/dark-assets/checkbox/checkbox-unchecked.svg @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/dark-assets/menu/menu-hover.svg b/common/gnome-shell/3.14/dark-assets/menu/menu-hover.svg new file mode 100644 index 0000000..a023a8e --- /dev/null +++ b/common/gnome-shell/3.14/dark-assets/menu/menu-hover.svg @@ -0,0 +1,97 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/dark-assets/menu/menu.svg b/common/gnome-shell/3.14/dark-assets/menu/menu.svg new file mode 100644 index 0000000..d6a9fea --- /dev/null +++ b/common/gnome-shell/3.14/dark-assets/menu/menu.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/dark-assets/menu/submenu-open.svg b/common/gnome-shell/3.14/dark-assets/menu/submenu-open.svg new file mode 100644 index 0000000..bd817b0 --- /dev/null +++ b/common/gnome-shell/3.14/dark-assets/menu/submenu-open.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/dark-assets/menu/submenu.svg b/common/gnome-shell/3.14/dark-assets/menu/submenu.svg new file mode 100644 index 0000000..ebab963 --- /dev/null +++ b/common/gnome-shell/3.14/dark-assets/menu/submenu.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/misc/calendar-arrow-left-hover.svg b/common/gnome-shell/3.14/dark-assets/misc/calendar-arrow-left-hover.svg similarity index 100% rename from common/gnome-shell/3.14/misc/calendar-arrow-left-hover.svg rename to common/gnome-shell/3.14/dark-assets/misc/calendar-arrow-left-hover.svg diff --git a/common/gnome-shell/3.14/misc/calendar-arrow-left.svg b/common/gnome-shell/3.14/dark-assets/misc/calendar-arrow-left.svg similarity index 100% rename from common/gnome-shell/3.14/misc/calendar-arrow-left.svg rename to common/gnome-shell/3.14/dark-assets/misc/calendar-arrow-left.svg diff --git a/common/gnome-shell/3.14/misc/calendar-arrow-right-hover.svg b/common/gnome-shell/3.14/dark-assets/misc/calendar-arrow-right-hover.svg similarity index 100% rename from common/gnome-shell/3.14/misc/calendar-arrow-right-hover.svg rename to common/gnome-shell/3.14/dark-assets/misc/calendar-arrow-right-hover.svg diff --git a/common/gnome-shell/3.14/misc/calendar-arrow-right.svg b/common/gnome-shell/3.14/dark-assets/misc/calendar-arrow-right.svg similarity index 100% rename from common/gnome-shell/3.14/misc/calendar-arrow-right.svg rename to common/gnome-shell/3.14/dark-assets/misc/calendar-arrow-right.svg diff --git a/common/gnome-shell/3.14/dark-assets/misc/message-active.svg b/common/gnome-shell/3.14/dark-assets/misc/message-active.svg new file mode 100644 index 0000000..06860fd --- /dev/null +++ b/common/gnome-shell/3.14/dark-assets/misc/message-active.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/common/gnome-shell/3.14/dark-assets/misc/message-close-active.svg b/common/gnome-shell/3.14/dark-assets/misc/message-close-active.svg new file mode 100644 index 0000000..58fab12 --- /dev/null +++ b/common/gnome-shell/3.14/dark-assets/misc/message-close-active.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/dark-assets/misc/message-close-hover.svg b/common/gnome-shell/3.14/dark-assets/misc/message-close-hover.svg new file mode 100644 index 0000000..65aa6cc --- /dev/null +++ b/common/gnome-shell/3.14/dark-assets/misc/message-close-hover.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/dark-assets/misc/message-close.svg b/common/gnome-shell/3.14/dark-assets/misc/message-close.svg new file mode 100644 index 0000000..66a5203 --- /dev/null +++ b/common/gnome-shell/3.14/dark-assets/misc/message-close.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/dark-assets/misc/message-hover.svg b/common/gnome-shell/3.14/dark-assets/misc/message-hover.svg new file mode 100644 index 0000000..87ead75 --- /dev/null +++ b/common/gnome-shell/3.14/dark-assets/misc/message-hover.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.14/dark-assets/misc/message.svg b/common/gnome-shell/3.14/dark-assets/misc/message.svg new file mode 100644 index 0000000..2fb2d4f --- /dev/null +++ b/common/gnome-shell/3.14/dark-assets/misc/message.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.14/dark-assets/misc/modal.svg b/common/gnome-shell/3.14/dark-assets/misc/modal.svg new file mode 100644 index 0000000..4f5a61b --- /dev/null +++ b/common/gnome-shell/3.14/dark-assets/misc/modal.svg @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/dark-assets/switch/switch-off.svg b/common/gnome-shell/3.14/dark-assets/switch/switch-off.svg new file mode 100644 index 0000000..bfd52bd --- /dev/null +++ b/common/gnome-shell/3.14/dark-assets/switch/switch-off.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/dark-assets/switch/switch-on.svg b/common/gnome-shell/3.14/dark-assets/switch/switch-on.svg new file mode 100644 index 0000000..a2dd168 --- /dev/null +++ b/common/gnome-shell/3.14/dark-assets/switch/switch-on.svg @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/gnome-shell.css b/common/gnome-shell/3.14/gnome-shell.css index 34e063b..5814fdf 100644 --- a/common/gnome-shell/3.14/gnome-shell.css +++ b/common/gnome-shell/3.14/gnome-shell.css @@ -1,4 +1,4 @@ -/* Copyright 2009, Red Hat, Inc. +/* Copyright 2009, 2015 Red Hat, Inc. * * Portions adapted from Mx's data/style/default.css * Copyright 2009 Intel Corporation @@ -16,1626 +16,761 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ - -/* Text Styles */ - -/* default text style */ stage { - font-family: Cantarell, Sans-Serif; - font-size: 9pt; - color: #5c616c; -} + font-family: Futura Bk bt, Cantarell, Sans-Serif; + font-size: 9pt; + color: #5c616c; } -/* links */ -.shell-link { - color: #2679db; - text-decoration: underline; -} - -.shell-link:hover { - color: #5294e2; -} - -/* small */ .app-well-menu, -.run-dialog-error-label { - font-size: 9pt; -} - -/* small bold */ +.run-dialog-error-label, .dash-label, .window-caption, .switcher-list, .app-well-app > .overview-icon, .grid-search-result .overview-icon { - font-size: 9pt; - font-weight: bold; -} + font-size: 1em; + font-weight: normal; } -/* Scroll Bars */ - -StScrollBar { - padding: 8px; -} - -StScrollView.vfade { - -st-vfade-offset: 0px; -} - -StScrollView.hfade { - -st-hfade-offset: 0px; -} - -StScrollView StScrollBar { - min-width: 5px; - min-height: 5px; -} - -StScrollBar StBin#trough { - background-color: rgba(255, 255, 255, 0.1); - border-radius: 8px; -} - -StScrollBar StButton#vhandle { - background-color: #babcc1; - border: 0px solid; - border-radius: 8px; -} - -StScrollBar StButton#hhandle { - background-color: #babcc1; - border: 0px solid; - border-radius: 8px; - margin: 0px; -} - -StScrollBar StButton#hhandle:hover, -StScrollBar StButton#vhandle:hover { - background-color: #c9ccd0; -} - -StScrollBar StButton#hhandle:active, -StScrollBar StButton#vhandle:active { - background-color: #5294E2; -} - -/* Check Boxes */ - -.check-box StBoxLayout { - spacing: .8em; -} - -.check-box StBin { - width: 16px; - height: 16px; - background-image: url("checkbox/checkbox-unchecked.svg"); -} - -.check-box:focus StBin { - background-image: url("checkbox/checkbox-unchecked-focused.svg"); -} - -.check-box:checked StBin { - background-image: url("checkbox/checkbox-checked.svg"); -} - -.check-box:focus:checked StBin { - background-image: url("checkbox/checkbox-checked-focused.svg"); -} - -/* Slider */ - -.slider { - -slider-height: 4px; - -slider-background-color: #cfd6e6; - -slider-border-color: transparent; - -slider-active-background-color: #5294E2; - -slider-active-border-color: transparent; - -slider-border-width: 0; - -slider-handle-radius: 4px; - height: 18px; - border: 0 solid transparent; - border-right-width: 1px; - border-left-width: 5px; - color: transparent; -} - -/* PopupMenu */ - -.popup-menu-ornament { - text-align: right; - margin-left: 10px; - width: 16px; -} - -.popup-menu-boxpointer { - -arrow-border-radius: 2px; - -arrow-background-color: transparent; - -arrow-border-width: 1px; - -arrow-border-color: transparent; - -arrow-base: 0; - -arrow-rise: 0; -} - -.candidate-popup-boxpointer { - -arrow-border-radius: 2px; - -arrow-background-color: rgba(37, 39, 45, 0.95); - -arrow-border-width: 1px; - -arrow-border-color: rgba(21, 22, 25, 0.95); - -arrow-base: 5; - -arrow-rise: 5; -} -/*FIXME*/ -.popup-menu-boxpointer.fallback-app-menu { - -arrow-border-radius: 4px; - -arrow-background-color: #ededed; - -arrow-border-width: 1px; - -arrow-border-color: #a6a6a6; - -arrow-base: 24px; - -arrow-rise: 11px; -} -/*FIXME*/ -.popup-menu-boxpointer.fallback-app-menu.dark { - -arrow-background-color: #3f4747; - -arrow-border-color: #282b2b; -} - -.popup-menu { - min-width: 200px; +.popup-menu .modal-dialog-button { + font-size: 1em; + min-height: 20px; + padding: 5px 32px; + transition-duration: 0; + border-radius: 2px; + background-gradient-direction: none !important; + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #5c616c; + background-color: #fbfbfc; + border: 1px solid #cfd6e6; } + .popup-menu .modal-dialog-button:focus { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; - border-image: url("menu/menu.svg") 10 10 35 14; -} - -.popup-menu-arrow { - width: 16px; - height: 16px; -} - -.popup-submenu-menu-item:open { - background-color: transparent !important; - border-image: url("menu/submenu-open.svg") 8 8 2 2; -} -/*FIXME*/ -.fallback-app-menu .popup-submenu-menu-item:open { - background-color: #888888; - color: white; -} -/*FIXME*/ -.fallback-app-menu.dark .popup-submenu-menu-item:open { - background-color: #333333; -} - -.popup-sub-menu { - background-color: transparent !important; - background-gradient-direction: none !important; - border: none !important; - border-radius: 0 !important; - border-image: url("menu/submenu.svg") 8 8 2 2; -} -/*FIXME*/ -.fallback-app-menu .popup-sub-menu { - background-gradient-start: #dddddd; - background-gradient-end: #dfdfdf; - background-gradient-direction: vertical; - box-shadow: inset 0px 2px 4px rgba(0,0,0,0.4); -} -/*FIXME*/ -.fallback-app-menu.dark .popup-sub-menu { - background-gradient-start: #474747; - background-gradient-end: #4b4b4b; - background-gradient-direction: vertical; - box-shadow: inset 0px 2px 4px rgba(0,0,0,0.9); -} - -.popup-sub-menu:scrolled .popup-menu-item:ltr { - padding-right: 0em; -} - -.popup-sub-menu:scrolled .popup-menu-item:rtl { - padding-left: 0em; -} - -.popup-sub-menu StScrollBar { - padding: 4px; -} - -.popup-sub-menu StScrollBar StBin#trough { - border-width: 0px; -} - -.popup-sub-menu StScrollBar StBin#vhandle { - background-color: #babcc1; - border-width: 0px; -} - -.app-well-menu { - max-width: 400px; -} - -/* The remaining popup-menu sizing is all done in ems, so that if you - * override .popup-menu.font-size, everything else will scale with it. - */ -.popup-menu-content { - padding: 1em 0em; -} - -.popup-menu-item { - spacing: 12px; -} - -.popup-menu-item:ltr { - padding: .4em 3em .4em 0em; -} - -.popup-menu-item:rtl { - padding: .4em 0em .4em 3em; -} - -.popup-menu-item:active { - background-color: transparent !important; - border-image: url("menu/menu-hover.svg") 7 7 1 1; -} - -.popup-menu-item:insensitive { - color: rgba(92, 97, 108, 0.5); -} -/*FIXME*/ -.fallback-app-menu .popup-menu-item { - color: #43484a; -} -/*FIXME*/ -.fallback-app-menu .popup-menu-item:active { - color: white; - background-color: #4689cd; -} -/*FIXME*/ -.fallback-app-menu .popup-menu-item:insensitive { - color: gray; -} -/*FIXME*/ -.fallback-app-menu.dark .popup-menu-item { - color: white; -} -/*FIXME*/ -.fallback-app-menu.dark .popup-menu-item:active { - background-color: #445f7d; -} -/*FIXME*/ -.fallback-app-menu.dark .popup-menu-item:insensitive { - color: #9f9f9f; -} - -.popup-separator-menu-item { - -gradient-height: 1px; - -gradient-start: rgba(255,255,255,0.0); - -gradient-end: rgba(255,255,255,0.0); - -margin-horizontal: 24px; - height: 1px; - padding: 8px 0px; -} -/*FIXME*/ -.fallback-app-menu .popup-separator-menu-item { - -gradient-start: #a0a2a3; - -gradient-end: #a0a2a3; - -margin-horizontal: 0; -} -/*FIXME*/ -.fallback-app-menu.dark .popup-separator-menu-item { - -gradient-start: #818584; - -gradient-end: #818584; -} - -.popup-status-menu-item { - font-weight: normal; - color: rgba(92, 97, 108, 0.5); -} - -.popup-inactive-menu-item, .popup-inactive-menu-item:insensitive { - color: rgba(92, 97, 108, 0.55); -} - -.popup-menu-icon { - icon-size: 16px; -} - -/* Switches */ -.toggle-switch { - width: 52px; - height: 24px; -} - -.toggle-switch-us, -.toggle-switch-intl { - background-image: url("switch/switch-off.svg"); - background-size: contain; -} -.toggle-switch-us:checked, -.toggle-switch-intl:checked { - background-image: url("switch/switch-on.svg"); - background-size: contain; -} - -/* Network */ - -.nm-dialog { - max-height: 500px; - min-height: 450px; - min-width: 470px; -} - -.nm-dialog-content { - spacing: 20px; -} - -.nm-dialog-header-hbox { - spacing: 10px; -} - -.nm-dialog-airplane-box { - spacing: 12px; -} - -.nm-dialog-airplane-headline { - font-size: 1.1em; - font-weight: bold; - text-align: center; -} - -.nm-dialog-airplane-text { + background-color: #fbfbfc; + border: 1px solid #5294E2; } + .popup-menu .modal-dialog-button:hover { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; -} - -.nm-dialog-header-icon { - icon-size: 32px; -} - -.nm-dialog-scroll-view { - border: 1px solid #dde3e9; - border-radius: 2px; - background-color: #ffffff; -} - -.nm-dialog-header { - font-weight: bold; - font-size: 1.2em; -} - -.nm-dialog-item { - font-size: 1em; - border-bottom: 0px solid; - padding: 12px; - spacing: 20px; -} - -.nm-dialog-item:selected { - background-color: #5294E2; + background-color: #fbfbfc; + border: 1px solid #5294E2; } + .popup-menu .modal-dialog-button:hover:focus { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #5294E2; + background-color: #fbfbfc; + border: 1px solid #5294E2; } + .popup-menu .modal-dialog-button:active, .popup-menu .modal-dialog-button:active:focus { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; -} - -.nm-dialog-icons { - spacing: .5em; -} - -.nm-dialog-icon { - icon-size: 16px; -} - -.no-networks-label { + background-color: #5294E2; + border: 1px solid #5294E2; } + .popup-menu .modal-dialog-button:insensitive { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: rgba(92, 97, 108, 0.55); -} - -.no-networks-box { - spacing: 12px; -} - -/* Buttons */ + border: 1px solid rgba(207, 214, 230, 0.55); + background-color: rgba(251, 251, 252, 0.55); } .candidate-page-button, .hotplug-notification-item, .hotplug-resident-eject-button, -.notification-button, -.notification-icon-button, -.popup-menu .modal-dialog-button { - background-gradient-direction: none !important; - - color: #5c616c; - background-color: #fcfdfd; - border: 1px solid #cfd6e6; -} - .modal-dialog-button { - background-gradient-direction: none !important; + background-gradient-direction: none !important; } - font-weight: normal; - color: #c4c7cc; - border: 1px solid rgba(168, 173, 181, 0.3); - background-color: rgba(48, 52, 59, 0.95); -} - -.app-view-control { - background-gradient-direction: none !important; - - color: rgba(255, 255, 255, 0.8); - background-color: rgba(14, 15, 17, 0.8); - border-color: rgba(168, 173, 181, 0.3); -} - -/*hover*/ -.candidate-page-button:hover, -.hotplug-notification-item:hover, -.hotplug-resident-eject-button:hover, -.notification-button:hover, -.notification-icon-button:hover, -.popup-menu .modal-dialog-button:hover { - background-gradient-direction: none !important; - - color: #5c616c; - background-color: #fcfdfd; - border: 1px solid #5294E2; -} - -.modal-dialog-button:hover { - background-gradient-direction: none !important; - - color: #ffffff; - border-color: #5294E2; - background-color: rgba(48, 52, 59, 0.95) -} - -.app-view-control:hover { - background-gradient-direction: none !important; - - color: #ffffff; - background-color: rgba(14, 15, 17, 0.8); - border-color: #5294E2; -} - -/*focus*/ -.hotplug-notification-item:focus, -.app-view-control:focus, -.notification-button:focus, -.notification-icon-button:focus, -.popup-menu .modal-dialog-button:focus { - background-gradient-direction: none !important; - - color: #5c616c; - background-color: #fcfdfd; - border: 1px solid #5294E2 -} - -.modal-dialog-button:focus { - background-gradient-direction: none !important; - border-width: 1px; - color: #5294E2; -} - -.app-view-control:first-child:ltr:focus, -.app-view-control:last-child:rtl:focus { - background-gradient-direction: none !important; - border-width: 1px; - border-right-width: 1px; -} - -/*active*/ -.candidate-page-button:active, -.candidate-page-button:pressed, -.hotplug-notification-item:active, -.hotplug-resident-eject-button:active, -.notification-button:active, -.notification-icon-button:active, -.modal-dialog-button:active, -.modal-dialog-button:pressed, -.app-view-control:checked, -.popup-menu .modal-dialog-button:active, -.popup-menu .modal-dialog-button:pressed { - background-gradient-direction: none !important; - - color: #ffffff; - background-color: #5294E2; - border: 1px solid #5294E2; -} - -/*insenitive*/ -.candidate-page-button:insensitive, -.notification-button:insensitive, -.notification-icon-button:insensitive, -.popup-menu .modal-dialog-button:insensitive { - background-gradient-direction: none !important; - - color: rgba(92, 97, 108, 0.55); - border: 1px solid rgba(207, 214, 230, 0.55); - background-color: rgba(252, 253, 253, 0.55); -} - -.modal-dialog-button:insensitive { - background-gradient-direction: none !important; - - color: #5c6069; - border-color: rgba(168, 173, 181, 0.2); - background-image: rgba(53, 57, 65, 0.95); -} - -/* Common radii */ - -.search-entry, -#screenShieldNotifications { - border-radius: 18px; -} - -.modal-dialog-button, -.notification-button, +.candidate-page-button, .hotplug-notification-item, -.app-view-controls { - border-radius: 3px; -} - -.app-view-control:first-child:ltr, -.app-view-control:last-child:rtl { - border-radius: 3px 0px 0px 3px; - border-right-width: 0px; -} - -.app-view-control:last-child:ltr, -.app-view-control:first-child:rtl { - border-radius: 0px 3px 3px 0px; -} - -/* Entries */ - -.search-entry, -.search-entry:hover, -.login-dialog StEntry, -.notification StEntry, -.modal-dialog StEntry { - background-gradient-direction: none !important; +.hotplug-resident-eject-button, +.modal-dialog-button, .modal-dialog-button-box .button, .notification-button, .notification-icon-button, .hotplug-resident-mount { + font-size: 1em; + min-height: 20px; + padding: 5px 32px; + transition-duration: 0; + border-radius: 2px; + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + border: 1px solid rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } + .candidate-page-button:hover, + .hotplug-notification-item:hover, + .hotplug-resident-eject-button:hover, + .modal-dialog-button:hover, .modal-dialog-button-box .button:hover, .notification-button:hover, .notification-icon-button:hover, .hotplug-resident-mount:hover { + text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); - - transition-duration: 300ms; - padding: 4px 12px; - font-size: 1em; - color: #5c616c; - caret-color: rgb(64, 64, 64); - caret-size: 1px; - selection-background-color: #5294E2; - selected-color: #ffffff; - background-color: #ffffff; - border: 1px solid #cfd6e6; -} - -.run-dialog-entry, -.search-entry:focus, -.login-dialog StEntry:focus, -.notification StEntry:focus, -.modal-dialog StEntry { - background-gradient-direction: none !important; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); - - color: #5c616c; - background-color: #ffffff; + color: #BAC3CF; border: 1px solid #5294E2; -} - -.search-entry { - background-color: rgba(255, 255, 255, 0.9); - border-color: rgba(0, 0, 0, 0.0); - color: #5c616c; - caret-color: #5c616c; -} - -.search-entry:hover { - color: #5c616c; - border-color: rgba(0, 0, 0, 0.0); - caret-color: #5c616c; - background-color: rgba(255, 255, 255, 0.9); -} - -.search-entry:focus { + background-color: rgba(0, 0, 0, 0.3); } + .candidate-page-button:focus, + .hotplug-notification-item:focus, + .hotplug-resident-eject-button:focus, + .modal-dialog-button:focus, .modal-dialog-button-box .button:focus, .notification-button:focus, .notification-icon-button:focus, .hotplug-resident-mount:focus { + color: #5294E2; } + .candidate-page-button:active, + .hotplug-notification-item:active, + .hotplug-resident-eject-button:active, + .modal-dialog-button:active, .modal-dialog-button-box .button:active, .notification-button:active, .notification-icon-button:active, .hotplug-resident-mount:active { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; - border-color: rgba(0, 0, 0, 0.0); - caret-color: #ffffff; - background-color: #5294E2; + border: 1px solid #5294E2; + background-color: #5294E2; } + .candidate-page-button:insensitive, + .hotplug-notification-item:insensitive, + .hotplug-resident-eject-button:insensitive, + .modal-dialog-button:insensitive, .modal-dialog-button-box .button:insensitive, .notification-button:insensitive, .notification-icon-button:insensitive, .hotplug-resident-mount:insensitive { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #555a62; + border: 1px solid rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } - selection-background-color: #ffffff; - selected-color: #5294E2; - - font-weight: bold; - transition-duration: 0ms; -} - -.login-dialog StEntry, -.notification StEntry, -.modal-dialog StEntry { - border-radius: 18px; - padding: 7px; -} - -.prompt-dialog-password-entry .capslock-warning, -.login-dialog-prompt-entry .capslock-warning { +StEntry { + font-size: 1em; + padding: 7px; + caret-size: 1px; + selection-background-color: #5294E2; + selected-color: #ffffff; + transition-duration: 300ms; + border-radius: 20px; + background-gradient-direction: none !important; + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #5c616c; + background-color: #ffffff; + border: 1px solid #cfd6e6; } + StEntry:focus, StEntry:hover { + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #5c616c; + background-color: #ffffff; + border: 1px solid #5294E2; } + StEntry:insensitive { + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: rgba(92, 97, 108, 0.55); + background-color: #fbfbfb; + border-color: 1px solid #e0e4ee; } + StEntry StIcon.capslock-warning { icon-size: 16px; warning-color: #F27835; - padding: 0 4px; -} + padding: 0 4px; } -.login-dialog StEntry:insensitive, -.modal-dialog StEntry:insensitive { - color: rgba(92, 97, 108, 0.55); - border: 1px solid #e1e6ef; - background-gradient-direction: none; - background-color: #fcfcfd; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); -} +StScrollView.vfade { + -st-vfade-offset: 0px; } -/* Panel */ +StScrollView.hfade { + -st-hfade-offset: 0px; } + +StScrollBar { + padding: 8px; } + StScrollView StScrollBar { + min-width: 5px; + min-height: 5px; } + StScrollBar StBin#trough { + background-color: rgba(255, 255, 255, 0.1); + border-radius: 8px; } + StScrollBar StButton#vhandle, StScrollBar StButton#hhandle { + border-radius: 4px; + background-color: #b8babf; + border: 0px solid; + margin: 0px; } + StScrollBar StButton#vhandle:hover, StScrollBar StButton#hhandle:hover { + background-color: #c7c9cd; } + StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { + background-color: #5294E2; } + +.slider { + -slider-height: 4px; + -slider-background-color: #cfd6e6; + -slider-border-color: transparent; + -slider-active-background-color: #5294E2; + -slider-active-border-color: transparent; + -slider-border-width: 0; + -slider-handle-radius: 4px; + height: 18px; + border: 0 solid transparent; + border-right-width: 1px; + border-left-width: 5px; + color: transparent; } + +.check-box StBoxLayout { + spacing: .8em; } + +.check-box StBin { + width: 16px; + height: 16px; + background-image: url("light-assets/checkbox/checkbox-unchecked.svg"); } + +.check-box:focus StBin { + background-image: url("light-assets/checkbox/checkbox-unchecked-focused.svg"); } + +.check-box:checked StBin { + background-image: url("light-assets/checkbox/checkbox-checked.svg"); } + +.check-box:focus:checked StBin { + background-image: url("light-assets/checkbox/checkbox-checked-focused.svg"); } + +.toggle-switch { + width: 50px; + height: 20px; + background-size: contain; } + .toggle-switch-us, .toggle-switch-intl { + background-image: url("light-assets/switch/switch-off.svg"); } + .toggle-switch-us:checked, .toggle-switch-intl:checked { + background-image: url("light-assets/switch/switch-on.svg"); } + +.shell-link { + color: #2679db; } + .shell-link:hover { + color: #5294e2; } + +.headline { + font-size: 110%; } + +.lightbox { + background-color: black; } + +.flashspot { + background-color: white; } + +.modal-dialog { + color: #5c616c; + background-color: rgba(245, 246, 247, 0); + border: none; + border-image: url("light-assets/misc/modal.svg") 9 9 9 67; + padding: 0 5px 6px 5px; } + .modal-dialog > StBoxLayout:first-child { + padding: 20px 10px 10px 10px; } + .modal-dialog-button-box { + spacing: 0; + margin: 0px; + padding: 14px 10px; + background: none; + border: none; + border-image: url("common-assets/misc/button-box.svg") 9 9 9 9; } + .modal-dialog-button-box .button { + padding-top: 0; + padding-bottom: 0; + height: 30px; } + .modal-dialog .run-dialog-entry { + width: 21em; } + .modal-dialog .run-dialog-error-box { + padding-top: 5px; + spacing: 5px; } + .modal-dialog .run-dialog-label { + font-size: 0; } + +.show-processes-dialog-subject, +.mount-question-dialog-subject, +.end-session-dialog-subject { + font-size: 11pt; + font-weight: bold; + color: #5c616c; } + +.end-session-dialog { + spacing: 42px; } + .end-session-dialog-list { + padding-top: 20px; } + .end-session-dialog-layout { + padding-left: 17px; } + .end-session-dialog-layout:rtl { + padding-right: 17px; } + .end-session-dialog-description { + width: 28em; + padding-bottom: 10px; } + .end-session-dialog-description:rtl { + text-align: right; } + .end-session-dialog-warning { + width: 28em; + color: #F27835; + padding-top: 6px; } + .end-session-dialog-warning:rtl { + text-align: right; } + .end-session-dialog-logout-icon { + border: 0px solid transparent; + border-radius: 2px; + width: 48px; + height: 48px; + background-size: contain; } + .end-session-dialog-shutdown-icon { + color: #5c616c; + width: 48px; + height: 48px; } + .end-session-dialog-inhibitor-layout { + spacing: 16px; + max-height: 200px; + padding-right: 10px; + padding-left: 10px; } + .end-session-dialog-session-list, .end-session-dialog-app-list { + spacing: 1em; } + .end-session-dialog-list-header { + font-weight: bold; } + .end-session-dialog-list-header:rtl { + text-align: right; } + .end-session-dialog-app-list-item, .end-session-dialog-session-list-item { + spacing: 1em; } + .end-session-dialog-app-list-item-name, .end-session-dialog-session-list-item-name { + font-weight: bold; } + .end-session-dialog-app-list-item-description { + color: #686d7a; + font-size: 8pt; } + .end-session-dialog .modal-dialog-button:last-child { + color: #ffffff; + background-color: #F04A50; + border-color: #F04A50; } + .end-session-dialog .modal-dialog-button:last-child:hover { + color: #ffffff; + background-color: #f47479; + border-color: #f47479; } + .end-session-dialog .modal-dialog-button:last-child:active { + color: #ffffff; + background-color: #ee3239; + border-color: #ee3239; } + +.shell-mount-operation-icon { + icon-size: 48px; } + +.show-processes-dialog, +.mount-question-dialog { + spacing: 24px; } + +.show-processes-dialog-subject, +.mount-question-dialog-subject { + padding-top: 10px; + padding-left: 17px; + padding-bottom: 6px; } + .show-processes-dialog-subject:rtl, + .mount-question-dialog-subject:rtl { + padding-left: 0px; + padding-right: 17px; } + +.mount-question-dialog-subject { + max-width: 500px; } + +.show-processes-dialog-description, +.mount-question-dialog-description { + padding-left: 17px; + width: 28em; } + .show-processes-dialog-description:rtl, + .mount-question-dialog-description:rtl { + padding-right: 17px; } + +.show-processes-dialog-app-list { + font-size: 10pt; + max-height: 200px; + padding-top: 24px; + padding-left: 49px; + padding-right: 32px; } + .show-processes-dialog-app-list:rtl { + padding-right: 49px; + padding-left: 32px; } + +.show-processes-dialog-app-list-item { + color: #454850; } + .show-processes-dialog-app-list-item:hover { + color: #5c616c; } + .show-processes-dialog-app-list-item:ltr { + padding-right: 1em; } + .show-processes-dialog-app-list-item:rtl { + padding-left: 1em; } + +.show-processes-dialog-app-list-item-icon:ltr { + padding-right: 17px; } + +.show-processes-dialog-app-list-item-icon:rtl { + padding-left: 17px; } + +.show-processes-dialog-app-list-item-name { + font-size: 10pt; } + +.prompt-dialog { + width: 500px; } + .prompt-dialog-main-layout { + spacing: 24px; + padding: 10px; } + .prompt-dialog-message-layout { + spacing: 16px; } + .prompt-dialog-headline { + font-size: 12pt; + font-weight: bold; + color: #5c616c; } + .prompt-dialog-descritption:rtl { + text-align: right; } + .prompt-dialog-password-box { + spacing: 1em; + padding-bottom: 1em; } + .prompt-dialog-error-label { + font-size: 9pt; + color: #FC4138; + padding-bottom: 8px; } + .prompt-dialog-info-label { + font-size: 9pt; + padding-bottom: 8px; } + .prompt-dialog-null-label { + font-size: 9pt; + padding-bottom: 8px; } + +.hidden { + color: transparent; } + +.polkit-dialog-user-layout { + padding-left: 10px; + spacing: 10px; } + .polkit-dialog-user-layout:rtl { + padding-left: 0px; + padding-right: 10px; } + +.polkit-dialog-user-root-label { + color: #F27835; } + +.polkit-dialog-user-user-icon { + border-radius: 2px; + background-size: contain; + width: 48px; + height: 48px; } + +.network-dialog-secret-table { + spacing-rows: 15px; + spacing-columns: 1em; } + +.keyring-dialog-control-table { + spacing-rows: 15px; + spacing-columns: 1em; } + +.popup-menu { + min-width: 200px; + color: #5c616c; + border-image: url("light-assets/menu/menu.svg") 9 9 9 9; } + .popup-menu .popup-sub-menu { + background: none; + box-shadow: none; + background-gradient-direction: none !important; + border-image: url("light-assets/menu/submenu.svg") 9 9 9 9; } + .popup-menu .popup-submenu-menu-item:open { + background: none; + box-shadow: none; + border-image: url("light-assets/menu/submenu-open.svg") 9 9 9 9; } + .popup-menu .popup-menu-content { + padding: 1em 0em 1em 0em; } + .popup-menu .popup-menu-item { + spacing: 12px; } + .popup-menu .popup-menu-item:ltr { + padding: 0.4em 3em 0.4em 0em; } + .popup-menu .popup-menu-item:rtl { + padding: 0.4em 0em 0.4em 3em; } + .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { + color: #5c616c; + background-color: transparent; + border-image: url("light-assets/menu/menu-hover.svg") 9 9 1 1; } + .popup-menu .popup-menu-item:insensitive { + color: rgba(92, 97, 108, 0.5); + background: none; } + .popup-menu .popup-inactive-menu-item { + color: #5c616c; } + .popup-menu .popup-inactive-menu-item:insensitive { + color: rgba(92, 97, 108, 0.55); } + .popup-menu.panel-menu { + -boxpointer-gap: 0px; + margin-bottom: 1.75em; } + +.popup-menu-ornament { + text-align: right; + margin-left: 10px; + width: 16px; } + +.popup-menu-boxpointer { + -arrow-border-radius: 2px; + -arrow-background-color: transparent; + -arrow-border-width: 1px; + -arrow-border-color: transparent; + -arrow-base: 0; + -arrow-rise: 0; } + +.candidate-popup-boxpointer { + -arrow-border-radius: 2px; + -arrow-background-color: rgba(42, 44, 51, 0.95); + -arrow-border-width: 1px; + -arrow-border-color: rgba(0, 0, 0, 0.4); + -arrow-base: 5; + -arrow-rise: 5; } + +.popup-separator-menu-item { + height: 2px; + margin: 10px 0px; + background-color: transparent; + border: none; + border-image: url("common-assets/menu-separator.svg") 1 1 1 1; } + +.background-menu { + -boxpointer-gap: 4px; + -arrow-rise: 0px; } + +.osd-window { + text-align: center; + font-weight: bold; + spacing: 1em; + padding: 20px; + margin: 32px; + min-width: 64px; + min-height: 64px; + color: #ffffff; + background: none; + border: none; + border-radius: 5px; + border-image: url("common-assets/misc/osd.svg") 9 9 9 9; } + .osd-window .osd-monitor-label { + font-size: 3em; } + .osd-window .level { + padding: 0; + height: 4px; + background-color: rgba(0, 0, 0, 0.5); + border-radius: 2px; + color: #5294E2; } + +.resize-popup { + color: #BAC3CF; + background: none; + border: none; + border-radius: 5px; + border-image: url("common-assets/misc/osd.svg") 9 9 9 9; + padding: 12px; } + +.switcher-popup { + padding: 8px; + spacing: 16px; } + +.switcher-list { + color: #BAC3CF; + background: none; + border: none; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + border-radius: 3px; + padding: 20px; } + .switcher-list-item-container { + spacing: 8px; } + .switcher-list .item-box { + padding: 8px; + border-radius: 2px; } + .switcher-list .item-box:outlined { + padding: 6px; + border: 1px solid #5294E2; } + .switcher-list .item-box:selected { + color: #ffffff; + background-color: #5294E2; + border: 1px solid #5294E2; } + .switcher-list .thumbnail-box { + padding: 2px; + spacing: 4px; } + .switcher-list .thumbnail { + width: 256px; } + .switcher-list .separator { + width: 1px; + background: rgba(92, 97, 108, 0.33); } + +.switcher-arrow { + border-color: transparent; + color: #BAC3CF; } + .switcher-arrow:highlighted { + color: #ffffff; } + +.input-source-switcher-symbol { + font-size: 34pt; + width: 96px; + height: 96px; } + +.workspace-switcher { + background: transparent; + border: 0px; + border-radius: 0px; + padding: 0px; + spacing: 8px; } + .workspace-switcher-group { + padding: 12px; } + .workspace-switcher-container { + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + border-radius: 3px; + padding: 20px; + padding-bottom: 24px; } + +.ws-switcher-active-up, .ws-switcher-active-down { + height: 30px; + background-color: #5294E2; + background-size: 96px; + border-radius: 2px; + border: 1px solid #5294E2; } + +.ws-switcher-active-up { + background-image: url("common-assets/misc/ws-switch-arrow-up.png"); } + +.ws-switcher-active-down { + background-image: url("common-assets/misc/ws-switch-arrow-down.png"); } + +.ws-switcher-box { + height: 96px; + background: rgba(0, 0, 0, 0.33); + border: 1px solid rgba(0, 0, 0, 0.33); + border-radius: 2px; } + +.tile-preview { + background-color: rgba(82, 148, 226, 0.35); + border: 1px solid #5294E2; } + .tile-preview-left.on-primary { + border-radius: 0px 0 0 0; } + .tile-preview-right.on-primary { + border-radius: 0 0px 0 0; } + .tile-preview-left.tile-preview-right.on-primary { + border-radius: 0px 0px 0 0; } #panel { - background-color: rgba(37, 39, 45, 0.95); - border-color: rgba(16, 17, 20, 0.95); - border-bottom-width: 1px; - font-weight: bold; - height: 2.1em; - min-height: 26px; -} - -#panel.unlock-screen, -#panel.login-screen { + font-weight: bold; + height: 2.1em; + min-height: 27px; + border-image: url("common-assets/panel/panel.svg") 1 1 1 1; } + #panel.unlock-screen, + #panel.login-screen, + #panel.lock-screen { background-color: transparent; -} - -#panelLeft, #panelCenter { - spacing: 8px; -} - -#panelLeft:ltr { - padding-right: 4px; -} - -#panelLeft:rtl { - padding-left: 4px; -} - -#panelRight:ltr { - padding-left: 4px; -} - -#panelRight:rtl { - padding-right: 4px; -} - -.panel-corner { + border-image: none; } + #panel:overview { + border-image: url("common-assets/panel/panel-overview.svg") 1 1 1 1; } + #panel #panelLeft, #panel #panelCenter { + spacing: 8px; } + #panel .panel-corner { -panel-corner-radius: 0px; -panel-corner-background-color: transparent; -panel-corner-border-width: 0px; - -panel-corner-border-color: black; -} - -.panel-corner:active, -.panel-corner:overview, -.panel-corner:focus { - -panel-corner-border-color: black; -} - -.panel-corner.lock-screen, -.panel-corner.unlock-screen, -.panel-corner.login-screen { - -panel-corner-background-color: transparent; - -panel-corner-border-color: transparent; -} - -#appMenu { - spinner-image: url("misc/process-working.svg"); - spacing: 4px; -} - -/* used for the app menu header only */ -.label-shadow { - color: rgba(0,0,0,0.0); -} - -.panel-button #appMenuIcon { - app-icon-bottom-clip: 1px; - width: 0; -} - -.panel-button:active #appMenuIcon, -.panel-button:checked #appMenuIcon, -.panel-button:focus #appMenuIcon { - app-icon-bottom-clip: 2px; -} - -.panel-button { - -natural-hpadding: 12px; + -panel-corner-border-color: black; } + #panel .panel-corner:active, #panel .panel-corner:overview, #panel .panel-corner:focus { + -panel-corner-border-color: black; } + #panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-cornerunlock-screen { + -panel-corner-radius: 0; + -panel-corner-background-color: transparent; + -panel-corner-border-color: transparent; } + #panel .panel-button { + -natural-hpadding: 10px; -minimum-hpadding: 6px; font-weight: bold; - color: #fff; - transition-duration: 100ms; -} - -#panel.unlock-screen .panel-button, -#panel.lock-screen .panel-button, -#panel.login-screen .panel-button { - color: #fff; -} - -#panel.unlock-screen .panel-button:hover, -#panel.lock-screen .panel-button:hover, -#panel.login-screen .panel-button:hover, -#panel.unlock-screen .panel-button:active, -#panel.lock-screen .panel-button:active, -#panel.login-screen .panel-button:active, -#panel.unlock-screen .panel-button:focus, -#panel.lock-screen .panel-button:focus, -#panel.login-screen .panel-button:focus { - color: #fff; -} - -.panel-button:hover { - color: #fff; - background-color: rgba(0, 0, 0, 0.17); - text-shadow: none; -} - -.panel-button:active, -.panel-button:overview, -.panel-button:focus, -.panel-status-button:active, -.panel-status-button:checked, -.panel-status-button:focus { - background-color: transparent !important; - background-gradient-direction: none !important; - border: none !important; - - background: url("misc/null.svg"); - border-image: url("misc/panel-button-highlight.svg") 1 1 1 1; color: #ffffff; - text-shadow: none; -} + transition-duration: 100ms; + border-bottom-width: 1px; + border-color: transparent; } + #panel .panel-button #appMenuIcon { + width: 0; + height: 0; + margin-left: 0px; + margin-right: 0px; } + #panel .panel-button:hover { + color: #ffffff; + background-color: rgba(0, 0, 0, 0.17); + border-bottom-width: 1px; + border-color: transparent; + text-shadow: 0 0 transparent; } + #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked { + color: #ffffff; + background: #5294E2, url("misc/null.svg"); + border-image: none; + box-shadow: none; + border-bottom-width: 1px; + border-color: black; + text-shadow: 0 0 transparent; } + #panel .panel-button:active > .system-status-icon, #panel .panel-button:overview > .system-status-icon, #panel .panel-button:focus > .system-status-icon, #panel .panel-button:checked > .system-status-icon { + icon-shadow: none; } + #panel .panel-button .system-status-icon { + icon-size: 16px; + padding: 0 4px; } + .unlock-screen #panel .panel-button, + .login-screen #panel .panel-button, + .lock-screen #panel .panel-button { + color: #737a88; } + .unlock-screen #panel .panel-button:focus, + .unlock-screen #panel .panel-button:hover, + .unlock-screen #panel .panel-button:active, + .login-screen #panel .panel-button:focus, + .login-screen #panel .panel-button:hover, + .login-screen #panel .panel-button:active, + .lock-screen #panel .panel-button:focus, .lock-screen #panel .panel-button:hover, .lock-screen #panel .panel-button:active { + color: #737a88; } + #panel #panelActivities.panel-button { + -natural-hpadding: 12px; } + #panel .panel-status-indicators-box, + #panel .panel-status-menu-box { + spacing: 2px; } + #panel .screencast-indicator { + color: #FC4138; } + #panel .clock-display > * > *:last-child { + color: #5294E2; + margin-left: .3em; } + #panel .popup-menu-arrow { + width: 0; } -.panel-button:active > .system-status-icon, -.panel-button:checked > .system-status-icon, -.panel-button:focus > .system-status-icon { - icon-shadow: none; -} +#panel #panelActivities.panel-button > * { + background-image: url("common-assets/panel/activities.svg"); + background-position: center top; + width: 24px; + height: 24px; + background-color: transparent !important; + background-gradient-direction: none !important; + border: 0 solid transparent !important; + text-shadow: 0 0 transparent !important; + transition-duration: 0ms !important; + box-shadow: none !important; + color: transparent; } -.panel-menu { - -boxpointer-gap: 0px; -} - -.panel-status-indicators-box, -.panel-status-menu-box { - spacing: 2px; -} - -#panelActivities > *, -#panelActivities:hover > *, -#panelActivities:focus > *, -#panelActivities:active > *, -#panelActivities:overview > *, -#panel:overview #panelActivities.panel-button:active > *, -#panel:overview #panelActivities.panel-button:focus > * { - background-image: url("misc/activities.svg"); - background-position: center top; - width: 24px; - height: 24px; - background-color: transparent !important; - background-gradient-direction: none !important; - border: 0 solid transparent !important; - text-shadow: 0 0 transparent !important; - transition-duration: 0ms !important; - box-shadow: none !important; - color: transparent; -} - -.system-status-icon { - icon-size: 16px; - padding: 0 8px; -} - -.aggregate-menu { - width: 360px; -} - -.aggregate-menu .popup-menu-icon { - padding: 0 4px; -} +#panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked { + background-color: transparent; + box-shadow: none; + border-bottom-width: 1px; + border-color: transparent; } + #panel #panelActivities.panel-button:active > *, #panel #panelActivities.panel-button:overview > *, #panel #panelActivities.panel-button:focus > *, #panel #panelActivities.panel-button:checked > * { + background-image: url("common-assets/panel/activities-active.svg"); } .system-switch-user-submenu-icon { - icon-size: 24px; - border: 1px solid rgba(92, 97, 108, 0.4); -} + icon-size: 24px; + border: 1px solid rgba(92, 97, 108, 0.4); } + +#appMenu { + spinner-image: url("common-assets/misc/process-working.svg"); + spacing: 4px; + padding: 0 8px; } + #appMenu .label-shadow { + color: transparent; } + +.aggregate-menu { + width: 360px; } + .aggregate-menu .popup-menu-icon { + padding: 0 4px; } .system-menu-action { - color: #5c616c; - border-radius: 32px; /* wish we could do 50% */ - border: 1px solid transparent; /* using rgba() is flaky unfortunately */ + padding: 13px; + color: #5c616c; + border-radius: 32px; + /* wish we could do 50% */ + border: 1px solid transparent; } + .system-menu-action:hover, .system-menu-action:focus { + transition-duration: 100ms; padding: 13px; -} - -.system-menu-action:hover, -.system-menu-action:focus { color: #5c616c; background-color: transparent; - border: 1px solid #5294E2; - padding: 13px; -} - -.system-menu-action:active { + border: 1px solid #5294E2; } + .system-menu-action:active { color: #ffffff; background-color: #5294E2; - border: 1px solid #5294E2; -} - -.system-menu-action > StIcon { - icon-size: 16px; -} - -.screencast-indicator { - color: #ff0000; -} - -/* Overview */ - -#overview { - spacing: 24px; -} - -.overview-controls { - padding-bottom: 32px; -} - -.workspace-thumbnails { - spacing: 11px; - visible-width: 40px; /* Amount visible before hovering */ - border: 1px solid rgba(16, 17, 20, 0.87);; - border-right: 0px; - border-radius: 3px 0px 0px 3px; - background-color: rgba(37, 39, 45, 0.87); - padding: 12px; - padding-right: 7px; -} - -.workspace-thumbnails:rtl { - border-right: 1px; - border-left: 0px; - border-radius: 0px 3px 3px 0px; - padding: 12px; - padding-left: 7px; -} - -.workspace-thumbnail-indicator { - border: 4px solid rgba(82, 148, 226, 0.8); - border-radius: 2px; - padding: 1px; -} - -.window-caption, .window-caption:hover { - spacing: 25px; - color: #fff; - background: rgba(0,0,0,0.7); - border-radius: 2px; - padding: 4px 12px; - -shell-caption-spacing: 12px; - border: 0px solid rgba(0, 0, 0, 0); -} - -.window-close, .notification-close { - background-image: url("misc/close.svg"); - background-size: 26px; - height: 26px; - width: 26px; -} - -.window-close:hover { - background-image: url("misc/close-hover.svg"); - background-size: 26px; - height: 26px; - width: 26px; -} - -.window-close:active { - background-image: url("misc/close-active.svg"); - background-size: 26px; - height: 26px; - width: 26px; -} - -.window-close { - -shell-close-overlap: 11px; -} - -.window-clone-border { - border: 3px solid rgba(82, 148, 226, 0.8); - border-radius: 4px; - box-shadow: inset 0px 0px 0px 1px rgba(82, 148, 226, 0); -} - -.notification-close { - /* we start out in the top right of the - * notification, inset. - * - * center is 32px/2 = 16px - * - * adjust left 2px - * adjust down 8px */ - - -shell-close-overlap-x: 11px; - -shell-close-overlap-y: -11px; -} - -.notification-close:rtl { - /* as above, but starting out in the top left of the - * notification. */ - - -shell-close-overlap-x: -11px; -} - -.window-close:rtl { - -st-background-image-shadow: 2px 2px 6px rgba(0,0,0,0.5); -} - -.window-picker { - -horizontal-spacing: 32px; - -vertical-spacing: 32px; - padding-left: 32px; - padding-right: 32px; - padding-bottom: 48px; -} - -.window-picker.external-monitor { - padding: 32px; -} - -.messages-indicator { - color: rgba(255,255,255,0.5); - height: 32px; -} - -.messages-indicator-contents { - spacing: 12px; - padding-bottom: 12px; -} - -.messages-indicator-contents:hover { - color: white; - text-shadow: black 0px 0px 1px; -} - -.messages-indicator-highlight { - background-gradient-start: transparent; - background-gradient-end: #5294E2; - background-gradient-direction: vertical; - - height: 6px; -} - -/* Dash */ - -#dash { - color: #A8ADB5; - font-size: 1em; - padding: 3px 0px 3px 0px; - background-color: rgba(37, 39, 45, 0.87); - border: 1px solid rgba(16, 17, 20, 0.87); - border-left: 0px; - border-radius: 0px 3px 3px 0px; -} - -.right #dash, #dash:rtl { - padding: 3px 0px 3px 0px; - border-left: 1px; - border-right: 0px; - border-radius: 3px 0px 0px 3px; -} - -.bottom #dash { - border-top: 1px; - padding: 0px 3px 0px 3px; - border-radius: 3px 3px 0 0; -} - -.top #dash { - border-bottom: 1px; - padding: 0px 3px 0px 3px; - border-radius: 0 0 3px 3px; -} - -.placeholder { - background-image: url("dash/dash-placeholder.svg"); - background-size: contain; - height: 24px; -} - -.empty-dash-drop-target { - width: 24px; - height: 24px; -} - -.dash-item-container > StWidget { - padding: 2px 5px 2px 3px; -} - -.right .dash-item-container > StWidget, .dash-item-container > StWidget:rtl { - padding: 2px 3px 2px 5px; -} - -.bottom .dash-item-container > StWidget { - padding: 5px 2px 3px 2px; -} - -.top .dash-item-container > StWidget { - padding: 3px 2px 5px 2px; -} - -.dash-label { - border-radius: 3px; - padding: 4px 12px; - color: #ffffff; - background-color: rgba(0, 0, 0, 0.7); - text-align: center; - -x-offset: 3px; -} - -.bottom .dash-label, .top .dash-label { - -y-offset: 3px; - -x-offset: 0; -} - -.dash-item-container > .app-well-app.running > .overview-icon, -.dash-item-container > .app-well-app.running:hover > .overview-icon, -.dash-item-container > .app-well-app.running:active > .overview-icon, -.dash-item-container > .app-well-app > .overview-icon, -.dash-item-container > .app-well-app:hover > .overview-icon, -.dash-item-container > .app-well-app:active > .overview-icon { - background-color: transparent !important; - background-gradient-direction: none !important; - border: none !important; - border-radius: 0 !important; - background: none !important; -} - - -#dash .app-well-app .overview-icon { - padding: 10px; - padding-left: 13px; -} - -.right #dash .app-well-app .overview-icon, -#dash:rtl .app-well-app .overview-icon { - padding: 10px; - padding-right: 13px; -} - -.bottom #dash .app-well-app .overview-icon { - padding: 10px; - padding-bottom: 13px; -} - -.top #dash .app-well-app .overview-icon { - padding: 10px; - padding-top: 13px; -} - - -#dash .app-well-app:hover .overview-icon { - border-image: url("dash/button-hover.svg") 5 5 5 5; -} - -#dash .app-well-app:active .overview-icon { - border-image: url("dash/button-active.svg") 5 5 5 5; -} - -#dash .app-well-app.running .overview-icon { - border-image: url("dash/button-running.svg") 5 5 5 5; -} - -#dash .app-well-app.running:hover .overview-icon { - border-image: url("dash/button-running-hover.svg") 5 5 5 5; -} - -#dash .app-well-app.running:active > .overview-icon { - border-image: url("dash/button-running-active.svg") 5 5 5 5; -} - - -.right #dash .app-well-app:hover .overview-icon, -#dash:rtl .app-well-app:hover .overview-icon { - border-image: url("dash/button-hover-right.svg") 5 5 5 5; -} - -.right #dash .app-well-app:active .overview-icon, -#dash:rtl .app-well-app:active .overview-icon { - border-image: url("dash/button-active-right.svg") 5 5 5 5; -} - -.right #dash .app-well-app.running .overview-icon, -#dash:rtl .app-well-app.running .overview-icon { - border-image: url("dash/button-running-right.svg") 5 5 5 5; -} - -.right #dash .app-well-app.running:hover .overview-icon, -#dash:rtl .app-well-app.running:hover .overview-icon { - border-image: url("dash/button-running-hover-right.svg") 5 5 5 5; -} - -.right #dash .app-well-app.running:active > .overview-icon, -#dash:rtl .app-well-app.running:active > .overview-icon { - border-image: url("dash/button-running-active-right.svg") 5 5 5 5; -} - - -.bottom #dash .app-well-app:hover .overview-icon { - border-image: url("dash/button-hover-bottom.svg") 5 5 5 5; -} - -.bottom #dash .app-well-app:active .overview-icon { - border-image: url("dash/button-active-bottom.svg") 5 5 5 5; -} - -.bottom #dash .app-well-app.running .overview-icon { - border-image: url("dash/button-running-bottom.svg") 5 5 5 5; -} - -.bottom #dash .app-well-app.running:hover .overview-icon { - border-image: url("dash/button-running-hover-bottom.svg") 5 5 5 5; -} - -.bottom #dash .app-well-app.running:active > .overview-icon { - border-image: url("dash/button-running-active-bottom.svg") 5 5 5 5; -} - - -.top #dash .app-well-app:hover .overview-icon { - border-image: url("dash/button-hover-top.svg") 5 5 5 5; -} - -.top #dash .app-well-app:active .overview-icon { - border-image: url("dash/button-active-top.svg") 5 5 5 5; -} - -.top #dash .app-well-app.running .overview-icon { - border-image: url("dash/button-running-top.svg") 5 5 5 5; -} - -.top #dash .app-well-app.running:hover .overview-icon { - border-image: url("dash/button-running-hover-top.svg") 5 5 5 5; -} - -.top #dash .app-well-app.running:active > .overview-icon { - border-image: url("dash/button-running-active-top.svg") 5 5 5 5; -} - - -.show-apps .overview-icon { - background-gradient-direction: none !important; - - padding: 11px; - background-color: rgba(0, 0, 0, 0.5); - border-radius: 2px; - border: 0px solid; -} - -.show-apps:hover .overview-icon { - background-gradient-direction: none !important; - - background-color: rgba(0, 0, 0, 0.7); - color: #5294E2; -} - -.show-apps:active .overview-icon, .show-apps:active .show-apps-icon, .show-apps:checked .overview-icon, .show-apps:checked .show-apps-icon { - background-gradient-direction: none !important; - - color: #ffffff; - background-color: #5294E2; - box-shadow: none; - transition-duration: 0ms; -} - -/* Search Box */ - -.search-entry, -.search-entry:hover, -.search-entry:focus { - width: 320px; - padding: 7px 9px; -} - -.search-entry-icon, -.search-entry:hover .search-entry-icon { - icon-size: 16px; - color: #5c616c; -} - -.search-entry:focus .search-entry-icon { - color: #fff; -} - -/* Search Results */ - -#searchResults { - padding: 20px 10px 0px 10px; - spacing: 18px; -} - -#searchResultsBin { - max-width: 1000px; -} - -#searchResultsContent { - padding-left: 20px; - padding-right: 20px; - spacing: 16px; -} - -.search-section { - /* This should be equal to #searchResultsContent spacing */ - spacing: 16px; -} - -.search-section-separator { - background-gradient-direction: none !important; - - background-color: rgba(255, 255, 255, 0.2); - -margin-horizontal: 1.5em; - height: 1px; -} - -.search-section-content { - /* This is the space between the provider icon and the results container */ - spacing: 32px; -} - -.search-statustext { - color: rgba(255,255,255,0.5); - font-size: 2em; - font-weight: bold; -} - -.list-search-results { - spacing: 3px; -} - -/* Application Launchers, Grid and List results */ - -.icon-grid { - spacing: 30px; - -shell-grid-horizontal-item-size: 136px; - -shell-grid-vertical-item-size: 136px; -} - -.icon-grid .overview-icon { - icon-size: 96px; -} - -.app-display { - spacing: 20px; -} - -.app-view-controls { - padding-bottom: 32px; -} - -.app-view-control, -.app-view-control:focus { - padding: 4px 32px; -} - -.search-display > StBoxLayout, -.all-apps, -.frequent-apps > StBoxLayout { - /* horizontal padding to make sure scrollbars or dash don't overlap content */ - padding: 0px 88px 10px 88px; -} - -.page-indicator { - padding: 15px 20px; -} - -.page-indicator .page-indicator-icon { - width: 18px; - height: 18px; - background-image: url(misc/page-indicator-inactive.svg); -} - -.page-indicator:hover .page-indicator-icon { - background-image: url(misc/page-indicator-hover.svg); -} - -.page-indicator:active .page-indicator-icon { - background-image: url(misc/page-indicator-active.svg); -} - -.page-indicator:checked .page-indicator-icon, -.page-indicator:checked:active .page-indicator-icon { - background-image: url(misc/page-indicator-checked.svg); -} - -.no-frequent-applications-label { - font-size: 18pt; - color: #5c616c; -} - -.app-folder-icon { - padding: 5px; - spacing-rows: 5px; - spacing-columns: 5px; -} - -.list-search-result-content { - spacing: 12px; - padding: 12px; -} - -.list-search-result-title { - font-weight: bold; - font-size: 14pt; - color: white; -} - -.list-search-result-description { - color: #cccccc; -} - -.search-provider-icon-more { - width: 16px; - height: 16px; - background-image: url("misc/more-results.svg"); -} - -.app-well-app > .overview-icon.overview-icon-with-label, -.grid-search-result .overview-icon.overview-icon-with-label { - /* since the label controls its own spacing, it is visually more - consistent to use different padding values for top and bottom */ - padding: 10px 8px 5px 8px; - spacing: 4px; -} - -.search-provider-icon { - padding: 15px; -} - -.app-folder-popup { - -arrow-border-radius: 2px; - -arrow-background-color: rgba(14, 15, 17, 0.8); - -arrow-border-color: rgba(168, 173, 181, 0.3); - -arrow-border-width: 1px; - -arrow-base: 5; - -arrow-rise: 5; -} - -.app-folder-popup-bin { - padding: 5px; -} - -.app-well-app.running > .overview-icon { - text-shadow: none; - background: none; - background-color: #5294E2; -} - -.app-well-app.running:hover > .overview-icon { - text-shadow: none; - background: none; - background-color: #7eafe9; -} - -.app-well-app.running:active > .overview-icon { - text-shadow: none; - background: none; - background-color: #2679db; -} -/*FIXME*/ -.app-well-app.app-folder > .overview-icon { - background-color: rgba(14, 15, 17, 0.8); - border: 1px solid rgba(168, 173, 181, 0.3); -} - -.app-well-app.app-folder:hover > .overview-icon { - background-color: rgba(60, 64, 73, 0.95); -} - -.app-well-app.app-folder:active > .overview-icon, .app-well-app.app-folder:checked > .overview-icon { - background-color: #5294E2; - box-shadow: none; -} - -.app-well-app.app-folder:focus > .overview-icon { - background-color: #5294E2; -} - -.app-well-app > .overview-icon, -.search-provider-icon, -.list-search-result, -.grid-search-result .overview-icon { - color: #ffffff; - border-radius: 2px; - padding: 6px; - border: 1px rgba(0,0,0,0); - transition-duration: 0ms; - text-align: center; -} - -.app-well-app:hover > .overview-icon, -.search-provider-icon:hover, -.list-search-result:hover, -.grid-search-result:hover .overview-icon { - background-color: rgba(168, 173, 181, 0.4); - text-shadow: 0 0 rgba(0,0,0,0); - transition-duration: 100ms; - color:white; -} - -.app-display .app-well-app > .overview-icon { - border-radius: 2px; -} - -.list-search-result:hover .list-search-result-description { - text-shadow: none; -} - -.app-well-app:checked > .overview-icon, -.app-well-app:active > .overview-icon, -.search-provider-icon:active, -.grid-search-result:active .overview-icon, -.list-search-result:active { - background-gradient-direction: none !important; - - background-color: rgba(37, 39, 45, 0.85); - box-shadow: inset 0 0 #5294E2; - border-radius: 2px; - transition-duration: 100ms; -} - -.app-well-app:focus > .overview-icon, -.grid-search-result:focus .overview-icon, -.search-provider-icon:focus, -.list-search-result:focus, -.app-well-app:selected > .overview-icon, -.grid-search-result:selected .overview-icon, -.search-provider-icon:selected, -.list-search-result:selected { - background-color: rgba(255,255,255,0.33); -} - -/* LookingGlass */ - -#LookingGlassDialog { - background-color: rgba(0, 0, 0, 0.7); - spacing: 4px; - padding: 8px 8px 10px 8px; - border: 1px solid black; - border-image: url("misc/osd.svg") 10 10 9 11; - border-radius: 2px; - color: #A8ADB5; -} - -#LookingGlassDialog > #Toolbar { - background-color: transparent; - border: 1px solid rgba(44, 47, 53, 0.95); - padding: 3px; - border-radius: 4px; -} - -#LookingGlassDialog .labels { - spacing: 4px; -} - -#LookingGlassDialog .notebook-tab { - -natural-hpadding: 12px; - -minimum-hpadding: 6px; - font-weight: bold; - color: #A8ADB5; - transition-duration: 100ms; - padding-left: .3em; - padding-right: .3em; -} - -#LookingGlassDialog .notebook-tab:hover { - color: white; - text-shadow: black 0px 2px 2px; -} - -#LookingGlassDialog .notebook-tab:selected { - border-image: none !important; - background-image: url("misc/null.svg"); - color: #5294E2; - text-shadow: black 0px 2px 2px; -} - -.lg-dialog StEntry { - color: #A8ADB5; - selection-background-color: #5294E2; - selected-color: #ffffff; -} - -.lg-completions-text { - font-size: .9em; - font-style: italic; -} - -.lg-obj-inspector-title { - spacing: 4px; -} - -.lg-obj-inspector-button { - border: 1px solid gray; - padding: 4px; - border-radius: 4px; -} - -.lg-obj-inspector-button:hover { - border: 1px solid #ffffff; -} - -.lg-dialog .shell-link { - color: #999999; -} - -.lg-dialog .shell-link:hover { - color: #dddddd; -} - -#LookingGlassDialog StBoxLayout#EvalBox { - padding: 4px; - spacing: 4px; -} - -#LookingGlassDialog StBoxLayout#ResultsArea { - spacing: 4px; -} - -#lookingGlassExtensions { - padding: 4px; -} - -.lg-extensions-list { - padding: 4px; - spacing: 6px; -} - -.lg-extension { - border: 1px solid #dde3e9; - border-radius: 2px; - background-color: #f9fafb; - padding: 4px; -} - -.lg-extension-name { - font-weight: bold; -} - -.lg-extension-meta { - spacing: 6px; -} - -#LookingGlassPropertyInspector { - background: rgba(0, 0, 0, 0.8); - border: 1px solid grey; - border-radius: 4px; - padding: 6px; -} - -/* Calendar popup */ + border: 1px solid #5294E2; } + .system-menu-action > StIcon { + icon-size: 16px; } .calendar-vertical-separator { - -stipple-width: 1px; - -stipple-color: rgba(0,0,0,0.2); - width: 0.3em; -} + -stipple-width: 1px; + -stipple-color: rgba(92, 97, 108, 0.4); + width: 0.3em; } .calendar { - padding: .4em 1.75em .8em 2.5em; -} + padding: 0.4em 1.75em 0.8em 2.5em; } .calendar-month-label { - color: #5c616c; - font-size: 9.5pt; - font-weight: bold; - padding-bottom: 8px; - padding-top: 8px; -} - -.calendar-month-label:focus { - background-color: red; -} + color: #5c616c; + font-weight: bold; + padding: 8px 0; } .calendar-change-month-back:hover, .calendar-change-month-back:focus, @@ -1643,1462 +778,1280 @@ StScrollBar StButton#vhandle:active { .calendar-change-month-forward:hover, .calendar-change-month-forward:focus, .calendar-change-month-forward:active { - background-color: transparent; -} + background-color: transparent; } .calendar-change-month-back, .calendar-change-month-forward { - width: 18px; - height: 12px; - border-radius: 4px; -} + width: 18px; + height: 12px; + border-radius: 4px; } .calendar-change-month-back { - background-image: url("misc/calendar-arrow-left.svg"); -} - -.calendar-change-month-back:focus, .calendar-change-month-back:hover { - background-image: url("misc/calendar-arrow-left-hover.svg"); -} - -.calendar-change-month-back:active { - background-image: url("misc/calendar-arrow-left.svg"); -} - -.calendar-change-month-back:rtl { - background-image: url("misc/calendar-arrow-right.svg"); -} - -.calendar-change-month-back:rtl:focus, .calendar-change-month-back:rtl:hover { - background-image: url("misc/calendar-arrow-right-hover.svg"); -} - -.calendar-change-month-back:rtl:active { - background-image: url("misc/calendar-arrow-right.svg"); -} + background-image: url("light-assets/misc/calendar-arrow-left.svg"); } + .calendar-change-month-back:focus, .calendar-change-month-back:hover { + background-image: url("light-assets/misc/calendar-arrow-left-hover.svg"); } + .calendar-change-month-back:active { + background-image: url("light-assets/misc/calendar-arrow-left.svg"); } + .calendar-change-month-back:rtl { + background-image: url("light-assets/misc/calendar-arrow-right.svg"); } + .calendar-change-month-back:rtl:focus, .calendar-change-month-back:rtl:hover { + background-image: url("light-assets/misc/calendar-arrow-right-hover.svg"); } + .calendar-change-month-back:rtl:active { + background-image: url("light-assets/misc/calendar-arrow-right.svg"); } .calendar-change-month-forward { - background-image: url("misc/calendar-arrow-right.svg"); -} - -.calendar-change-month-forward:focus, .calendar-change-month-forward:hover { - background-image: url("misc/calendar-arrow-right-hover.svg"); -} - -.calendar-change-month-forward:active { - background-image: url("misc/calendar-arrow-right.svg"); -} - -.calendar-change-month-forward:rtl { - background-image: url("misc/calendar-arrow-left.svg"); -} - -.calendar-change-month-forward:rtl:focus, .calendar-change-month-forward:rtl:hover { - background-image: url("misc/calendar-arrow-left-hover.svg"); -} - -.calendar-change-month-forward:rtl:active { - background-image: url("misc/calendar-arrow-left.svg"); -} + background-image: url("light-assets/misc/calendar-arrow-right.svg"); } + .calendar-change-month-forward:focus, .calendar-change-month-forward:hover { + background-image: url("light-assets/misc/calendar-arrow-right-hover.svg"); } + .calendar-change-month-forward:active { + background-image: url("light-assets/misc/calendar-arrow-right.svg"); } + .calendar-change-month-forward:rtl { + background-image: url("light-assets/misc/calendar-arrow-left.svg"); } + .calendar-change-month-forward:rtl:focus, .calendar-change-month-forward:rtl:hover { + background-image: url("light-assets/misc/calendar-arrow-left-hover.svg"); } + .calendar-change-month-forward:rtl:active { + background-image: url("light-assets/misc/calendar-arrow-left.svg"); } .datemenu-date-label { - padding: .4em 1.7em; - font-weight: bold; - text-align: center; - color: #5c616c; - border-radius: 4px; -} - -.datemenu-date-label:hover, -.datemenu-date-label:focus { - background-color: #5c616c; -} - -.datemenu-date-label:active { - background-color: #5c616c; -} + padding: 0.4em 1.7em; + font-weight: bold; + text-align: center; + color: #5c616c; + border-radius: 4px; } .calendar-day-base { - font-size: 8pt; - text-align: center; - width: 25px; - height: 25px; - border-radius: 12.5px; -} - -.calendar-day-base:hover, -.calendar-day-base:focus { - background-color: rgba(0, 0, 0, 0.1); -} - -.calendar-day-base:active { - font-size: 8pt; - background-color: transparent; - border: 1px solid #5294E2; + font-size: 80%; + text-align: center; + width: 25px; + height: 25px; + padding: 0.1em; + margin: 2px; + border-radius: 12.5px; } + .calendar-day-base:hover, .calendar-day-base:focus { + background-color: rgba(0, 0, 0, 0.1); } + .calendar-day-base:active { color: #5c616c; -} - -.calendar-day-heading { + background-color: rgba(0, 0, 0, 0.15); + border-width: 0; } + .calendar-day-base.calendar-day-heading { color: rgba(92, 97, 108, 0.85); - padding-top: .2em; - height: 1.7em; -} + margin-top: 1em; + font-size: 70%; } .calendar-week-number { - color: rgba(92, 97, 108, 0.3); - font-weight: normal; -} + color: rgba(92, 97, 108, 0.5); + font-weight: normal; } -/* Hack used in lieu of border-collapse - see calendar.js */ .calendar-day { - border: 1px solid transparent; - color: rgba(92, 97, 108, 0.8); -} + border-width: 0; + color: rgba(92, 97, 108, 0.8); } .calendar-day-top { - border-top-width: 1px; -} + border-top-width: 0; } .calendar-day-left { - border-left-width: 1px; -} - -.calendar-work-day { -} + border-left-width: 0; } .calendar-nonwork-day { - color: #5c616c; - background-color: transparent; -} + background-color: transparent; + color: #5c616c; + font-weight: bold; } .calendar-today, .calendar-today:active, +.calendar-today:focus, .calendar-today:hover { - background: #5294E2; - color: #fff; - text-shadow: black 0px 0px; - font-weight: bold; -} + font-weight: bold; + color: #ffffff; + background-color: #5294E2; + border-width: 0; } .calendar-day-with-events { - font-weight: bold; - color: #5294E2; -} + color: #5294E2; + font-weight: bold; } + +.calendar-today.calendar-day-with-events { + color: #ffffff; } .calendar-other-month-day { - color: rgba(92, 97, 108, 0.3); -} + color: rgba(92, 97, 108, 0.3); + opacity: 1; } .events-table { - width: 320px; - spacing-columns: 6pt; - padding: 0 1.4em; -} - -.events-table:ltr { - padding-right: 1.9em; -} - -.events-table:rtl { - padding-left: 1.9em; -} + width: 320px; + spacing-columns: 6pt; + padding: 0 1.4em; } + .events-table:ltr { + padding-right: 1.9em; } + .events-table:rtl { + padding-left: 1.9em; } .events-day-header { - font-weight: bold; - color: rgba(92, 97, 108, 0.8); - padding-left: 0.4em; - padding-top: 1.2em; -} - -.events-day-header:first-child { - padding-top: 0; -} - -.events-day-header:rtl { + font-weight: bold; + color: rgba(92, 97, 108, 0.8); + padding-left: 0.4em; + padding-top: 1.2em; } + .events-day-header:first-child { + padding-top: 0; } + .events-day-header:rtl { padding-left: 0; - padding-right: 0.4em; -} + padding-right: 0.4em; } .events-day-dayname { - color: rgba(92, 97, 108, 0.5); - text-align: left; - min-width: 20px; -} - -.events-day-dayname:rtl { - text-align: right; -} + color: rgba(92, 97, 108, 0.5); + text-align: left; + min-width: 20px; } + .events-day-dayname:rtl { + text-align: right; } .events-day-time { - color: rgba(92, 97, 108, 0.4); - text-align: right; -} - -.events-day-time:rtl { - text-align: left; -} + color: rgba(92, 97, 108, 0.4); + text-align: right; } + .events-day-time:rtl { + text-align: left; } .events-day-task { - color: rgba(92, 97, 108, 1.0); - padding-left: 8pt; -} - -.events-day-task:rtl { + color: #5c616c; + padding-left: 8pt; } + .events-day-task:rtl { padding-left: 0px; - padding-right: 8pt; -} + padding-right: 8pt; } -/* Message Tray */ +.ripple-box { + width: 52px; + height: 52px; + background-image: url("common-assets/misc/corner-ripple-ltr.svg"); + background-size: contain; } + .ripple-box:rtl { + background-image: url("common-assets/misc/corner-ripple-rtl.svg"); } + +.popup-menu-arrow { + width: 16px; + height: 16px; } + +.popup-menu-icon { + icon-size: 16px; } + +.window-close, .notification-close { + background-image: url("common-assets/misc/close.svg"); + background-size: 26px; + height: 26px; + width: 26px; } + .window-close:hover, .notification-close:hover { + background-image: url("common-assets/misc/close-hover.svg"); + background-size: 26px; + height: 26px; + width: 26px; } + .window-close:active, .notification-close:active { + background-image: url("common-assets/misc/close-active.svg"); + background-size: 26px; + height: 26px; + width: 26px; } + +.window-close { + -shell-close-overlap: 11px; } + +.notification-close { + -shell-close-overlap-x: 8px; + -shell-close-overlap-y: -8px; } + .notification-close:rtl { + -shell-close-overlap-x: -8px; } + +.nm-dialog { + max-height: 500px; + min-height: 450px; + min-width: 470px; } + .nm-dialog-content { + spacing: 20px; } + .nm-dialog-header-hbox { + spacing: 10px; } + .nm-dialog-airplane-box { + spacing: 12px; } + .nm-dialog-airplane-headline { + font-size: 1.1em; + font-weight: bold; + text-align: center; } + .nm-dialog-airplane-text { + color: #5c616c; } + .nm-dialog-header-icon { + icon-size: 32px; } + .nm-dialog-scroll-view { + border: 1px solid #dbdfe3; + border-radius: 2px; + background-color: #ffffff; } + .nm-dialog-header { + font-weight: bold; + font-size: 1.2em; } + .nm-dialog-item { + font-size: 1em; + border-bottom: 0px solid; + padding: 12px; + spacing: 0px; } + .nm-dialog-item:selected { + background-color: #5294E2; + color: #ffffff; } + .nm-dialog-icons { + spacing: .5em; } + .nm-dialog-icon { + icon-size: 16px; } + +.no-networks-label { + color: rgba(92, 97, 108, 0.55); } + +.no-networks-box { + spacing: 12px; } + +#overview { + spacing: 24px; } + +.overview-controls { + padding-bottom: 32px; } + +.window-picker { + -horizontal-spacing: 32px; + -vertical-spacing: 32px; + padding-left: 32px; + padding-right: 32px; + padding-bottom: 48px; } + .window-picker.external-monitor { + padding: 32px; } + +.window-clone-border { + border: 3px solid rgba(82, 148, 226, 0.8); + border-radius: 4px; + box-shadow: inset 0px 0px 0px 1px rgba(82, 148, 226, 0); } + +.window-caption, .window-caption:hover { + spacing: 25px; + color: #BAC3CF; + background-color: rgba(0, 0, 0, 0.7); + border-radius: 2px; + padding: 4px 12px; + -shell-caption-spacing: 12px; } + +.search-entry { + width: 320px; + padding: 7px 9px; + border-radius: 20px; + border: 1px solid rgba(0, 0, 0, 0.25); + background-color: rgba(255, 255, 255, 0.9); } + .search-entry:focus { + padding: 7px 9px; } + .search-entry .search-entry-icon { + icon-size: 16px; + padding: 0 4px; + color: #5c616c; } + .search-entry:hover, .search-entry:focus { + color: #ffffff; + caret-color: #ffffff; + background-color: #5294E2; + selection-background-color: #ffffff; + selected-color: #5294E2; } + .search-entry:hover .search-entry-icon, .search-entry:focus .search-entry-icon { + color: #ffffff; } + +#searchResultsBin { + max-width: 1000px; } + +#searchResultsContent { + padding-left: 20px; + padding-right: 20px; + spacing: 16px; } + +.search-section { + spacing: 16px; } + +.search-section-content { + spacing: 32px; } + +.list-search-results { + spacing: 3px; } + +.search-section-separator { + background-color: rgba(255, 255, 255, 0.2); + -margin-horizontal: 1.5em; + height: 1px; } + +.list-search-result-content { + spacing: 12px; + padding: 12px; } + +.list-search-result-title { + font-size: 1.5em; + color: #ffffff; } + +.list-search-result-description { + color: #cccccc; } + +.search-provider-icon { + padding: 15px; } + +.search-provider-icon-more { + width: 16px; + height: 16px; + background-image: url("common-assets/misc/more-results.svg"); } + +#dash { + font-size: 1em; + color: #BAC3CF; + background-color: transparent; + border: none; + padding: 3px 0px 3px 0px; + border-image: url("common-assets/dash/dash-left.svg") 3 3 3 3; } + .extended.left #dash { + border-image: url("common-assets/dash/dash-extended-left.svg") 3 3 3 3; } + .right #dash, + #dash:rtl { + padding: 3px 0px 3px 0px; + border-image: url("common-assets/dash/dash-right.svg") 3 3 3 3; } + .extended.right #dash { + border-image: url("common-assets/dash/dash-extended-right.svg") 3 3 3 3; } + .bottom #dash { + padding: 0px 3px 0px 3px; + border-image: url("common-assets/dash/dash-bottom.svg") 3 3 3 3; } + .extended.bottom #dash { + border-image: url("common-assets/dash/dash-extended-bottom.svg") 3 3 3 3; } + .top #dash { + padding: 0px 3px 0px 3px; + border-image: url("common-assets/dash/dash-top.svg") 3 3 3 3; } + .extended.top #dash { + border-image: url("common-assets/dash/dash-extended-top.svg") 3 3 3 3; } + #dash .placeholder { + background-image: url("common-assets/dash/dash-placeholder.svg"); + background-size: contain; + height: 24px; } + #dash .empty-dash-drop-target { + width: 24px; + height: 24px; } + +.dash-item-container > StWidget { + padding: 2px 5px 2px 3px; } + .right .dash-item-container > StWidget, .dash-item-container > StWidget:rtl { + padding: 2px 3px 2px 5px; } + .bottom .dash-item-container > StWidget { + padding: 5px 2px 3px 2px; } + .top .dash-item-container > StWidget { + padding: 3px 2px 5px 2px; } + +.dash-label { + border-radius: 3px; + padding: 4px 12px; + color: #ffffff; + background-color: rgba(0, 0, 0, 0.7); + text-align: center; + -x-offset: 3px; } + +.bottom .dash-label, .top .dash-label { + -y-offset: 3px; + -x-offset: 0; } + +.dash-item-container > .app-well-app.running > .overview-icon, +.dash-item-container > .app-well-app.running:hover > .overview-icon, +.dash-item-container > .app-well-app.running:active > .overview-icon, +.dash-item-container > .app-well-app > .overview-icon, +.dash-item-container > .app-well-app:hover > .overview-icon, +.dash-item-container > .app-well-app:active > .overview-icon { + background-color: transparent !important; + background-gradient-direction: none !important; + border: none !important; + border-radius: 0 !important; + background: none !important; } + +#dash .app-well-app .overview-icon { + padding: 10px; + padding-left: 13px; } + +.right #dash .app-well-app .overview-icon, +#dash:rtl .app-well-app .overview-icon { + padding: 10px; + padding-right: 13px; } + +.bottom #dash .app-well-app .overview-icon { + padding: 10px; + padding-bottom: 13px; } + +.top #dash .app-well-app .overview-icon { + padding: 10px; + padding-top: 13px; } + +#dash .app-well-app:hover .overview-icon { + border-image: url("common-assets/dash/button-hover.svg") 5 5 5 5; } + +#dash .app-well-app:active .overview-icon { + border-image: url("common-assets/dash/button-active.svg") 5 5 5 5; } + +#dash .app-well-app.running .overview-icon { + border-image: url("common-assets/dash/button-running.svg") 5 5 5 5; } + +#dash .app-well-app.running:hover .overview-icon { + border-image: url("common-assets/dash/button-running-hover.svg") 5 5 5 5; } + +#dash .app-well-app.running:active > .overview-icon { + border-image: url("common-assets/dash/button-running-active.svg") 5 5 5 5; } + +.right #dash .app-well-app:hover .overview-icon, +#dash:rtl .app-well-app:hover .overview-icon { + border-image: url("common-assets/dash/button-hover-right.svg") 5 5 5 5; } + +.right #dash .app-well-app:active .overview-icon, +#dash:rtl .app-well-app:active .overview-icon { + border-image: url("common-assets/dash/button-active-right.svg") 5 5 5 5; } + +.right #dash .app-well-app.running .overview-icon, +#dash:rtl .app-well-app.running .overview-icon { + border-image: url("common-assets/dash/button-running-right.svg") 5 5 5 5; } + +.right #dash .app-well-app.running:hover .overview-icon, +#dash:rtl .app-well-app.running:hover .overview-icon { + border-image: url("common-assets/dash/button-running-hover-right.svg") 5 5 5 5; } + +.right #dash .app-well-app.running:active > .overview-icon, +#dash:rtl .app-well-app.running:active > .overview-icon { + border-image: url("common-assets/dash/button-running-active-right.svg") 5 5 5 5; } + +.bottom #dash .app-well-app:hover .overview-icon { + border-image: url("common-assets/dash/button-hover-bottom.svg") 5 5 5 5; } + +.bottom #dash .app-well-app:active .overview-icon { + border-image: url("common-assets/dash/button-active-bottom.svg") 5 5 5 5; } + +.bottom #dash .app-well-app.running .overview-icon { + border-image: url("common-assets/dash/button-running-bottom.svg") 5 5 5 5; } + +.bottom #dash .app-well-app.running:hover .overview-icon { + border-image: url("common-assets/dash/button-running-hover-bottom.svg") 5 5 5 5; } + +.bottom #dash .app-well-app.running:active > .overview-icon { + border-image: url("common-assets/dash/button-running-active-bottom.svg") 5 5 5 5; } + +.top #dash .app-well-app:hover .overview-icon { + border-image: url("common-assets/dash/button-hover-top.svg") 5 5 5 5; } + +.top #dash .app-well-app:active .overview-icon { + border-image: url("common-assets/dash/button-active-top.svg") 5 5 5 5; } + +.top #dash .app-well-app.running .overview-icon { + border-image: url("common-assets/dash/button-running-top.svg") 5 5 5 5; } + +.top #dash .app-well-app.running:hover .overview-icon { + border-image: url("common-assets/dash/button-running-hover-top.svg") 5 5 5 5; } + +.top #dash .app-well-app.running:active > .overview-icon { + border-image: url("common-assets/dash/button-running-active-top.svg") 5 5 5 5; } + +.show-apps .overview-icon { + background-gradient-direction: none !important; + padding: 11px; + background-color: rgba(0, 0, 0, 0.5); + border-radius: 2px; + border: 0px solid; } + +.show-apps:hover .overview-icon { + background-gradient-direction: none !important; + background-color: rgba(0, 0, 0, 0.7); + color: #5294E2; } + +.show-apps:active .overview-icon, .show-apps:active .show-apps-icon, .show-apps:checked .overview-icon, .show-apps:checked .show-apps-icon { + background-gradient-direction: none !important; + color: #ffffff; + background-color: #5294E2; + box-shadow: none; + transition-duration: 0ms; } + +.icon-grid { + spacing: 30px; + -shell-grid-horizontal-item-size: 136px; + -shell-grid-vertical-item-size: 136px; } + .icon-grid .overview-icon { + icon-size: 96px; } + +.app-view-controls { + padding-bottom: 32px; } + +.app-view-control { + padding: 4px 32px; + background-gradient-direction: none; + background-color: rgba(42, 44, 51, 0.95); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.7); } + .app-view-control:hover { + background-color: rgba(42, 44, 51, 0.95); + color: #BAC3CF; + border-color: #5294E2; } + .app-view-control:checked { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #ffffff; + border: 1px solid #5294E2; + background-color: #5294E2; } + .app-view-control:first-child:ltr, + .app-view-control:last-child:rtl { + border-radius: 2px 0 0 2px; } + .app-view-control:last-child:ltr, + .app-view-control:first-child:rtl { + border-radius: 0 2px 2px 0; } + +.search-provider-icon:active, +.search-provider-icon:checked, +.list-search-result:active, .list-search-result:checked { + background-color: rgba(19, 20, 23, 0.85); } + +.search-provider-icon:focus, +.search-provider-icon:selected, +.search-provider-icon:hover, +.list-search-result:focus, .list-search-result:selected, .list-search-result:hover { + background-color: rgba(186, 195, 207, 0.4); + transition-duration: 200ms; } + +.app-well-app:active .overview-icon, +.app-well-app:checked .overview-icon, +.app-well-app.app-folder:active .overview-icon, +.app-well-app.app-folder:checked .overview-icon, +.grid-search-result:active .overview-icon, +.grid-search-result:checked .overview-icon { + background-color: rgba(19, 20, 23, 0.85); + box-shadow: inset 0 0 #5294E2; } + +.app-well-app:hover .overview-icon, +.app-well-app:focus .overview-icon, +.app-well-app:selected .overview-icon, +.app-well-app.app-folder:hover .overview-icon, +.app-well-app.app-folder:focus .overview-icon, +.app-well-app.app-folder:selected .overview-icon, +.grid-search-result:hover .overview-icon, +.grid-search-result:focus .overview-icon, +.grid-search-result:selected .overview-icon { + background-color: rgba(186, 195, 207, 0.4); + transition-duration: 0ms; + border-image: none; + background-image: none; } + +.search-provider-icon, +.list-search-result, .app-well-app .overview-icon, +.app-well-app.app-folder .overview-icon, +.grid-search-result .overview-icon { + color: #ffffff; + border-radius: 2px; + padding: 6px; + border: 1px solid transparent; + transition-duration: 0ms; + text-align: center; } + +.app-well-app.app-folder > .overview-icon { + background-color: rgba(8, 8, 9, 0.8); + border: 1px solid rgba(186, 195, 207, 0.3); } + +.app-well-app.app-folder:hover > .overview-icon { + background-color: rgba(54, 57, 65, 0.95); } + +.app-well-app.app-folder:active > .overview-icon, .app-well-app.app-folder:checked > .overview-icon { + background-color: #5294E2; + box-shadow: none; } + +.app-well-app.app-folder:focus > .overview-icon { + background-color: #5294E2; } + +.app-folder-popup { + -arrow-border-radius: 2px; + -arrow-background-color: transparent; + -arrow-border-color: transparent; + -arrow-border-width: 0; + -arrow-base: 0; + -arrow-rise: 0; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; } + +.app-folder-popup-bin { + padding: 5px; } + +.app-folder-icon { + padding: 5px; + spacing-rows: 5px; + spacing-columns: 5px; } + +.page-indicator { + padding: 15px 20px; } + .page-indicator .page-indicator-icon { + width: 18px; + height: 18px; + background-image: url(common-assets/misc/page-indicator-inactive.svg); } + .page-indicator:hover .page-indicator-icon { + background-image: url(common-assets/misc/page-indicator-hover.svg); } + .page-indicator:active .page-indicator-icon { + background-image: url(common-assets/misc/page-indicator-active.svg); } + .page-indicator:checked .page-indicator-icon, + .page-indicator:checked:active { + background-image: url(common-assets/misc/page-indicator-checked.svg); } + +.app-well-app > .overview-icon.overview-icon-with-label, +.grid-search-result .overview-icon.overview-icon-with-label { + padding: 10px 8px 5px 8px; + spacing: 4px; } + +.workspace-thumbnails { + visible-width: 40px; + spacing: 11px; + padding: 12px; + padding-right: 7px; + border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; } + .workspace-thumbnails:rtl { + padding: 12px; + padding-left: 7px; + border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } + +.workspace-thumbnail-indicator { + border: 4px solid rgba(82, 148, 226, 0.8); + border-radius: 1px; + padding: 1px; } + +.search-display > StBoxLayout, +.all-apps, +.frequent-apps > StBoxLayout { + padding: 0px 88px 10px 88px; } + +.search-statustext, .no-frequent-applications-label { + font-size: 2em; + font-weight: bold; + color: #5c616c; } #message-tray { - background: #2e3436; - background-repeat: repeat; - height: 72px; -} + background: #2a2c33; + background-repeat: repeat; + height: 72px; + border: solid rgba(0, 0, 0, 0.6); + border-width: 0; + border-top-width: 1px; } .message-tray-summary { - height: 72px; -} + height: 72px; } .message-tray-menu-button StIcon { - padding: 0 20px; - color: #aaaaaa; - icon-size: 24px; -} + padding: 0 20px; + color: rgba(186, 195, 207, 0.6); + icon-size: 24px; } .message-tray-menu-button:hover StIcon, .message-tray-menu-button:active StIcon, .message-tray-menu-button:focus StIcon { - color: #eeeeee; -} - -.url-highlighter { - link-color: #ccccff; -} + color: #BAC3CF; } .no-messages-label { - color: #999999; -} - -.notification { - border-radius: 2px 2px 0px 0px; - background: #f9fafb; - padding: 8px 8px 4px 8px; - spacing-rows: 4px; - spacing-columns: 10px; - box-shadow: 0 -1px 5px rgba(0, 0, 0, 0.2); -} - -.notification, #notification-container { - font-size: 11pt; - width: 34em; -} - -.notification.multi-line-notification { - padding-bottom: 8px; -} - -.notification-unexpanded { - /* We want to force the actor at a specific size, irrespective - of its minimum and preferred size, so we override both */ - min-height: 32px; - height: 32px; -} - -/* We use row-span = 2 for the image cell, which prevents its height preferences to be - taken into account during allocation, so its height ends up being limited by the height - of the content in the other rows. To avoid showing a stretched image, we set the minimum - height of the table to be ICON_SIZE + IMAGE_SIZE + spacing-rows = 24 + 125 + 10 = 159 */ -.notification-with-image { - min-height: 159px; -} + color: rgba(186, 195, 207, 0.5); } .summary-boxpointer { - -arrow-border-radius: 3px; - -arrow-background-color: rgba(0,0,0,0.0); - -arrow-base: 0; - -arrow-rise: 0; - -boxpointer-gap: 0; - color: #5c616c; - border-image: url("menu/menu.svg") 10 10 35 14; - padding: 7px; -} - -.summary-boxpointer .notification { + -arrow-border-radius: 3px; + -arrow-background-color: transparent; + -arrow-base: 0; + -arrow-rise: 0; + -boxpointer-gap: 0; + color: #5c616c; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + padding: 7px; } + .summary-boxpointer .notification { border-radius: 3px; - background: rgba(0,0,0,0) !important; - padding-bottom: 12px; -} - -.summary-boxpointer #summary-right-click-menu { + background: none !important; + border-image: none; + padding-bottom: 12px; } + .summary-boxpointer #summary-right-click-menu { + color: #BAC3CF; padding-top: 12px; - padding-bottom: 12px; -} - -.summary-notification-stack-scrollview { + padding-bottom: 12px; } + .summary-boxpointer-stack-scrollview { max-height: 18em; padding-top: 8px; - padding-bottom: 8px; -} - -.summary-notification-stack-scrollview:ltr { - padding-right: 8px; -} - -.summary-notification-stack-scrollview:rtl { - padding-left: 8px; -} - -.notification-scrollview { - max-height: 10em; - -st-vfade-offset: 24px; -} - -.notification-scrollview:ltr > StScrollBar { - padding-left: 6px; -} - -.notification-scrollview:rtl > StScrollBar { - padding-right: 6px; -} - -.notification-body { - spacing: 5px; -} - -.notification-actions { - padding-top: 18px; - spacing: 10px; -} - -.notification-button { - -st-natural-width: 140px; - padding: 4px 4px 5px; -} - -.notification-button:focus { - -st-natural-width: 140px; - padding: 4px 4px 5px; -} - -.notification-icon-button { - border-radius: 5px; - padding: 5px; -} - -.notification-icon-button:focus { - padding: 5px; -} - -.notification-icon-button > StIcon { - icon-size: 16px; - padding: 8px; -} - -.secondary-icon { - icon-size: 1.09em; -} - -.hotplug-transient-box { - spacing: 6px; - padding: 2px 72px 2px 12px; -} - -.hotplug-notification-item { - padding: 2px 10px; -} - -.hotplug-notification-item:focus { - padding: 1px 71px 1px 11px; -} - -.hotplug-notification-item-icon { - icon-size: 24px; - padding: 2px 5px; -} - -.hotplug-resident-box { - spacing: 8px; -} - -.hotplug-resident-mount { - spacing: 8px; - border-radius: 4px; - - color: #ccc; -} - -.hotplug-resident-mount:hover { - background-gradient-direction: horizontal; - background-gradient-start: rgba(255, 255, 255, 0.1); - background-gradient-end: rgba(255, 255, 255, 0); - - color: #fff; -} - -.hotplug-resident-mount-label { - color: inherit; - padding-left: 6px; -} - -.hotplug-resident-mount-icon { - icon-size: 24px; - padding-left: 6px; -} - -.hotplug-resident-eject-icon { - icon-size: 16px; -} - -.hotplug-resident-eject-button { - padding: 7px; - border-radius: 5px; - color: #ccc; -} - -.chat-log-message { - color: #888888; -} - -.chat-empty-line { - font-size: 4px; -} - -.chat-received { - padding-left: 4px; -} - -.chat-received:rtl { - padding-left: 0px; - padding-right: 4px; -} - -.chat-sent { - padding-left: 18pt; - color: #959595; -} - -.chat-sent:rtl { - padding-left: 0px; - padding-right: 18pt; -} - -.chat-meta-message { - padding-left: 4px; - font-size: 9pt; - font-weight: bold; - color: #bbbbbb; -} - -.chat-meta-message:rtl { - padding-left: 0px; - padding-right: 4px; -} - -.chat-notification-scrollview{ - max-height: 22em; -} - -.subscription-message { - font-style: italic; -} - -.notification StEntry { - /*border-radius: 4px;*/ -} - -.summary-source-button { - padding: 6px 3px 6px 3px; -} - -.summary-source-button:last-child:ltr { - padding-right: 6px; -} - -.summary-source-button:last-child:rtl { - padding-left: 6px; -} - -.summary-source-button:hover .summary-source { - background-color: rgba(255,255,255,0.1); -} - -.summary-source-button:focus .summary-source, -.summary-source-button:selected .summary-source { - background-color: rgba(255,255,255,0.33); -} + padding-bottom: 8px; } + .summary-boxpointer-stack-scrollview:ltr { + padding-right: 8px; } + .summary-boxpointer-stack-scrollview:rtl { + padding-left: 8px; } .summary-source { - border-radius: 4px; - padding: 0 6px 0 6px; - transition-duration: 100ms; -} - -.summary-source-counter { - background-image: url("misc/summary-counter.svg"); + border-radius: 4px; + padding: 0 6px 0 6px; + transition-duration: 100ms; } + .summary-source-counter { + background-image: url("common-assets/misc/summary-counter.svg"); background-size: 26px; - color: #fff; + color: #ffffff; font-size: 10pt; font-weight: bold; height: 2.4em; width: 2.4em; - -shell-counter-overlap-x: 13px; - -shell-counter-overlap-y: 13px; -} + -shell-counter-overlap-x: 8px; + -shell-counter-overlap-y: 8px; } + .summary-source-button { + border-radius: 2px; + padding: 6px 3px 6px 3px; } + .summary-source-button:last-child:ltr { + padding-right: 6px; } + .summary-source-button:last-child:rtl { + padding-left: 6px; } + .summary-source-button .summary-source { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + border: 1px solid rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } + .summary-source-button:hover .summary-source { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + border: 1px solid #5294E2; + background-color: rgba(0, 0, 0, 0.3); } + .summary-source-button:focus .summary-source, + .summary-source-button:selected .summary-source { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #ffffff; + border: 1px solid #5294E2; + background-color: #5294E2; } -/* OSD */ -.osd-window { - text-align: center; - font-weight: bold; - spacing: 1em; - padding: 20px; - margin: 32px; - min-width: 64px; - min-height: 64px; - color: #ffffff; - background: none; - border: none; +.url-highlighter { + link-color: #2679db; } + +.notification, #notification-container { + width: 34em; } + +.notification { + font-size: 1em; + color: #BAC3CF; + padding: 12px 12px 12px 12px; + spacing-rows: 4px; + spacing-columns: 10px; + border-image: url("common-assets/misc/notification.svg") 9 9 9 9; } + .notification.multi-line-notification { + padding-bottom: 12px; } + .notification-unexpanded { + min-height: 40px; + height: 40px; } + .notification-with-image { + min-height: 159px; } + .notification-scrollview { + max-height: 10em; + -st-vfade-offset: 0px; } + .notification-scrollview:ltr > StScrollBar { + padding-left: 6px; } + .notification-scrollview:rtl > StScrollBar { + padding-right: 6px; } + .notification-body { + spacing: 5px; } + .notification-actions { + padding-top: 12px; + spacing: 10px; } + .notification-button { + -st-natural-width: 140px; + padding: 4px 4px 5px; + background-gradient-direction: none; } + .notification-button:focus { + -st-natural-width: 140px; + padding: 4px 4px 5px; } + .notification-icon-button { border-radius: 5px; - border-image: url("misc/osd.svg") 10 10 9 11; -} - -.osd-window .level { - padding: 0; - height: 4px; - background-color: rgba(0, 0, 0, 0.5); - border-radius: 2px; - color: #5294E2; -} - -/* App Switcher */ -.switcher-popup { - padding: 8px; - spacing: 16px; -} - -.switcher-list { - background: none; - border: none; - border-image: url("misc/bg.svg") 10 10 35 14; - border-radius: 3px; - padding: 20px; - color: #A8ADB5; -} - -.switcher-list-item-container { - spacing: 8px; -} - -.switcher-list .item-box { - padding: 8px; - border-radius: 2px; -} - -.switcher-list .item-box:outlined { - padding: 6px; - border: 1px solid #5294E2; -} - -.switcher-list .item-box:selected { - color: #ffffff; - background-color: #5294E2; - border: 1px solid #5294E2; -} - -.switcher-list .thumbnail-box { - padding: 2px; - spacing: 4px; -} - -.switcher-list .thumbnail { - width: 256px; -} - -.switcher-list .separator { - width: 1px; - background: rgba(92, 97, 108, 0.33); -} - -.ripple-box { - width: 52px; - height: 52px; - background-image: url("misc/corner-ripple-ltr.svg"); - background-size: contain; -} - -.ripple-box:rtl { - background-image: url("misc/corner-ripple-rtl.svg"); -} - -.switcher-arrow { - border-color: rgba(0,0,0,0); - color: #A8ADB5; -} - -.switcher-arrow:highlighted { - border-color: rgba(0,0,0,0); - color: white; -} - -/* Workspace Switcher */ -.workspace-switcher-group { - padding: 12px; -} - -.workspace-switcher-container { - border-image: url("misc/bg.svg") 10 10 35 14; - border-radius: 3px; - padding: 20px; - padding-bottom: 24px; -} - -.workspace-switcher { - background: transparent; - border: 0px; - border-radius: 0px; - padding: 0px; - spacing: 8px; -} - -.ws-switcher-active-up, .ws-switcher-active-down { - height: 30px; - background-color: #5294E2; - background-size: 96px; - border-radius: 2px; - border: 1px solid #5294E2; -} - -.ws-switcher-active-up { - background-image: url("misc/ws-switch-arrow-up.png"); -} - -.ws-switcher-active-down { - background-image: url("misc/ws-switch-arrow-down.png"); -} - -.ws-switcher-box { - height: 96px; - border: 1px solid rgba(0, 0, 0, 0.33); - background: rgba(0, 0, 0, 0.33); - border-radius: 2px; -} - -/* Tile previews */ -.tile-preview { - background-color: rgba(82, 148, 226, 0.35); - border: 1px solid #5294E2; -} - -.tile-preview-left.on-primary { - /* keep in sync with -panel-corner-radius */ - border-radius: 0; -} - -.tile-preview-right.on-primary { - /* keep in sync with -panel-corner-radius */ - border-radius: 0; -} - -.tile-preview-left.tile-preview-right.on-primary { - /* keep in sync with -panel-corner-radius */ - border-radius: 0; -} - -/* Modal Dialogs */ - -/* Dialog Subject Text Style */ -.show-processes-dialog-subject, -.mount-question-dialog-subject, -.end-session-dialog-subject { - font-size: 11pt; - font-weight: bold; - color: #5c616c; -} - -.modal-dialog { - border-radius: 24px; - background-color: rgba(0.0, 0.0, 0.0, 0.9); - border: 0px solid #868686; - - padding: 0 6px 6px 6px; - - border-image: url("misc/modal.svg") 10 10 10 10; -} - -.modal-dialog > * { - padding: 14px; -} - -.modal-dialog-button-box { - spacing: 21px; - padding-top: 50px; - - padding: 12px 24px; - background-color: #3c4049; - border: solid 0px rgba(0, 0, 0, 0.3); - border-top: 1px; - border-radius: 0px 0px 1px 1px; -} - -.modal-dialog-button { - padding: 4px 32px 5px; -} - -.modal-dialog-button:focus { - padding: 4px 32px 5px; -} - -/* Run Dialog */ - -.run-dialog-label { - font-size: 10pt; - font-weight: normal; - color: #5c616c; - padding-bottom: .8em; -} - -.run-dialog-error-box { - padding-top: 15px; - spacing: 5px; -} - -.modal-dialog .run-dialog-entry { - width: 20em; -} - -.lightbox { - background-color: black; -} - -.flashspot { - background-color: white; -} - -/* End Session Dialog */ -.end-session-dialog { - spacing: 42px; -} - -.end-session-dialog-list { - padding-top: 20px; -} - -.end-session-dialog-layout { - padding-left: 17px; -} - -.end-session-dialog-layout:rtl { - padding-right: 17px; -} - -.end-session-dialog-description { - width: 28em; - padding-bottom: 10px; -} - -.end-session-dialog-description:rtl { - width: 28em; - padding-bottom: 10px; - text-align: right; -} - -.end-session-dialog-warning { - width: 28em; - color: #F27835; - padding-top: 6px; -} - -.end-session-dialog-warning:rtl { - width: 28em; - color: #F27835; - padding-top: 6px; - text-align: right; -} - -.end-session-dialog-logout-icon { - border: 0px solid #8b8b8b; - border-radius: 5px; - width: 48px; - height: 48px; - background-size: contain; -} - -.end-session-dialog-shutdown-icon { - color: #5c616c; - width: 48px; - height: 48px; -} - -.end-session-dialog-inhibitor-layout { - spacing: 16px; - max-height: 200px; - padding-right: 65px; - padding-left: 65px; -} - -.end-session-dialog-session-list, -.end-session-dialog-app-list { - spacing: 1em; -} - -.end-session-dialog-list-header { - font-weight: bold; -} - -.end-session-dialog-list-header:rtl { - text-align: right; -} - -.end-session-dialog-app-list-item, -.end-session-dialog-session-list-item { - spacing: 1em; -} - -.end-session-dialog-app-list-item-name, -.end-session-dialog-session-list-item-name { - font-weight: bold; -} - -.end-session-dialog-app-list-item-description { - color: #686d7a; - font-size: 10pt; -} - -.end-session-dialog .modal-dialog-button:last-child { - color: #ffffff; - background-color: #F04A50; - border-color: #F04A50; -} - -.end-session-dialog .modal-dialog-button:last-child:hover { - color: #ffffff; - background-color: #f47479; - border-color: #f47479; -} - -.end-session-dialog .modal-dialog-button:last-child:active { - color: #ffffff; - background-color: #ee3239; - border-color: #ee3239; -} - -/* Restart message */ -.restart-message { - font-size: 14pt; -} - -/* ShellMountOperation Dialogs */ -.shell-mount-operation-icon { - icon-size: 48px; -} - -.show-processes-dialog, -.mount-question-dialog { - spacing: 24px; -} - -.show-processes-dialog-subject, -.mount-question-dialog-subject { - padding-top: 10px; - padding-left: 17px; - padding-bottom: 6px; -} - -.mount-question-dialog-subject { - max-width: 500px; -} - -.show-processes-dialog-subject:rtl, -.mount-question-dialog-subject:rtl { + padding: 5px; + background-gradient-direction: none; } + .notification-icon-button:focus { + padding: 5px; } + .notification-icon-button > StIcon { + icon-size: 16px; + padding: 8px; } + .notification StEntry { + padding: 7px; + caret-color: #BAC3CF; + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + background-color: rgba(0, 0, 0, 0.2); + border: 1px solid rgba(0, 0, 0, 0.4); } + .notification StEntry:focus { + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + background-color: rgba(0, 0, 0, 0.2); + border: 1px solid #5294E2; } + +.secondary-icon { + icon-size: 1.09em; } + +.chat-body { + spacing: 5px; } + +.chat-response { + margin: 5px; } + +.chat-log-message { + color: #BAC3CF; } + +.chat-new-group { + padding-top: 1em; } + +.chat-received { + padding-left: 4px; } + .chat-received:rtl { padding-left: 0px; - padding-right: 17px; -} + padding-right: 4px; } -.show-processes-dialog-description, -.mount-question-dialog-description { - padding-left: 17px; - width: 28em; -} +StEntry.chat-response { + padding: 7px; + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + background-color: rgba(0, 0, 0, 0.2); + border: 1px solid rgba(0, 0, 0, 0.4); } + StEntry.chat-response:focus { + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + background-color: rgba(0, 0, 0, 0.2); + border: 1px solid #5294E2; } -.show-processes-dialog-description:rtl, -.mount-question-dialog-description:rtl { - padding-right: 17px; -} +.chat-sent { + padding-left: 18pt; + color: #5294E2; } + .chat-sent:rtl { + padding-left: 0; + padding-right: 18pt; } -.show-processes-dialog-app-list { - font-size: 10pt; - max-height: 200px; - padding-top: 24px; - padding-left: 49px; - padding-right: 32px; -} +.chat-meta-message { + padding-left: 4px; + font-size: 9pt; + font-weight: bold; + color: rgba(186, 195, 207, 0.6); } + .chat-meta-message:rtl { + padding-left: 0; + padding-right: 4px; } -.show-processes-dialog-app-list:rtl { - padding-right: 49px; - padding-left: 32px; -} +.subscription-message { + font-style: italic; } -.show-processes-dialog-app-list-item { - color: #ccc; -} +.hotplug-transient-box { + spacing: 6px; + padding: 2px 72px 2px 12px; } -.show-processes-dialog-app-list-item:hover { - color: white; -} +.hotplug-notification-item { + padding: 2px 10px; } + .hotplug-notification-item:focus { + padding: 2px 10px; } -.show-processes-dialog-app-list-item:ltr { - padding-right: 1em; -} +.hotplug-notification-item-icon { + icon-size: 24px; + padding: 2px 5px; } -.show-processes-dialog-app-list-item:rtl { - padding-left: 1em; -} +.hotplug-resident-box { + spacing: 8px; } -.show-processes-dialog-app-list-item-icon:ltr { - padding-right: 17px; -} +.hotplug-resident-mount { + spacing: 8px; + border-radius: 2px 0 0 2px; + background-gradient-direction: none; } -.show-processes-dialog-app-list-item-icon:rtl { - padding-left: 17px; -} +.hotplug-resident-mount-label { + color: inherit; + padding-left: 6px; } -.show-processes-dialog-app-list-item-name { - font-size: 10pt; -} +.hotplug-resident-mount-icon { + icon-size: 24px; + padding-left: 6px; } -/* Password or Authentication Dialog */ -.prompt-dialog { - /* this is the width of the entire modal popup */ - width: 500px; -} +.hotplug-resident-eject-icon { + icon-size: 16px; } -.prompt-dialog-main-layout { - spacing: 24px; - padding: 10px; -} - -.prompt-dialog-message-layout { - spacing: 16px; -} - -.prompt-dialog-headline { - font-size: 12pt; - font-weight: bold; - color: #666666; -} - -.prompt-dialog-description:rtl { - text-align: right; -} - -.prompt-dialog-password-box { - spacing: 1em; - padding-bottom: 1em; -} - -.prompt-dialog-error-label { - font-size: 1em; - color: #FF6767; - padding-bottom: 8px; -} - -.prompt-dialog-info-label { - font-size: 1em; - padding-bottom: 8px; -} - -.hidden { - color: rgba(0,0,0,0); -} - -.prompt-dialog-null-label { - font-size: 1em; - padding-bottom: 8px; -} - -/* Polkit Dialog */ - -.polkit-dialog-user-layout { - padding-left: 10px; - spacing: 10px; -} - -.polkit-dialog-user-layout:rtl { - padding-left: 0px; - padding-right: 10px; -} - -.polkit-dialog-user-root-label { - color: #ff0000; -} - -.polkit-dialog-user-icon { - border: 2px solid #8b8b8b; - border-radius: 5px; - background-size: contain; - width: 48px; - height: 48px; -} - -/* Network Agent Dialog */ - -.network-dialog-secret-table { - spacing-rows: 15px; - spacing-columns: 1em; -} - -.keyring-dialog-control-table { - spacing-rows: 15px; - spacing-columns: 1em; -} - -/* Magnifier */ +.hotplug-resident-eject-button { + padding: 7px; + border-radius: 0 2px 2px 0; + color: #BAC3CF; + border-left: none; } .magnifier-zoom-region { - border: 2px solid rgba(128, 0, 0, 255); -} - -.magnifier-zoom-region.full-screen { - border-width: 0px; -} - -/* On-screen Keyboard */ + border: 2px solid #5294E2; } + .magnifier-zoom-region.full-screen { + border-width: 0; } #keyboard { - background: rgba(0,0,0,0.8); -} + background-color: rgba(42, 44, 51, 0.95); + border-width: 0; + border-top-width: 1px; + border-color: rgba(0, 0, 0, 0.4); } .keyboard-layout { - spacing: 10px; - padding: 10px; -} + spacing: 10px; + padding: 10px; } .keyboard-row { - spacing: 15px; -} + spacing: 15px; } .keyboard-key { - min-height: 30px; - min-width: 30px; - background-gradient-start: rgba(255,245,245,0.4); - background-gradient-end: rgba(105,105,105,0.1); - background-gradient-direction: vertical; - font-size: 14pt; - font-weight: bold; - border-radius: 10px; - border: 2px solid #a0a0a0; - color: white; -} - -.keyboard-key:grayed { - color: #808080; - border-color: #808080; -} - -.keyboard-key:checked, -.keyboard-key:hover { - background: #303030; - border: 3px solid white; -} - -.keyboard-key:active { - background: #808080; -} + min-height: 2em; + min-width: 2em; + font-size: 14pt; + font-weight: bold; + border-radius: 3px; + box-shadow: none; + background-gradient-direction: none; + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + border: 1px solid rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } + .keyboard-key:hover { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + border: 1px solid #5294E2; + background-color: rgba(0, 0, 0, 0.3); } + .keyboard-key:active, .keyboard-key:checked { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #ffffff; + border: 1px solid #5294E2; + background-color: #5294E2; } + .keyboard-key:grayed { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #555a62; + border: 1px solid rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .keyboard-subkeys { - color: white; - padding: 5px; - -arrow-border-radius: 10px; - -arrow-background-color: #090909; - -arrow-border-width: 2px; - -arrow-border-color: white; - -arrow-base: 20px; - -arrow-rise: 10px; - -boxpointer-gap: 5px; -} - -/* IBus Candidate Popup */ + color: #BAC3CF; + padding: 5px; + -arrow-border-radius: 2px; + -arrow-background-color: rgba(42, 44, 51, 0.95); + -arrow-border-width: 1px; + -arrow-border-color: rgba(0, 0, 0, 0.4); + -arrow-base: 20px; + -arrow-rise: 10px; + -boxpointer-gap: 5px; } .candidate-popup-content { - padding: 0.5em; - spacing: 0.3em; - color: #A8ADB5; - font-size: 1.15em; -} + padding: 0.5em; + spacing: 0.3em; + color: #BAC3CF; + font-size: 1.15em; } .candidate-index { - padding: 0 0.5em 0 0; - color: #c4c7cc; -} + padding: 0 0.5em 0 0; + color: #d8dde4; } .candidate-box { - color: #A8ADB5; - padding: 0.3em 0.5em 0.3em 0.5em; -} - -.candidate-box:selected { - border-radius: 4px; + padding: 0.3em 0.5em 0.3em 0.5em; + border-radius: 2px; + color: #BAC3CF; } + .candidate-box:selected, .candidate-box:hover { background-color: #5294E2; - color: #ffffff; -} + color: #ffffff; } -.candidate-box:hover { - border-radius: 4px; - background-color: rgba(255,255,255,0.1); -} .candidate-page-button-box { - height: 2em; - width: 80px; -} + height: 2em; } + .vertical .candidate-page-button-box { + padding-top: 0.5em; } + .horizontal .candidate-page-button-box { + padding-left: 0.5em; } -.vertical .candidate-page-button-box { - padding-top: 0.5em; -} - -.horizontal .candidate-page-button-box { - padding-left: 0.5em; -} +.candidate-page-button { + padding: 4px; } .candidate-page-button-previous { - border-radius: 4px 0px 0px 4px; -} + border-radius: 2px 0px 0px 2px; + border-right-width: 0; } .candidate-page-button-next { - border-radius: 0px 4px 4px 0px; -} + border-radius: 0px 2px 2px 0px; } .candidate-page-button-icon { - icon-size: 1em; -} - -/* Login Dialog */ + icon-size: 1em; } .framed-user-icon { - border: 2px solid #8b8b8b; - border-radius: 3px; - background-size: contain; -} + background-size: contain; + border: 0px solid transparent; + color: #5c616c; + border-radius: 2px; } + .framed-user-icon:hover { + border-color: transparent; + color: white; } -.framed-user-icon:hover { - border: 2px solid #bbbbbb; -} - -.login-dialog-banner { - font-size: 10pt; - font-weight: bold; - text-align: center; - color: #666666; - padding-bottom: 1em; -} +.login-dialog-banner-view { + padding-top: 24px; + max-width: 23em; } .login-dialog { - /* Reset border and background */ - border: none; - background-color: transparent; -} + border: none; + background-color: transparent; } + .login-dialog .modal-dialog-button-box { + spacing: 3px; } + .login-dialog .modal-dialog-button { + padding: 3px 18px; } + .login-dialog .modal-dialog-button:default { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #5c616c; + background-color: #fbfbfc; + border: 1px solid #cfd6e6; } + .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #5c616c; + background-color: #fbfbfc; + border: 1px solid #5294E2; } + .login-dialog .modal-dialog-button:default:active { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #ffffff; + background-color: #5294E2; + border: 1px solid #5294E2; } + .login-dialog .modal-dialog-button:default:insensitive { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: rgba(92, 97, 108, 0.55); + border: 1px solid rgba(207, 214, 230, 0.55); + background-color: rgba(251, 251, 252, 0.55); } + +.login-dialog-logo-bin { + padding: 24px 0px; } + +.login-dialog-banner { + color: #9ca9ba; } .login-dialog-button-box { - spacing: 5px; -} + spacing: 5px; } -.login-dialog-user-list-view { - -st-vfade-offset: 1em; -} +.login-dialog-message-warning { + color: #F27835; } -.login-dialog-user-list { - spacing: 12px; - padding: .2em; - width: 23em; -} - -.login-dialog-user-list-item { - border-radius: 5px; - padding: .2em; - color: #bfbfbf; - text-shadow: black 0px 2px 2px; -} - -.login-dialog-user-list-item:ltr { - padding-right: 1em; -} - -.login-dialog-user-list-item:rtl { - padding-left: 1em; -} - -.login-dialog-user-list-item:hover { - background-color: rgba(255,255,255,0.1); -} - -.login-dialog-user-list:expanded .login-dialog-user-list-item:focus { - background-color: rgba(255,255,255,0.33); -} - -.login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in { - background-image: url("misc/logged-in-indicator.svg"); - background-size: contain; -} - -.login-dialog-user-list-item .login-dialog-timed-login-indicator { - background-color: rgba(0,0,0,0.0); - height: 2px; -} - -.login-dialog-user-list-item:focus .login-dialog-timed-login-indicator { - background-color: #8b8b8b; -} - -.login-dialog-not-listed-label { - font-size: 10.5pt; - font-weight: bold; - color: #666666; - padding-top: 1em; -} +.login-dialog-message-hint { + padding-top: 0; + padding-bottom: 20px; } .login-dialog-user-selection-box { - padding: 100px 0; -} + padding: 100px 0px; } + .login-dialog-user-selection-box .login-dialog-not-listed-label { + padding-left: 2px; } + .login-dialog-not-listed-button:focus .login-dialog-user-selection-box .login-dialog-not-listed-label, + .login-dialog-not-listed-button:hover .login-dialog-user-selection-box .login-dialog-not-listed-label { + color: #BAC3CF; } -.login-dialog-user-selection-box .login-dialog-not-listed-label { - padding-left: 2px; -} +.login-dialog-not-listed-label { + font-size: 90%; + font-weight: bold; + color: #62758e; + padding-top: 1em; } -.login-dialog-not-listed-button:focus .login-dialog-not-listed-label, -.login-dialog-not-listed-button:hover .login-dialog-not-listed-label { - color: #E8E8E8; -} +.login-dialog-user-list-view { + -st-vfade-offset: 1em; } + +.login-dialog-user-list { + spacing: 12px; + padding: .2em; + width: 23em; } + .login-dialog-user-list:expanded .login-dialog-user-list-item:focus { + background-color: #5294E2; + color: #ffffff; } + .login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in { + border-right: 2px solid #5294E2; } + +.login-dialog-user-list-item { + border-radius: 5px; + padding: .2em; + color: #62758e; } + .login-dialog-user-list-item:ltr { + padding-right: 1em; } + .login-dialog-user-list-item:rtl { + padding-left: 1em; } + .login-dialog-user-list-item:hover { + background-color: #5294E2; + color: #ffffff; } + .login-dialog-user-list-item .login-dialog-timed-login-indicator { + height: 2px; + margin: 2px 0 0 0; + background-color: #BAC3CF; } + .login-dialog-user-list-item:focus .login-dialog-timed-login-indicator { + background-color: #ffffff; } .login-dialog-username, .user-widget-label { - font-size: 16pt; - font-weight: bold; - text-align: left; - padding-left: 15px; - text-shadow: rgba(0, 0, 0, 0.5) 0px 2px 1px 0px; -} - -.login-dialog-prompt-layout { - padding-top: 24px; - padding-bottom: 12px; - spacing: 8px; - width: 23em; -} - -.login-dialog-prompt-label { - color: #eeeeee; - font-size: 14px; - padding-top: 11px; -} - -.login-dialog-session-list-button StIcon { - icon-size: 1.25em; -} - -.login-dialog-session-list-button { - color: #8b8b8b; -} - -.login-dialog-session-list-button:hover, -.login-dialog-session-list-button:focus, -.login-dialog-session-list-button:active { - color: white; -} - -.login-dialog-logo-bin { - padding: 24px 0px; -} - -.login-dialog .modal-dialog-button-box { - spacing: 3px; -} - -.login-dialog .modal-dialog-button { - border-radius: 5px; - padding: 3px 18px; -} - -.login-dialog .modal-dialog-button:focus { - padding: 2px 17px; -} - -.login-dialog .modal-dialog-button:default { - background-gradient-start: #6793c4; - background-gradient-end: #335d8f; - background-gradient-direction: vertical; - border-color: #16335d; -} - -.login-dialog .modal-dialog-button:default:focus { - border: 2px solid #377fe7; -} - -.login-dialog .modal-dialog-button:default:hover { - background-gradient-start: #74a0d0; - background-gradient-end: #436d9f; -} - -.login-dialog .modal-dialog-button:default:active, -.login-dialog .modal-dialog-button:default:pressed { - background-gradient-start: #436d9f; - background-gradient-end: #74a0d0; -} - -.login-dialog .modal-dialog-button:default:insensitive { - border-color: #666666; - color: #9f9f9f; - background-gradient-direction: none; - background-color: rgba(102, 102, 102, 0.15); -} - -.login-dialog-message { - padding-top: 4px; - padding-bottom: 16px; - min-height: 2em; -} - -.login-dialog-message-warning { - color: orange; -} - -.login-dialog-message-hint { - padding-top: 0px; - padding-bottom: 20px; -} - -.user-widget-label { -} + color: #BAC3CF; + font-size: 120%; + font-weight: bold; + text-align: left; + padding-left: 15px; } .user-widget-label:ltr { - padding-left: 18px; -} + padding-left: 18px; } .user-widget-label:rtl { - padding-right: 18px; -} + padding-right: 18px; } -/* Screen shield */ +.login-dialog-prompt-layout { + padding-top: 24px; + padding-bottom: 12px; + spacing: 8px; + width: 23em; } -#panel.lock-screen, -#screenShieldNotifications { - background-color: rgba(0,0,0,0.3); -} +.login-dialog-prompt-label { + color: #7e8fa5; + font-size: 110%; + padding-top: 1em; } -.screen-shield-background { - background: black; - box-shadow: 0px 4px 8px rgba(0,0,0,0.9); -} +.login-dialog-session-list-button StIcon { + icon-size: 1.25em; } -#lockDialogGroup { - background: #2e3436 url(misc/noise-texture.png); - background-repeat: repeat; -} +.login-dialog-session-list-button { + color: #62758e; } + .login-dialog-session-list-button:hover, .login-dialog-session-list-button:focus { + color: #BAC3CF; } + .login-dialog-session-list-button:active { + color: #394351; } .screen-shield-arrows { - padding-bottom: 3em; -} + padding-bottom: 3em; } .screen-shield-arrows Gjs_Arrow { - color: white; - width: 80px; - height: 48px; - -arrow-thickness: 12px; - -arrow-shadow: 0 1px 1px rgba(0,0,0,0.4); -} - -.screen-shield-contents-box { - spacing: 48px; -} + color: white; + width: 80px; + height: 48px; + -arrow-thickness: 12px; + -arrow-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); } .screen-shield-clock { - color: white; - text-shadow: 0px 1px 2px rgba(0,0,0,0.6); - font-weight: bold; - text-align: center; - padding-bottom: 1.5em; -} + color: white; + text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.6); + font-weight: bold; + text-align: center; + padding-bottom: 1.5em; } .screen-shield-clock-time { - font-size: 72pt; - text-shadow: 0px 2px 2px rgba(0,0,0,0.4); -} + font-size: 72pt; + text-shadow: 0px 2px 2px rgba(0, 0, 0, 0.4); } .screen-shield-clock-date { - font-size: 28pt; -} + font-size: 28pt; } -#screenShieldNotifications { - max-height: 500px; - padding: 12px; -} - -.screen-shield-notifications-box { - spacing: 12px; - width: 30em; -} - -.screen-shield-notification-source { - padding: 3px 6px; - spacing: 5px; -} +.screen-shield-notifications-container { + spacing: 6px; + width: 30em; + background-color: transparent; + max-height: 500px; } + .screen-shield-notifications-container .summary-notification-stack-scrollview { + padding-top: 0; + padding-bottom: 0; } + .screen-shield-notifications-container .notification, + .screen-shield-notifications-container .screen-shield-notification-source { + padding: 12px 6px; + border: 1px solid rgba(186, 195, 207, 0.2); + background-color: rgba(42, 44, 51, 0.45); + color: #BAC3CF; + border-radius: 4px; } + .screen-shield-notifications-container .notification { + margin-right: 15px; } .screen-shield-notification-label { - font-weight: bold; - padding: 0px 0px 0px 12px; -} + font-weight: bold; + padding: 0px 0px 0px 12px; } .screen-shield-notification-count-text { - padding: 0px 0px 0px 12px; -} + padding: 0px 0px 0px 12px; } -/* Remove background from notifications, otherwise - opacity is doubled and they look darker -*/ -.screen-shield-notifications-box .notification { - background-color: transparent; -} +#panel.lock-screen { + background-color: rgba(42, 44, 51, 0.5); } -/* Override padding on resident notifications, since - the notifications box has its own spacing -*/ -.screen-shield-notifications-box .summary-notification-stack-scrollview { - padding-top: 0px; - padding-bottom: 0px; -} +.screen-shield-background { + background: black; + box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.4); } -#screenShieldNotifications .notification-button, -#screenShieldNotifications .notification-icon-button { - border: 1px rgba(255,255,255,0.5); -} +#lockDialogGroup { + background: #2e3436 url(misc/noise-texture.png); + background-repeat: repeat; } -#screenShieldNotifications StScrollBar StBin#trough { - background-color: rgba(0,0,0,0.2); -} +#screenShieldNotifications StButton#vhandle, #screenShieldNotifications StButton#hhandle { + background-color: rgba(245, 246, 247, 0.3); } + #screenShieldNotifications StButton#vhandle:hover, #screenShieldNotifications StButton#vhandle:focus, #screenShieldNotifications StButton#hhandle:hover, #screenShieldNotifications StButton#hhandle:focus { + background-color: rgba(245, 246, 247, 0.5); } + #screenShieldNotifications StButton#vhandle:active, #screenShieldNotifications StButton#hhandle:active { + background-color: rgba(82, 148, 226, 0.5); } -#screenShieldNotifications StScrollBar StButton#vhandle, -#screenShieldNotifications StScrollBar StButton#hhandle { - background-color: rgba(0,0,0,0.3); +#LookingGlassDialog { + spacing: 4px; + padding: 8px 8px 10px 8px; + background-color: rgba(0, 0, 0, 0.7); + border: 1px solid black; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + border-radius: 2px; + color: #BAC3CF; } + #LookingGlassDialog > #Toolbar { + padding: 3px; border: none; -} + background-color: transparent; + border-radius: 0px; } + #LookingGlassDialog .labels { + spacing: 4px; } + #LookingGlassDialog .notebook-tab { + -natural-hpadding: 12px; + -minimum-hpadding: 6px; + font-weight: bold; + color: #BAC3CF; + transition-duration: 100ms; + padding-left: .3em; + padding-right: .3em; } + #LookingGlassDialog .notebook-tab:hover { + color: #ffffff; + text-shadow: black 0px 2px 2px; } + #LookingGlassDialog .notebook-tab:selected { + border-bottom-width: 0px; + color: #5294E2; + text-shadow: black 0px 2px 2px; } + #LookingGlassDialog StBoxLayout#EvalBox { + padding: 4px; + spacing: 4px; } + #LookingGlassDialog StBoxLayout#ResultsArea { + spacing: 4px; } -#screenShieldNotifications StScrollBar StButton#vhandle:hover, -#screenShieldNotifications StScrollBar StButton#hhandle { - background-color: rgba(0,0,0,0.6); -} +.lg-dialog StEntry { + selection-background-color: #5294E2; + selected-color: #ffffff; + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + background-color: rgba(0, 0, 0, 0.2); + border: 1px solid rgba(0, 0, 0, 0.4); } + .lg-dialog StEntry:focus { + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + background-color: rgba(0, 0, 0, 0.2); + border: 1px solid #5294E2; } -#screenShieldNotifications StScrollBar StButton#vhandle:active, -#screenShieldNotifications StScrollBar StButton#hhandle { - background-color: rgba(0,0,0,0.8); -} +.lg-dialog .shell-link { + color: #2679db; } + .lg-dialog .shell-link:hover { + color: #5294e2; } -.input-source-switcher-symbol { - font-size: 34pt; - width: 96px; - height: 96px; -} +.lg-completions-text { + font-size: .9em; + font-style: italic; } -/* Background menu */ +.lg-obj-inspector-title { + spacing: 4px; } -.background-menu { - -boxpointer-gap: 4px; - -arrow-rise: 0px; -} +.lg-obj-inspector-button { + border: 1px solid gray; + padding: 4px; + border-radius: 4px; } + .lg-obj-inspector-button:hover { + border: 1px solid #ffffff; } + +#lookingGlassExtensions { + padding: 4px; } + +.lg-extensions-list { + padding: 4px; + spacing: 6px; } + +.lg-extension { + border: 1px solid rgba(0, 0, 0, 0.7); + border-radius: 2px; + background-color: rgba(42, 44, 51, 0.95); + padding: 4px; } + +.lg-extension-name { + font-weight: bold; } + +.lg-extension-meta { + spacing: 6px; } + +#LookingGlassPropertyInspector { + background: rgba(0, 0, 0, 0.7); + border: 1px solid grey; + border-radius: 2px; + padding: 6px; } diff --git a/common/gnome-shell/3.14/gulpfile.js b/common/gnome-shell/3.14/gulpfile.js new file mode 100644 index 0000000..230ac9d --- /dev/null +++ b/common/gnome-shell/3.14/gulpfile.js @@ -0,0 +1,18 @@ +var gulp = require("gulp"); +var sass = require("gulp-sass"); +var filter = require('gulp-filter'); + +gulp.task('sass', function () { + return gulp.src('sass/*.scss') + .pipe(sass({ + outputStyle: 'nested', + precision: 5, + onError: function (err) { + notify().write(err); + } + })) + .pipe(gulp.dest('.')) +}); + + +gulp.task('default', ['sass']); diff --git a/common/gnome-shell/3.14/checkbox/checkbox-checked-focused.svg b/common/gnome-shell/3.14/light-assets/checkbox/checkbox-checked-focused.svg similarity index 100% rename from common/gnome-shell/3.14/checkbox/checkbox-checked-focused.svg rename to common/gnome-shell/3.14/light-assets/checkbox/checkbox-checked-focused.svg diff --git a/common/gnome-shell/3.14/checkbox/checkbox-checked.svg b/common/gnome-shell/3.14/light-assets/checkbox/checkbox-checked.svg similarity index 100% rename from common/gnome-shell/3.14/checkbox/checkbox-checked.svg rename to common/gnome-shell/3.14/light-assets/checkbox/checkbox-checked.svg diff --git a/common/gnome-shell/3.14/checkbox/checkbox-unchecked-focused.svg b/common/gnome-shell/3.14/light-assets/checkbox/checkbox-unchecked-focused.svg similarity index 100% rename from common/gnome-shell/3.14/checkbox/checkbox-unchecked-focused.svg rename to common/gnome-shell/3.14/light-assets/checkbox/checkbox-unchecked-focused.svg diff --git a/common/gnome-shell/3.14/checkbox/checkbox-unchecked.svg b/common/gnome-shell/3.14/light-assets/checkbox/checkbox-unchecked.svg similarity index 100% rename from common/gnome-shell/3.14/checkbox/checkbox-unchecked.svg rename to common/gnome-shell/3.14/light-assets/checkbox/checkbox-unchecked.svg diff --git a/common/gnome-shell/3.16/menu/menu-hover.svg b/common/gnome-shell/3.14/light-assets/menu/menu-hover.svg similarity index 93% rename from common/gnome-shell/3.16/menu/menu-hover.svg rename to common/gnome-shell/3.14/light-assets/menu/menu-hover.svg index d371bd7..938245a 100644 --- a/common/gnome-shell/3.16/menu/menu-hover.svg +++ b/common/gnome-shell/3.14/light-assets/menu/menu-hover.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="1.0550014" - inkscape:cy="18.020602" + inkscape:cx="4.0327991" + inkscape:cy="13.945988" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -69,7 +69,7 @@ id="layer1" transform="translate(-137,-382.36221)"> diff --git a/common/gnome-shell/3.14/light-assets/menu/menu.svg b/common/gnome-shell/3.14/light-assets/menu/menu.svg new file mode 100644 index 0000000..5ae7466 --- /dev/null +++ b/common/gnome-shell/3.14/light-assets/menu/menu.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/menu/submenu-open.svg b/common/gnome-shell/3.14/light-assets/menu/submenu-open.svg similarity index 85% rename from common/gnome-shell/3.16/menu/submenu-open.svg rename to common/gnome-shell/3.14/light-assets/menu/submenu-open.svg index 5d57a31..8062443 100644 --- a/common/gnome-shell/3.16/menu/submenu-open.svg +++ b/common/gnome-shell/3.14/light-assets/menu/submenu-open.svg @@ -28,8 +28,8 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="16.000001" - inkscape:cx="19.724947" - inkscape:cy="6.8134088" + inkscape:cx="7.5374477" + inkscape:cy="6.5634088" inkscape:document-units="px" inkscape:current-layer="g3027" showgrid="true" @@ -76,7 +76,7 @@ image/svg+xml - + @@ -91,27 +91,19 @@ - diff --git a/common/gnome-shell/3.14/menu/submenu.svg b/common/gnome-shell/3.14/light-assets/menu/submenu.svg similarity index 86% rename from common/gnome-shell/3.14/menu/submenu.svg rename to common/gnome-shell/3.14/light-assets/menu/submenu.svg index 9172367..766c82e 100644 --- a/common/gnome-shell/3.14/menu/submenu.svg +++ b/common/gnome-shell/3.14/light-assets/menu/submenu.svg @@ -28,8 +28,8 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="16.000001" - inkscape:cx="19.724947" - inkscape:cy="6.8134088" + inkscape:cx="7.5374477" + inkscape:cy="6.5634088" inkscape:document-units="px" inkscape:current-layer="g3027" showgrid="true" @@ -91,27 +91,19 @@ - diff --git a/common/gnome-shell/3.16/misc/calendar-arrow-left-hover.svg b/common/gnome-shell/3.14/light-assets/misc/calendar-arrow-left-hover.svg similarity index 100% rename from common/gnome-shell/3.16/misc/calendar-arrow-left-hover.svg rename to common/gnome-shell/3.14/light-assets/misc/calendar-arrow-left-hover.svg diff --git a/common/gnome-shell/3.16/misc/calendar-arrow-left.svg b/common/gnome-shell/3.14/light-assets/misc/calendar-arrow-left.svg similarity index 100% rename from common/gnome-shell/3.16/misc/calendar-arrow-left.svg rename to common/gnome-shell/3.14/light-assets/misc/calendar-arrow-left.svg diff --git a/common/gnome-shell/3.16/misc/calendar-arrow-right-hover.svg b/common/gnome-shell/3.14/light-assets/misc/calendar-arrow-right-hover.svg similarity index 100% rename from common/gnome-shell/3.16/misc/calendar-arrow-right-hover.svg rename to common/gnome-shell/3.14/light-assets/misc/calendar-arrow-right-hover.svg diff --git a/common/gnome-shell/3.16/misc/calendar-arrow-right.svg b/common/gnome-shell/3.14/light-assets/misc/calendar-arrow-right.svg similarity index 100% rename from common/gnome-shell/3.16/misc/calendar-arrow-right.svg rename to common/gnome-shell/3.14/light-assets/misc/calendar-arrow-right.svg diff --git a/common/gnome-shell/3.14/light-assets/misc/message-active.svg b/common/gnome-shell/3.14/light-assets/misc/message-active.svg new file mode 100644 index 0000000..06860fd --- /dev/null +++ b/common/gnome-shell/3.14/light-assets/misc/message-active.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/common/gnome-shell/3.14/light-assets/misc/message-close-active.svg b/common/gnome-shell/3.14/light-assets/misc/message-close-active.svg new file mode 100644 index 0000000..58fab12 --- /dev/null +++ b/common/gnome-shell/3.14/light-assets/misc/message-close-active.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/light-assets/misc/message-close-hover.svg b/common/gnome-shell/3.14/light-assets/misc/message-close-hover.svg new file mode 100644 index 0000000..359aad5 --- /dev/null +++ b/common/gnome-shell/3.14/light-assets/misc/message-close-hover.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/light-assets/misc/message-close.svg b/common/gnome-shell/3.14/light-assets/misc/message-close.svg new file mode 100644 index 0000000..cd11de2 --- /dev/null +++ b/common/gnome-shell/3.14/light-assets/misc/message-close.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/light-assets/misc/message-hover.svg b/common/gnome-shell/3.14/light-assets/misc/message-hover.svg new file mode 100644 index 0000000..64a79b6 --- /dev/null +++ b/common/gnome-shell/3.14/light-assets/misc/message-hover.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.14/light-assets/misc/message.svg b/common/gnome-shell/3.14/light-assets/misc/message.svg new file mode 100644 index 0000000..a1f8615 --- /dev/null +++ b/common/gnome-shell/3.14/light-assets/misc/message.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.14/light-assets/misc/modal.svg b/common/gnome-shell/3.14/light-assets/misc/modal.svg new file mode 100644 index 0000000..b61f537 --- /dev/null +++ b/common/gnome-shell/3.14/light-assets/misc/modal.svg @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/switch/switch-off.svg b/common/gnome-shell/3.14/light-assets/switch/switch-off.svg similarity index 97% rename from common/gnome-shell/3.16/switch/switch-off.svg rename to common/gnome-shell/3.14/light-assets/switch/switch-off.svg index 908e1af..96749e2 100644 --- a/common/gnome-shell/3.16/switch/switch-off.svg +++ b/common/gnome-shell/3.14/light-assets/switch/switch-off.svg @@ -9,8 +9,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="52" - height="24" + width="50" + height="20" id="svg7539" version="1.1" inkscape:version="0.91 r13725" @@ -100,8 +100,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="8.2495794" - inkscape:cx="26.503493" - inkscape:cy="2.8843151" + inkscape:cx="19.533441" + inkscape:cy="12.339343" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" @@ -148,9 +148,9 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" - transform="translate(-120,91.999997)"> + transform="translate(-120,87.999997)"> diff --git a/common/gnome-shell/3.14/switch/switch-on.svg b/common/gnome-shell/3.14/light-assets/switch/switch-on.svg similarity index 96% rename from common/gnome-shell/3.14/switch/switch-on.svg rename to common/gnome-shell/3.14/light-assets/switch/switch-on.svg index f7b1bfc..0203bbb 100644 --- a/common/gnome-shell/3.14/switch/switch-on.svg +++ b/common/gnome-shell/3.14/light-assets/switch/switch-on.svg @@ -9,8 +9,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="52" - height="24" + width="50" + height="20" id="svg7539" version="1.1" inkscape:version="0.91 r13725" @@ -99,9 +99,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="8.2495794" - inkscape:cx="26.503493" - inkscape:cy="31.976708" + inkscape:zoom="32.998318" + inkscape:cx="6.3160735" + inkscape:cy="9.1853829" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" @@ -140,7 +140,7 @@ image/svg+xml - + @@ -148,9 +148,9 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" - transform="translate(-120,91.999997)"> + transform="translate(-120,87.999997)"> diff --git a/common/gnome-shell/3.14/menu/menu-arrow-symbolic.svg b/common/gnome-shell/3.14/menu/menu-arrow-symbolic.svg deleted file mode 100644 index 2ae260c..0000000 --- a/common/gnome-shell/3.14/menu/menu-arrow-symbolic.svg +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/common/gnome-shell/3.14/menu/menu.svg b/common/gnome-shell/3.14/menu/menu.svg deleted file mode 100644 index f363e0b..0000000 --- a/common/gnome-shell/3.14/menu/menu.svg +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/common/gnome-shell/3.14/misc/bg.svg b/common/gnome-shell/3.14/misc/bg.svg deleted file mode 100644 index 5e219e0..0000000 --- a/common/gnome-shell/3.14/misc/bg.svg +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/common/gnome-shell/3.14/misc/logged-in-indicator.svg b/common/gnome-shell/3.14/misc/logged-in-indicator.svg deleted file mode 100755 index c0267ea..0000000 --- a/common/gnome-shell/3.14/misc/logged-in-indicator.svg +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/gnome-shell/3.14/misc/modal.svg b/common/gnome-shell/3.14/misc/modal.svg deleted file mode 100644 index 5648294..0000000 --- a/common/gnome-shell/3.14/misc/modal.svg +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/common/gnome-shell/3.14/misc/noise-texture.png b/common/gnome-shell/3.14/misc/noise-texture.png deleted file mode 100755 index 6b70a2d40790fcbec68b2db067f4f6b0d47ec740..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 79464 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 MD{I5+6fGkE2SYF}a{vGU diff --git a/common/gnome-shell/3.14/misc/osd.svg b/common/gnome-shell/3.14/misc/osd.svg deleted file mode 100644 index 64bf7f4..0000000 --- a/common/gnome-shell/3.14/misc/osd.svg +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/common/gnome-shell/3.14/misc/panel-button-highlight.svg b/common/gnome-shell/3.14/misc/panel-button-highlight.svg deleted file mode 100644 index 11b9c89..0000000 --- a/common/gnome-shell/3.14/misc/panel-button-highlight.svg +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/common/gnome-shell/3.14/misc/process-working.svg b/common/gnome-shell/3.14/misc/process-working.svg deleted file mode 100755 index 43ffcca..0000000 --- a/common/gnome-shell/3.14/misc/process-working.svg +++ /dev/null @@ -1,811 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/gnome-shell/3.14/misc/running-indicator.svg b/common/gnome-shell/3.14/misc/running-indicator.svg deleted file mode 100644 index bcfc594..0000000 --- a/common/gnome-shell/3.14/misc/running-indicator.svg +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/gnome-shell/3.14/package.json b/common/gnome-shell/3.14/package.json new file mode 100644 index 0000000..b08961b --- /dev/null +++ b/common/gnome-shell/3.14/package.json @@ -0,0 +1,7 @@ +{ + "devDependencies": { + "gulp": "~3.9.0", + "gulp-filter": "~2.0.2", + "gulp-sass": "~2.0.4" + } +} diff --git a/common/gnome-shell/3.14/sass/_colors.scss b/common/gnome-shell/3.14/sass/_colors.scss new file mode 100644 index 0000000..9c51858 --- /dev/null +++ b/common/gnome-shell/3.14/sass/_colors.scss @@ -0,0 +1,90 @@ +// When color definition differs for dark and light variant, +// it gets @if ed depending on $variant + + +$base_color: if($variant =='light', #ffffff, #383C45); +$text_color: if($variant == 'light', #5c616c, #D3DAE3); +$bg_color: if($variant =='light', #F5F6F7, #444852); +$fg_color: if($variant =='light', #5c616c, #D3DAE3); + +$selected_fg_color: #ffffff; +$selected_bg_color: #5294E2; +$selected_borders_color: darken($selected_bg_color, 20%); +$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,10%)); + +$link_color: if($variant == 'light', darken($selected_bg_color,10%), + lighten($selected_bg_color,20%)); +$link_visited_color: if($variant == 'light', darken($selected_bg_color,20%), + lighten($selected_bg_color,10%)); + +$selection_mode_bg: if($transparency == 'true', transparentize($selected_bg_color, 0.05), $selected_bg_color); +$warning_color: #F27835; +$error_color: #FC4138; +$success_color: #73d216; +$destructive_color: #F04A50; +$suggested_color: #4DADD4; + +//insensitive state derived colors +$insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55)); +$insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%)); + + +$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); +$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); + +$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); +$button_border: $entry_border; + +$header_bg: red; +@if $transparency=='true' and $variant=='light' { $header_bg: transparentize(#e7e8eb, 0.05); } +@if $transparency=='false' and $variant=='light' { $header_bg: #e7e8eb; } +@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343b, 0.03); } +@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343b; } + +$header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%)); + +$header_border: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); + +$header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%)); +$header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg); + +$dark_sidebar_bg: if($transparency == 'true', transparentize(#3c4049, 0.05), #3c4049); +$dark_sidebar_fg: #BAC3CF; +$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 10%)); + +$osd_fg_color: $dark_sidebar_fg; +$osd_bg_color: darken($dark_sidebar_bg, 8%); + +$osd_insensitive_bg_color: darken($osd_bg_color, 3%); +$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%); +$osd_borders_color: transparentize(black, 0.3); + +$panel_bg: darken($osd_bg_color, 4.7%); +$panel_fg: $osd_fg_color; + +//WM Buttons + +// Close +$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f37076, #e45e65); +$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f79da1, #f48085); +$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #ef4048, #e6262f); + +$wm_icon_close_bg: $selected_fg_color; +$wm_icon_close_hover_bg: $selected_fg_color; +$wm_icon_close_active_bg: $selected_fg_color; + +// Minimize, Maximize +$wm_button_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32); +$wm_button_unfocused_bg: if($variant == 'light' and $darker == 'false', #f6f7f8, #2a3035); +$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32); +$wm_button_active_bg: $selected_bg_color; + +$wm_button_border: if($variant == 'light' and $darker == 'false', #d8dae0, #191C21); +$wm_button_unfocused_border: if($variant == 'light' and $darker == 'false', #dddee2, #1F2328); +$wm_button_hover_border: $selected_bg_color; +$wm_button_active_border: $selected_bg_color; + +$wm_icon_bg: if($variant == 'light' and $darker == 'false', #8d93a4, #939ca8); +$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #b8bcc7, #686f78); +$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #70788d, #afb8c5); +$wm_icon_active_bg: $selected_fg_color; diff --git a/common/gnome-shell/3.14/sass/_common.scss b/common/gnome-shell/3.14/sass/_common.scss new file mode 100644 index 0000000..93fcd61 --- /dev/null +++ b/common/gnome-shell/3.14/sass/_common.scss @@ -0,0 +1,2431 @@ +//This is the RIGHT PLACE to edit the stylesheet + +$panel-corner-radius: 0px; +$asset_path: if($variant == 'dark', dark-assets, light-assets); + +/* Copyright 2009, 2015 Red Hat, Inc. + * + * Portions adapted from Mx's data/style/default.css + * Copyright 2009 Intel Corporation + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU Lesser General Public License, + * version 2.1, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for + * more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. + */ + +// +// Globals +// +$font-size: 9; +$font-family: Futura Bk bt, Cantarell, Sans-Serif; +$_bubble_bg_color: opacify($osd_bg_color,0.25); +$_bubble_fg_color: $osd_fg_color; +$_bubble_borders_color: transparentize($osd_fg_color,0.8); + +stage { + font-family: $font-family; + @include fontsize($font-size); + color: $fg_color; +} + +.app-well-menu, +.run-dialog-error-label, +.dash-label, +.window-caption, +.switcher-list, +.app-well-app > .overview-icon, +.grid-search-result .overview-icon { + font-size: 1em; + font-weight: normal; +} + +%reset_style { + background-color: transparent !important; + background-gradient-direction: none !important; + border: none !important; + border-radius: 0 !important; +} + +// +// Buttons +// + +.popup-menu .modal-dialog-button { + font-size: 1em; + min-height: 20px; + padding: 5px 32px; + transition-duration: 0; + border-radius: 2px; + + background-gradient-direction: none !important; + + @include button(normal); + + &:focus { @include button(focus); } + &:hover { @include button(hover); } + &:hover:focus { @include button(focus-hover); } + &:active, &:active:focus { @include button(active); } + &:insensitive { @include button(insensitive); } +} + +.candidate-page-button, +.hotplug-notification-item, +.hotplug-resident-eject-button, +.modal-dialog-button { + background-gradient-direction: none !important; + @extend %osd_button; +} + +%osd_button { + font-size: 1em; + min-height: 20px; + padding: 5px 32px; + transition-duration: 0; + border-radius: 2px; + + @include button(osd); + + &:hover { @include button(osd-hover); } + &:focus { color: $selected_bg_color; } + &:active { @include button(osd-active); } + &:insensitive { @include button(osd-insensitive); } +} + +// +// Entries +// +StEntry { + font-size: 1em; + padding: 7px; + caret-size: 1px; + selection-background-color: $selected_bg_color; + selected-color: $selected_fg_color; + transition-duration: 300ms; + border-radius: 20px; + background-gradient-direction: none !important; + + @include entry(normal); + + &:focus, &:hover { @include entry(focus); } + &:insensitive { @include entry(insensitive); } + + StIcon.capslock-warning { + icon-size: 16px; + warning-color: $warning_color; + padding: 0 4px; + } +} + +// +// Scrollbars +// +StScrollView { + &.vfade { -st-vfade-offset: 0px; } + &.hfade { -st-hfade-offset: 0px; } +} + +StScrollBar { + + padding: 8px; + + StScrollView & { + min-width: 5px; + min-height: 5px; + } + + StBin#trough { + background-color: transparentize($base_color, 0.9); + border-radius: 8px; + } + + StButton#vhandle, StButton#hhandle { + border-radius: 4px; + background-color: mix($fg_color, $bg_color, 40%); + border: 0px solid; + margin: 0px; + + &:hover { background-color: mix($fg_color, $bg_color, 30%); } + + &:active { background-color: $selected_bg_color; } + } +} + +// +// Slider +// +.slider { + -slider-height: 4px; + -slider-background-color: $button_border; //background of the trough + -slider-border-color: transparentize(black, 1); //trough border color + -slider-active-background-color: $selected_bg_color; //active trough fill + -slider-active-border-color: transparentize(black, 1); //active trough border + -slider-border-width: 0; + -slider-handle-radius: 4px; + height: 18px; + border: 0 solid transparent; + border-right-width: 1px; + border-left-width: 5px; + color: transparent; +} + +// +// Check Boxes +// +.check-box { + + StBoxLayout { spacing: .8em; } + + StBin { + width: 16px; + height: 16px; + background-image: url("#{$asset_path}/checkbox/checkbox-unchecked.svg"); + } + + &:focus StBin { background-image: url("#{$asset_path}/checkbox/checkbox-unchecked-focused.svg"); } + + &:checked StBin { background-image: url("#{$asset_path}/checkbox/checkbox-checked.svg"); } + + &:focus:checked StBin { background-image: url("#{$asset_path}/checkbox/checkbox-checked-focused.svg"); } +} + +// +// Switches +// +.toggle-switch { + width: 50px; + height: 20px; + background-size: contain; + + &-us, &-intl { + background-image: url("#{$asset_path}/switch/switch-off.svg"); + + &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } + } +} + +// +// Links +// +.shell-link { + color: $link_color; + + &:hover { color: lighten($link_color,10%); } +} + +// +// Modal Dialogs +// +.headline { font-size: 110%; } +.lightbox { background-color: black; } +.flashspot { background-color: white; } + +.modal-dialog { + color: $fg_color; + background-color: transparentize($bg_color, 1); + border: none; + border-image: url("#{$asset_path}/misc/modal.svg") 9 9 9 67; + padding: 0 5px 6px 5px; + + > StBoxLayout:first-child { + padding: 20px 10px 10px 10px; + } + + &-button-box { + spacing: 0; + margin: 0px; + padding: 14px 10px; + background: none; + border: none; + border-image: url("common-assets/misc/button-box.svg") 9 9 9 9; + + .button { + padding-top: 0; + padding-bottom: 0; + height: 30px; + + @extend %osd_button; + } + } + + .run-dialog-entry { width: 21em; } + .run-dialog-error-box { + padding-top: 5px; + spacing: 5px; + } + + //.run-dialog-button-box { padding-top: 1em; } + .run-dialog-label { + font-size: 0; + } +} + +//.button-dialog-button-box { +//} + +.show-processes-dialog-subject, +.mount-question-dialog-subject, +.end-session-dialog-subject { //this should be a generic header class + @include fontsize($font-size * 1.2); + font-weight: bold; + color: $fg_color; +} + +// +// End Session Dialog +// +.end-session-dialog { + spacing: 42px; + //border: 3px solid $_bubble_borders_color; + + &-list { + padding-top: 20px; + } + + &-layout { + padding-left: 17px; + &:rtl { padding-right: 17px; } + } + + &-description { + width: 28em; + padding-bottom: 10px; + &:rtl { + text-align: right; + } + } + + &-warning { + width: 28em; + color: $warning_color; + padding-top: 6px; + &:rtl { + text-align: right; + } + } + + &-logout-icon { + border: 0px solid transparent; + border-radius: 2px; + width: 48px; + height: 48px; + background-size: contain; + } + + &-shutdown-icon { + color: $fg_color; + width: 48px; + height: 48px; + } + + &-inhibitor-layout { + spacing: 16px; + max-height: 200px; + padding-right: 10px; + padding-left: 10px; + } + + &-session-list, &-app-list { + spacing: 1em; + } + + &-list-header { + font-weight: bold; + &:rtl { text-align: right; } + } + + &-app-list-item, &-session-list-item { + spacing: 1em; + } + + &-app-list-item-name, &-session-list-item-name { + font-weight: bold; + } + + &-app-list-item-description { + color: lighten($fg_color,5%); + @include fontsize($font-size * 0.9); + } + + // Shutdown Button + .modal-dialog-button:last-child { + color: $selected_fg_color; + background-color: $destructive_color; + border-color: $destructive_color; + + &:hover { + color: $selected_fg_color; + background-color: lighten($destructive_color, 9%); + border-color: lighten($destructive_color, 9%); + } + &:active { + color: $selected_fg_color; + background-color: darken($destructive_color, 5%); + border-color: darken($destructive_color, 5%); + } + } +} + +// +// ShellMountOperation Dialogs +// +.shell-mount-operation-icon { icon-size: 48px; } + +.show-processes-dialog, +.mount-question-dialog { + spacing: 24px; +} + +.show-processes-dialog-subject, +.mount-question-dialog-subject { + padding-top: 10px; + padding-left: 17px; + padding-bottom: 6px; + + &:rtl { + padding-left: 0px; + padding-right: 17px; + } +} + +.mount-question-dialog-subject { + max-width: 500px; +} + +.show-processes-dialog-description, +.mount-question-dialog-description { + padding-left: 17px; + width: 28em; + + &:rtl { + padding-right: 17px; + } +} + +.show-processes-dialog-app-list { + @include fontsize($font-size * 1.1); + max-height: 200px; + padding-top: 24px; + padding-left: 49px; + padding-right: 32px; + + &:rtl { + padding-right: 49px; + padding-left: 32px; + } +} + +.show-processes-dialog-app-list-item { + color: darken($fg_color,10%); + &:hover { color: $fg_color; } + &:ltr { padding-right: 1em; } + &:rtl { padding-left: 1em; } +} + +.show-processes-dialog-app-list-item-icon { + &:ltr { padding-right: 17px; } + &:rtl { padding-left: 17px; } +} + +.show-processes-dialog-app-list-item-name { + @include fontsize($font-size * 1.1); +} + +// +// Password or Authentication Dialog +// +.prompt-dialog { + //this is the width of the entire modal popup + width: 500px; + //border: 3px solid $_bubble_borders_color; + + &-main-layout { + spacing: 24px; + padding: 10px; + } + + &-message-layout { + spacing: 16px; + } + + &-headline { + @include fontsize($font-size * 1.3); + font-weight: bold; + color: $fg_color; + } + + &-descritption:rtl { + text-align: right; + } + + &-password-box { + spacing: 1em; + padding-bottom: 1em; + } + + &-error-label { + @include fontsize($font-size); + color: $error_color; + padding-bottom: 8px; + } + + &-info-label { + @include fontsize($font-size); + padding-bottom: 8px; + } + + &-null-label { + @include fontsize($font-size); + padding-bottom: 8px; + } +} + +.hidden { + color: transparentize(black, 1); +} + +// +// Polkit Dialog +// +.polkit-dialog-user { + + &-layout { + padding-left: 10px; + spacing: 10px; + &:rtl { + padding-left: 0px; + padding-right: 10px; + } + } + + &-root-label { + color: $warning_color; + } + + &-user-icon { + border-radius: 2px; + background-size: contain; + width: 48px; + height: 48px; + } +} + +// +// Network Agent Dialog +// +.network-dialog-secret-table { + spacing-rows: 15px; + spacing-columns: 1em; +} + +.keyring-dialog-control-table { + spacing-rows: 15px; + spacing-columns: 1em; +} + +// +// Popvers/Menus +// +.popup-menu { + min-width: 200px; + color: $fg_color; + border-image: url("#{$asset_path}/menu/menu.svg") 9 9 9 9; + + .popup-menu-arrow { } //defined globally in the TOP BAR + .popup-sub-menu { + background: none; + box-shadow: none; + background-gradient-direction: none !important; + border-image: url("#{$asset_path}/menu/submenu.svg") 9 9 9 9; + } + + .popup-submenu-menu-item:open { + background: none; + box-shadow: none; + border-image: url("#{$asset_path}/menu/submenu-open.svg") 9 9 9 9; + } + + .popup-menu-content { padding: 1em 0em 1em 0em; } + .popup-menu-item { + spacing: 12px; + + &:ltr { padding: .4em 3em .4em 0em; } + &:rtl { padding: .4em 0em .4em 3em; } + + &:active, &.selected { + color: $fg_color; + background-color: transparent; + border-image: url("#{$asset_path}/menu/menu-hover.svg") 9 9 1 1; + } + + &:insensitive { + color: transparentize($fg_color, 0.5); + background: none; + } + } + + .popup-inactive-menu-item { //all icons and other graphical elements + color: $fg_color; + + &:insensitive { color: $insensitive_fg_color; } + } + //.popup-status-menu-item { font-weight: normal; color: pink; } //dunno what that is + &.panel-menu { + -boxpointer-gap: 0px; + margin-bottom: 1.75em; + } +} + +.popup-menu-ornament { + text-align: right; + margin-left: 10px; + width: 16px; +} + +.popup-menu-boxpointer { + -arrow-border-radius: 2px; + -arrow-background-color: rgba(0,0,0,0.0); + -arrow-border-width: 1px; + -arrow-border-color: rgba(0,0,0,0.0); + -arrow-base: 0; + -arrow-rise: 0; +} + +.candidate-popup-boxpointer { + -arrow-border-radius: 2px; + -arrow-background-color: $osd_bg_color; + -arrow-border-width: 1px; + -arrow-border-color: transparentize(black, 0.6); + -arrow-base: 5; + -arrow-rise: 5; +} + +.popup-separator-menu-item { + //-margin-horizontal: 24px; + height: 2px; //not really the whole box + margin: 10px 0px; + background-color: transparent; + border: none; + border-image: url("common-assets/menu-separator.svg") 1 1 1 1; +} + +// Background menu +.background-menu { -boxpointer-gap: 4px; -arrow-rise: 0px; } + +// fallback menu +//- odd thing for styling App menu when apparently not running under shell. Light Adwaita styled +// app menu inside the main app window itself rather than the top bar +// + +// +// OSD +// +.osd-window { + text-align: center; + font-weight: bold; + spacing: 1em; + padding: 20px; + margin: 32px; + min-width: 64px; + min-height: 64px; + + color: $selected_fg_color; + background: none; + border: none; + border-radius: 5px; + border-image: url("common-assets/misc/osd.svg") 9 9 9 9; + +.osd-monitor-label { font-size: 3em; } + + .level { + padding: 0; + height: 4px; + background-color: transparentize(black, 0.5); + border-radius: 2px; + color: $selected_bg_color; + } +} + +.resize-popup { + color: $osd_fg_color; + background: none; + border: none; + border-radius: 5px; + border-image: url("common-assets/misc/osd.svg") 9 9 9 9; + padding: 12px; +} + +// +// Alt Tab Switcher +// +.switcher-popup { + padding: 8px; + spacing: 16px; +} + +.switcher-list { + color: $osd_fg_color; + background: none; + border: none; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + border-radius: 3px; + padding: 20px; + + &-item-container { spacing: 8px; } + + .item-box { + padding: 8px; + border-radius: 2px; + + &:outlined { + padding: 6px; + border: 1px solid $selected_bg_color; + } + + &:selected { + color: $selected_fg_color; + background-color: $selected_bg_color; + border: 1px solid $selected_bg_color; + + } + } + + .thumbnail-box { + padding: 2px; + spacing: 4px; + } + + .thumbnail { + width: 256px; + } + + .separator { + width: 1px; + background: transparentize($fg_color, 0.67); + } +} + +.switcher-arrow { + border-color: rgba(0,0,0,0); + color: $osd_fg_color; + + &:highlighted { + color: $selected_fg_color; + } +} + +.input-source-switcher-symbol { + font-size: 34pt; + width: 96px; + height: 96px; +} + +// +// Workspace Switcher +// +.workspace-switcher { + + background: transparent; + border: 0px; + border-radius: 0px; + padding: 0px; + spacing: 8px; + + &-group { padding: 12px; } + + &-container { + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + border-radius: 3px; + padding: 20px; + padding-bottom: 24px; + } +} + +.ws-switcher-active-up, .ws-switcher-active-down { + height: 30px; + background-color: $selected_bg_color; + background-size: 96px; + border-radius: 2px; + border: 1px solid $selected_bg_color; +} + +.ws-switcher-active-up { + background-image: url("common-assets/misc/ws-switch-arrow-up.png"); +} + +.ws-switcher-active-down { + background-image: url("common-assets/misc/ws-switch-arrow-down.png"); +} + +.ws-switcher-box { + height: 96px; + background: transparentize(black, 0.67); + border: 1px solid transparentize(black, 0.67); + border-radius: 2px; +} + +// +// Tiled window previews +// +.tile-preview { + background-color: transparentize($selected_bg_color, 0.65); + border: 1px solid $selected_bg_color; + + &-left.on-primary { + border-radius: $panel-corner-radius 0 0 0; + } + + &-right.on-primary { + border-radius: 0 $panel-corner-radius 0 0; + } + + &-left.tile-preview-right.on-primary { + border-radius: $panel-corner-radius $panel-corner-radius 0 0; + } +} + +// +// Top Bar +// +#panel { + font-weight: bold; + height: 2.1em; + min-height: 27px; + border-image: url('common-assets/panel/panel.svg') 1 1 1 1; + + &.unlock-screen, + &.login-screen, + &.lock-screen { + background-color: transparent; + border-image: none; + } + + &:overview { border-image: url('common-assets/panel/panel-overview.svg') 1 1 1 1; } + + #panelLeft, #panelCenter { // spacing between activities<>app menu and such + spacing: 8px; + } + + .panel-corner { + -panel-corner-radius: $panel-corner-radius; + -panel-corner-background-color: transparentize(black, 1); + -panel-corner-border-width: 0px; + -panel-corner-border-color: black; + + &:active, &:overview, &:focus { + -panel-corner-border-color: black; + } + + &.lock-screen, &.login-screen, &unlock-screen { + -panel-corner-radius: 0; + -panel-corner-background-color: transparent; + -panel-corner-border-color: transparent; + } + } + + .panel-button { + -natural-hpadding: 10px; + -minimum-hpadding: 6px; + font-weight: bold; + color: $selected_fg_color; + transition-duration: 100ms; + border-bottom-width: 1px; + border-color: transparent; + + #appMenuIcon { + width: 0; + height: 0; + margin-left: 0px; + margin-right: 0px; + } + + &:hover { + color: $selected_fg_color; + background-color: transparentize(black, 0.83); + border-bottom-width: 1px; + border-color: transparent; + text-shadow: 0 0 rgba(0,0,0,0); + } + + &:active, &:overview, &:focus, &:checked { + color: $selected_fg_color; + background:$selected_bg_color, url("misc/null.svg"); + border-image: none; + box-shadow: none; + border-bottom-width: 1px; + border-color: black; + text-shadow: 0 0 rgba(0,0,0,0); + + & > .system-status-icon { icon-shadow: none; } + } + + .system-status-icon { icon-size: 16px; padding: 0 4px; } + .unlock-screen &, + .login-screen &, + .lock-screen & { + color: lighten($fg_color, 10%); + &:focus, &:hover, &:active { color: lighten($fg_color, 10%); } + } + } + + #panelActivities.panel-button { -natural-hpadding: 12px; } + + .panel-status-indicators-box, + .panel-status-menu-box { + spacing: 2px; + } + + .screencast-indicator { color: $error_color; } + + .clock-display > * > *:last-child { + color: $selected_bg_color; + margin-left: .3em; + } + + .popup-menu-arrow { width: 0; } +} + +// Activities button +#panel #panelActivities.panel-button { + + > * { + background-image: url("common-assets/panel/activities.svg"); + background-position: center top; + width: 24px; + height: 24px; + background-color: transparent !important; + background-gradient-direction: none !important; + border: 0 solid transparent !important; + text-shadow: 0 0 transparent !important; + transition-duration: 0ms !important; + box-shadow: none !important; + color: transparent; + } + + &:active, &:overview, &:focus, &:checked { + background-color: transparent; + box-shadow: none; + border-bottom-width: 1px; + border-color: transparent; + + > * { background-image: url("common-assets/panel/activities-active.svg"); } + } +} + +// a little unstructured mess: + +.system-switch-user-submenu-icon { + icon-size: 24px; + border: 1px solid transparentize($fg_color,0.6); +} + +#appMenu { + spinner-image: url("common-assets/misc/process-working.svg"); + spacing: 4px; + padding: 0 8px; + + .label-shadow { color: transparent; } +} + +.aggregate-menu { + width: 360px; + .popup-menu-icon { padding: 0 4px; } +} + +.system-menu-action { + padding: 13px; + color: $fg_color; + border-radius: 32px; /* wish we could do 50% */ + border: 1px solid transparent; + + &:hover, &:focus { + transition-duration: 100ms; + padding: 13px; + color: $fg_color; + background-color: transparent; + border: 1px solid $selected_bg_color; + } + &:active { + color: $selected_fg_color; + background-color: $selected_bg_color; + border: 1px solid $selected_bg_color; + } + + & > StIcon { icon-size: 16px; } +} + +// +// Calendar popover +// +.calendar-vertical-separator { + -stipple-width: 1px; + -stipple-color: transparentize($fg_color, 0.6); + width: 0.3em; +} + +.calendar { + padding: .4em 1.75em .8em 2.5em; +} + +.calendar-month-label { + color: $fg_color; + font-weight: bold; + padding: 8px 0; + &:focus {} +} + +.calendar-change-month-back:hover, +.calendar-change-month-back:focus, +.calendar-change-month-back:active, +.calendar-change-month-forward:hover, +.calendar-change-month-forward:focus, +.calendar-change-month-forward:active { + background-color: transparent; +} + +.calendar-change-month-back, +.calendar-change-month-forward { + width: 18px; + height: 12px; + border-radius: 4px; +} + +//arrow back +.calendar-change-month-back { + background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); + + &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-left-hover.svg"); } + + &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); } + + &:rtl { + background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); + + &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-right-hover.svg"); } + + &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); } + } +} + +//arrow forward +.calendar-change-month-forward { + background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); + + &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-right-hover.svg"); } + + &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); } + + &:rtl { + background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); + + &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-left-hover.svg"); } + + &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); } + } +} + +.datemenu-date-label { + padding: .4em 1.7em; + font-weight: bold; + text-align: center; + color: $fg_color; + border-radius: 4px; + + &:hover, &:focus {} + &:active {} +} + +.calendar-day-base { + font-size: 80%; + text-align: center; + width: 25px; height: 25px; + padding: 0.1em; + margin: 2px; + border-radius: 12.5px; + + &:hover, &:focus { background-color: transparentize(black, 0.9); } + + &:active { + color: $fg_color; + background-color: transparentize(black, 0.85); + border-width: 0; //avoid jumparound due to today + } + + &.calendar-day-heading { //day of week heading + color: transparentize($fg_color, 0.15); + margin-top: 1em; + font-size: 70%; + } +} + +.calendar-week-number { + color: transparentize($fg_color, 0.5); + font-weight: normal; +} + +.calendar-day { //border collapse hack - see calendar.js + border-width: 0; + color: transparentize($fg_color, 0.2); +} + +.calendar-day-top { border-top-width: 0; } + +.calendar-day-left { border-left-width: 0; } + +.calendar-work-day {} + +.calendar-nonwork-day { + background-color: transparent; + color: $fg_color; + font-weight: bold; +} + +.calendar-today, +.calendar-today:active, +.calendar-today:focus, +.calendar-today:hover { + font-weight: bold; + color: $selected_fg_color; + background-color: $selected_bg_color; + border-width: 0; +} + +.calendar-day-with-events { + color: $selected_bg_color; + font-weight: bold; +} + +.calendar-today.calendar-day-with-events { color: $selected_fg_color; } + +.calendar-other-month-day { + color: transparentize($fg_color, 0.7); + opacity: 1; +} + +.events-table { + width: 320px; + spacing-columns: 6pt; + padding: 0 1.4em; + + &:ltr { padding-right: 1.9em; } + &:rtl { padding-left: 1.9em; } +} + +.events-day-header { + font-weight: bold; + color: transparentize($fg_color, 0.2); + padding-left: 0.4em; + padding-top: 1.2em; + + &:first-child { padding-top: 0; } + &:rtl { + padding-left: 0; + padding-right: 0.4em; + } +} + +.events-day-dayname { + color: transparentize($fg_color, 0.5); + text-align: left; + min-width: 20px; + + &:rtl { text-align: right; } +} + +.events-day-time { + color: transparentize($fg_color, 0.6); + text-align: right; + + &:rtl { text-align: left; } +} + +.events-day-task { + color: $fg_color; + padding-left: 8pt; + + &:rtl { + padding-left: 0px; + padding-right: 8pt; + } +} + + +// +//Activities Ripples +// +.ripple-box { + width: 52px; + height: 52px; + background-image: url("common-assets/misc/corner-ripple-ltr.svg"); + background-size: contain; + + &:rtl { background-image: url("common-assets/misc/corner-ripple-rtl.svg"); } +} + +// not really top bar only +.popup-menu-arrow { width: 16px; height: 16px; } +.popup-menu-icon { icon-size: 16px; } + + +// +//Close buttons +// +.window-close, .notification-close { + background-image: url("common-assets/misc/close.svg"); + background-size: 26px; + height: 26px; + width: 26px; + + &:hover { + background-image: url("common-assets/misc/close-hover.svg"); + background-size: 26px; + height: 26px; + width: 26px; + } + + &:active { + background-image: url("common-assets/misc/close-active.svg"); + background-size: 26px; + height: 26px; + width: 26px; + } +} + +.window-close { + -shell-close-overlap: 11px; +} + +.notification-close { + -shell-close-overlap-x: 8px; + -shell-close-overlap-y: -8px; + + &:rtl { -shell-close-overlap-x: -8px; } +} + +// +// Network Dialogs +// +.nm-dialog { + max-height: 500px; + min-height: 450px; + min-width: 470px; + + &-content { spacing: 20px; } + + &-header-hbox { spacing: 10px; } + + &-airplane-box { spacing: 12px; } + + &-airplane-headline { + font-size: 1.1em; + font-weight: bold; + text-align: center; + } + + &-airplane-text { color: $fg_color; } + + &-header-icon { icon-size: 32px; } + + &-scroll-view { + border: 1px solid $borders_color; + border-radius: 2px; + background-color: $base_color; + } + + &-header { + font-weight: bold; + font-size: 1.2em; + } + + &-item { + font-size: 1em; + border-bottom: 0px solid; + padding: 12px; + spacing: 0px; + + &:selected { + background-color: $selected_bg_color; + color: $selected_fg_color; + } + } + + &-icons { spacing: .5em; } + + &-icon { icon-size: 16px; } +} + +.no-networks-label { color: $insensitive_fg_color; } + +.no-networks-box { spacing: 12px; } + +// +// Overview +// +#overview { spacing: 24px; } + +.overview-controls { padding-bottom: 32px; } + +.window-picker { //container around window thumbnails + -horizontal-spacing: 32px; + -vertical-spacing: 32px; + padding-left: 32px; + padding-right: 32px; + padding-bottom: 48px; + + &.external-monitor { padding: 32px; } +} + +.window-clone-border { + border: 3px solid transparentize($selected_bg_color, 0.2); + border-radius: 4px; + box-shadow: inset 0px 0px 0px 1px transparentize($selected_bg_color, 1); +} + +.window-caption, .window-caption:hover { + spacing: 25px; + color: $osd_fg_color; + background-color: transparentize(black, 0.3); + border-radius: 2px; + padding: 4px 12px; + -shell-caption-spacing: 12px; +} + +// +// Search Entry +// +.search-entry { + width: 320px; + padding: 7px 9px; + border-radius: 20px; + border: 1px solid transparentize(black, 0.75); + background-color: transparentize($entry_bg, 0.1); + + &:focus { + padding: 7px 9px; + } + + .search-entry-icon { + icon-size: 16px; + padding: 0 4px; + color: $fg_color; + } + + &:hover, &:focus { + color: $selected_fg_color; + caret-color: $selected_fg_color; + background-color: $selected_bg_color; + + selection-background-color: $selected_fg_color; + selected-color: $selected_bg_color; + + .search-entry-icon { color: $selected_fg_color; } + } +} + +// +// Search Results +// +#searchResultsBin { max-width: 1000px; } + +#searchResultsContent { + padding-left: 20px; + padding-right: 20px; + spacing: 16px; +} + +// This should be equal to #searchResultsContent spacing +.search-section { spacing: 16px; } + +// This is the space between the provider icon and the results container +.search-section-content { spacing: 32px; } + +// "no results" +.search-statustext { + @extend %status_text; +} + +.list-search-results { spacing: 3px; } + +.search-section-separator { + background-color: transparentize(white, 0.8); + -margin-horizontal: 1.5em; + height: 1px; +} + +.list-search-result-content { spacing: 12px; padding: 12px; } + +.list-search-result-title { font-size: 1.5em; color: $selected_fg_color; } + +.list-search-result-description { color: darken($selected_fg_color, 20%); } + +.search-provider-icon { padding: 15px; } +.search-provider-icon-more { + width: 16px; + height: 16px; + background-image: url("common-assets/misc/more-results.svg"); +} + +// +// Dash +// +#dash { + font-size: 1em; + color: $osd_fg_color; + background-color: transparent; + border: none; + padding: 3px 0px 3px 0px; + border-image: url('common-assets/dash/dash-left.svg') 3 3 3 3; + + .extended.left & { border-image: url('common-assets/dash/dash-extended-left.svg') 3 3 3 3; } + + .right &, + &:rtl { + padding: 3px 0px 3px 0px; + border-image: url('common-assets/dash/dash-right.svg') 3 3 3 3; + } + .extended.right & { border-image: url('common-assets/dash/dash-extended-right.svg') 3 3 3 3; } + + .bottom & { + padding: 0px 3px 0px 3px; + border-image: url('common-assets/dash/dash-bottom.svg') 3 3 3 3; + } + .extended.bottom & { border-image: url('common-assets/dash/dash-extended-bottom.svg') 3 3 3 3; } + + .top & { + padding: 0px 3px 0px 3px; + border-image: url('common-assets/dash/dash-top.svg') 3 3 3 3; + } + .extended.top & { border-image: url('common-assets/dash/dash-extended-top.svg') 3 3 3 3; } + + .placeholder { + background-image: url("common-assets/dash/dash-placeholder.svg"); + background-size: contain; + height: 24px; + } + + .empty-dash-drop-target { + width: 24px; + height: 24px; + } +} + +.dash-item-container > StWidget { + padding: 2px 5px 2px 3px; + + .right &, &:rtl { padding: 2px 3px 2px 5px; } + .bottom & { padding: 5px 2px 3px 2px; } + .top & { padding: 3px 2px 5px 2px; } +} + +.dash-label { + border-radius: 3px; + padding: 4px 12px; + color: $selected_fg_color; + background-color: rgba(0, 0, 0, 0.7); + text-align: center; + -x-offset: 3px; +} + +.bottom .dash-label, .top .dash-label { + -y-offset: 3px; + -x-offset: 0; +} + +.dash-item-container > .app-well-app.running > .overview-icon, +.dash-item-container > .app-well-app.running:hover > .overview-icon, +.dash-item-container > .app-well-app.running:active > .overview-icon, +.dash-item-container > .app-well-app > .overview-icon, +.dash-item-container > .app-well-app:hover > .overview-icon, +.dash-item-container > .app-well-app:active > .overview-icon { + background-color: transparent !important; + background-gradient-direction: none !important; + border: none !important; + border-radius: 0 !important; + background: none !important; +} + + +#dash .app-well-app .overview-icon { + padding: 10px; + padding-left: 13px; +} + +.right #dash .app-well-app .overview-icon, +#dash:rtl .app-well-app .overview-icon { + padding: 10px; + padding-right: 13px; +} + +.bottom #dash .app-well-app .overview-icon { + padding: 10px; + padding-bottom: 13px; +} + +.top #dash .app-well-app .overview-icon { + padding: 10px; + padding-top: 13px; +} + + +#dash .app-well-app:hover .overview-icon { + border-image: url("common-assets/dash/button-hover.svg") 5 5 5 5; +} + +#dash .app-well-app:active .overview-icon { + border-image: url("common-assets/dash/button-active.svg") 5 5 5 5; +} + +#dash .app-well-app.running .overview-icon { + border-image: url("common-assets/dash/button-running.svg") 5 5 5 5; +} + +#dash .app-well-app.running:hover .overview-icon { + border-image: url("common-assets/dash/button-running-hover.svg") 5 5 5 5; +} + +#dash .app-well-app.running:active > .overview-icon { + border-image: url("common-assets/dash/button-running-active.svg") 5 5 5 5; +} + + +.right #dash .app-well-app:hover .overview-icon, +#dash:rtl .app-well-app:hover .overview-icon { + border-image: url("common-assets/dash/button-hover-right.svg") 5 5 5 5; +} + +.right #dash .app-well-app:active .overview-icon, +#dash:rtl .app-well-app:active .overview-icon { + border-image: url("common-assets/dash/button-active-right.svg") 5 5 5 5; +} + +.right #dash .app-well-app.running .overview-icon, +#dash:rtl .app-well-app.running .overview-icon { + border-image: url("common-assets/dash/button-running-right.svg") 5 5 5 5; +} + +.right #dash .app-well-app.running:hover .overview-icon, +#dash:rtl .app-well-app.running:hover .overview-icon { + border-image: url("common-assets/dash/button-running-hover-right.svg") 5 5 5 5; +} + +.right #dash .app-well-app.running:active > .overview-icon, +#dash:rtl .app-well-app.running:active > .overview-icon { + border-image: url("common-assets/dash/button-running-active-right.svg") 5 5 5 5; +} + + +.bottom #dash .app-well-app:hover .overview-icon { + border-image: url("common-assets/dash/button-hover-bottom.svg") 5 5 5 5; +} + +.bottom #dash .app-well-app:active .overview-icon { + border-image: url("common-assets/dash/button-active-bottom.svg") 5 5 5 5; +} + +.bottom #dash .app-well-app.running .overview-icon { + border-image: url("common-assets/dash/button-running-bottom.svg") 5 5 5 5; +} + +.bottom #dash .app-well-app.running:hover .overview-icon { + border-image: url("common-assets/dash/button-running-hover-bottom.svg") 5 5 5 5; +} + +.bottom #dash .app-well-app.running:active > .overview-icon { + border-image: url("common-assets/dash/button-running-active-bottom.svg") 5 5 5 5; +} + + +.top #dash .app-well-app:hover .overview-icon { + border-image: url("common-assets/dash/button-hover-top.svg") 5 5 5 5; +} + +.top #dash .app-well-app:active .overview-icon { + border-image: url("common-assets/dash/button-active-top.svg") 5 5 5 5; +} + +.top #dash .app-well-app.running .overview-icon { + border-image: url("common-assets/dash/button-running-top.svg") 5 5 5 5; +} + +.top #dash .app-well-app.running:hover .overview-icon { + border-image: url("common-assets/dash/button-running-hover-top.svg") 5 5 5 5; +} + +.top #dash .app-well-app.running:active > .overview-icon { + border-image: url("common-assets/dash/button-running-active-top.svg") 5 5 5 5; +} + + +.show-apps .overview-icon { + background-gradient-direction: none !important; + + padding: 11px; + background-color: rgba(0, 0, 0, 0.5); + border-radius: 2px; + border: 0px solid; +} + +.show-apps:hover .overview-icon { + background-gradient-direction: none !important; + + background-color: rgba(0, 0, 0, 0.7); + color: $selected_bg_color; +} + +.show-apps:active .overview-icon, .show-apps:active .show-apps-icon, .show-apps:checked .overview-icon, .show-apps:checked .show-apps-icon { + background-gradient-direction: none !important; + + color: $selected_fg_color; + background-color: $selected_bg_color; + box-shadow: none; + transition-duration: 0ms; +} + +// +// App Vault/Grid +// +.icon-grid { + spacing: 30px; + -shell-grid-horizontal-item-size: 136px; + -shell-grid-vertical-item-size: 136px; + + .overview-icon { icon-size: 96px; } +} + +//.app-display { spacing: 20px; } + +//favorties | all toggle container +.app-view-controls { padding-bottom: 32px; } + +//favorties | all toggle button +.app-view-control { + padding: 4px 32px; + background-gradient-direction: none; + + background-color: $osd_bg_color; + color: $osd_fg_color; + border-color: rgba(0,0,0,0.7); + + &:hover { + background-color: $osd_bg_color; + color: $osd_fg_color; + border-color: $selected_bg_color; + } + &:checked { @include button(osd-active); } + + &:first-child:ltr, + &:last-child:rtl { border-radius: 2px 0 0 2px; } + + &:last-child:ltr, + &:first-child:rtl { border-radius: 0 2px 2px 0; } +} + +// +// Icon Tile +// +.search-provider-icon, +.list-search-result { + @extend %icon_tile; + + &:active, &:checked { background-color: transparentize(darken($osd_bg_color,10%),.1); } + + &:focus, &:selected, &:hover { + background-color: transparentize($osd_fg_color,.6); + transition-duration: 200ms; + } +} +.app-well-app, +.app-well-app.app-folder, +.grid-search-result { + + .overview-icon { + @extend %icon_tile; + } + + &:active .overview-icon, + &:checked .overview-icon { + background-color: transparentize(darken($osd_bg_color,10%),.1); + box-shadow: inset 0 0 $selected_bg_color; + } + + &:hover .overview-icon, + &:focus .overview-icon, + &:selected .overview-icon { + background-color: transparentize($osd_fg_color,.6); + transition-duration: 0ms; + border-image: none; + background-image: none; + } +} + +%icon_tile { + color: $selected_fg_color; + border-radius: 2px; + padding: 6px; + border: 1px solid transparent; + transition-duration: 0ms; + text-align: center; +} + +// +// Collections +// +.app-well-app.app-folder { + + > .overview-icon { + background-color: transparentize(darken($panel_bg,10%), 0.15); + border: 1px solid transparentize($osd_fg_color, 0.7); + } + + &:hover > .overview-icon { + background-color: lighten($panel_bg, 10%); + } + + &:active > .overview-icon, &:checked > .overview-icon { + background-color: $selected_bg_color; + box-shadow: none; + } + + &:focus > .overview-icon { + background-color: $selected_bg_color; + } +} + +.app-folder-popup { //expanded collection + -arrow-border-radius: 2px; + -arrow-background-color: transparent; + -arrow-border-color: transparent; + -arrow-border-width: 0; + -arrow-base: 0; + -arrow-rise: 0; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; +} +.app-folder-popup-bin { padding: 5px; } +.app-folder-icon { + padding: 5px; + spacing-rows: 5px; + spacing-columns: 5px; +} + +.page-indicator { + padding: 15px 20px; + + .page-indicator-icon { + width: 18px; + height: 18px; + background-image: url(common-assets/misc/page-indicator-inactive.svg); + } + + &:hover .page-indicator-icon { background-image: url(common-assets/misc/page-indicator-hover.svg); } + &:active .page-indicator-icon { background-image: url(common-assets/misc/page-indicator-active.svg); } + &:checked .page-indicator-icon, + &:checked:active { background-image: url(common-assets/misc/page-indicator-checked.svg); } +} + +.no-frequent-applications-label { @extend %status_text; } + +.app-well-app > .overview-icon.overview-icon-with-label, +.grid-search-result .overview-icon.overview-icon-with-label { + padding: 10px 8px 5px 8px; + spacing: 4px; +} + +// +// Workspace pager +// +.workspace-thumbnails { //container ala dash + visible-width: 40px; //amount visible before hover + spacing: 11px; + padding: 12px; + padding-right: 7px; + border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; + + &:rtl { + padding: 12px; + padding-left: 7px; + border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; + } +} + +.workspace-thumbnail-indicator { + border: 4px solid transparentize($selected_bg_color, 0.2); + border-radius: 1px; + padding: 1px; +} + +//Some hacks I don't even +.search-display > StBoxLayout, +.all-apps, +.frequent-apps > StBoxLayout { + // horizontal padding to make sure scrollbars or dash don't overlap content + padding: 0px 88px 10px 88px; +} + +%status_text { + font-size: 2em; + font-weight: bold; + color: $fg_color; +} + +// +// Notifications & Message Tray +// + +#message-tray { + background: opacify($osd_bg_color, 1); + background-repeat: repeat; + height: 72px; + border: solid transparentize(black, 0.4); + border-width: 0; + border-top-width: 1px; +} + +.message-tray { + + &-summary { height: 72px; } + + &-menu-button { + + StIcon { + padding: 0 20px; + color: transparentize($osd_fg_color, 0.4); + icon-size: 24px; + } + &:hover StIcon, + &:active StIcon, + &:focus StIcon { color: $osd_fg_color; } + } +} + +.no-messages-label { + color: transparentize($osd_fg_color, 0.5); +} + +.summary-boxpointer { + -arrow-border-radius: 3px; + -arrow-background-color: rgba(0,0,0,0.0); + -arrow-base: 0; + -arrow-rise: 0; + -boxpointer-gap: 0; + color: $fg_color; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + padding: 7px; + + .notification { + border-radius: 3px; + background: none !important; + border-image: none; + padding-bottom: 12px; + } + + #summary-right-click-menu { + color: $osd_fg_color; + padding-top: 12px; + padding-bottom: 12px; + } + + &-stack-scrollview { + max-height: 18em; + padding-top: 8px; + padding-bottom: 8px; + + &:ltr { padding-right: 8px; } + &:rtl { padding-left: 8px; } + } +} + +.summary-source { + border-radius: 4px; + padding: 0 6px 0 6px; + transition-duration: 100ms; + + &-counter { + background-image: url("common-assets/misc/summary-counter.svg"); + background-size: 26px; + color: $selected_fg_color; + font-size: 10pt; + font-weight: bold; + height: 2.4em; + width: 2.4em; + -shell-counter-overlap-x: 8px; + -shell-counter-overlap-y: 8px; + } + + &-button { + border-radius: 2px; + padding: 6px 3px 6px 3px; + + &:last-child:ltr { padding-right: 6px; } + &:last-child:rtl { padding-left: 6px; } + + .summary-source { @include button(osd) }; + + &:hover .summary-source { @include button(osd-hover) } + + &:focus .summary-source, + &:selected .summary-source { @include button(osd-active); } + } +} + +//Notifications +.url-highlighter { link-color: $link_color; } + +.notification, #notification-container { width: 34em; } + +.notification { + font-size: 1em; + color: $osd_fg_color; + padding: 12px 12px 12px 12px; + spacing-rows: 4px; + spacing-columns: 10px; + border-image: url("common-assets/misc/notification.svg") 9 9 9 9; + + &.multi-line-notification { padding-bottom: 12px; } + + &-unexpanded { + min-height: 40px; // We want to force the actor at a specific size, irrespective + height: 40px; // of its minimum and preferred size, so we override both + } + + &-with-image { min-height: 159px; } + + &-scrollview { + max-height: 10em; + -st-vfade-offset: 0px; + + &:ltr > StScrollBar { padding-left: 6px; } + &:rtl > StScrollBar { padding-right: 6px; } + } + + &-body { spacing: 5px; } + + &-actions { + padding-top: 12px; + spacing: 10px; + } + + &-button { + -st-natural-width: 140px; + padding: 4px 4px 5px; + background-gradient-direction: none; + + @extend %osd_button; + + &:focus { + -st-natural-width: 140px; + padding: 4px 4px 5px; + } + } + + &-icon-button { + border-radius: 5px; + padding: 5px; + background-gradient-direction: none; + + @extend %osd_button; + + &:focus { padding: 5px; } + + > StIcon { + icon-size: 16px; + padding: 8px; + } + } + + StEntry { + padding: 7px; + caret-color: $osd_fg_color; + + @include entry(osd); + + &:focus { @include entry(osd-focus); } + } +} + +.secondary-icon { icon-size: 1.09em; } + +// Chat Bubbles +.chat-body { spacing: 5px; } +.chat-response { margin: 5px; } +.chat-log-message { color: $osd_fg_color; } +.chat-new-group { padding-top: 1em; } +.chat-received { + padding-left: 4px; + + &:rtl { padding-left: 0px; padding-right: 4px; } +} + +StEntry.chat-response { + padding: 7px; + @include entry(osd); + + &:focus { @include entry(osd-focus); } +} + +.chat-sent { + padding-left: 18pt; + color: $selected_bg_color; + + &:rtl { padding-left: 0; padding-right: 18pt; } +} + +.chat-meta-message { + padding-left: 4px; + font-size: 9pt; + font-weight: bold; + color: transparentize($osd_fg_color, 0.4); + + &:rtl { padding-left: 0; padding-right: 4px; } +} + +.subscription-message { font-style: italic; } + +// Hotplug +.hotplug-transient-box { + spacing: 6px; + padding: 2px 72px 2px 12px; +} + +.hotplug-notification-item { + padding: 2px 10px; + @extend %osd_button; + + &:focus { padding: 2px 10px; } +} + +.hotplug-notification-item-icon { + icon-size: 24px; + padding: 2px 5px; +} + +.hotplug-resident-box { spacing: 8px; } + +.hotplug-resident-mount { + spacing: 8px; + border-radius: 2px 0 0 2px; + background-gradient-direction: none; + + @extend %osd_button; +} + +.hotplug-resident-mount-label { + color: inherit; + padding-left: 6px; +} + +.hotplug-resident-mount-icon { + icon-size: 24px; + padding-left: 6px; +} + +.hotplug-resident-eject-icon { + icon-size: 16px; +} + +.hotplug-resident-eject-button { + padding: 7px; + border-radius: 0 2px 2px 0; + color: $osd_fg_color; + border-left: none; +} + +// Magnifier + +.magnifier-zoom-region { + border: 2px solid $selected_bg_color; + &.full-screen { border-width: 0; } +} + +// +// On-Screen Keyboard +// +#keyboard { + background-color: $osd_bg_color; + border-width: 0; + border-top-width: 1px; + border-color: transparentize(black, 0.6); +} + +.keyboard-layout { + spacing: 10px; + padding: 10px; +} + +.keyboard-row { + spacing: 15px; +} + +.keyboard-key { + min-height: 2em; + min-width: 2em; + font-size: 14pt; + font-weight: bold; + border-radius: 3px; + box-shadow: none; + background-gradient-direction: none; + + @include button(osd); + + &:hover { @include button(osd-hover); } + &:active, &:checked { @include button(osd-active); } + + &:grayed { @include button(osd-insensitive); } +} + +.keyboard-subkeys { //long press on a key popup + color: $osd_fg_color; + padding: 5px; + -arrow-border-radius: 2px; + -arrow-background-color: $osd_bg_color; + -arrow-border-width: 1px; + -arrow-border-color: transparentize(black, 0.6);; + -arrow-base: 20px; + -arrow-rise: 10px; + -boxpointer-gap: 5px; +} + +// +// IBus Candidate Popup +// +.candidate-popup-content { + padding: 0.5em; + spacing: 0.3em; + color: $osd_fg_color; + font-size: 1.15em; +} + + .candidate-index { + padding: 0 0.5em 0 0; + color: lighten($osd_fg_color, 10%); + } + + .candidate-box { + padding: 0.3em 0.5em 0.3em 0.5em; + border-radius: 2px; + color: $osd_fg_color; + &:selected,&:hover { background-color: $selected_bg_color; color: $selected_fg_color; } + } + + .candidate-page-button-box { + height: 2em; + .vertical & { padding-top: 0.5em; } + .horizontal & { padding-left: 0.5em; } + } + + .candidate-page-button { + padding: 4px; + } + + .candidate-page-button-previous { border-radius: 2px 0px 0px 2px; border-right-width: 0; } + .candidate-page-button-next { border-radius: 0px 2px 2px 0px; } + .candidate-page-button-icon { icon-size: 1em; } + +// +// Auth Dialogs & Screen Shield +// +.framed-user-icon { + background-size: contain; + border: 0px solid transparent; + color: $fg_color; + border-radius: 2px; + &:hover { + border-color: transparent; + color: lighten($osd_fg_color,30%); + } +} + +// +// Login Dialog +// +.login-dialog-banner-view { + padding-top: 24px; + max-width: 23em; +} + +.login-dialog { + //reset + border: none; + background-color: transparent; + + .modal-dialog-button-box { spacing: 3px; } + .modal-dialog-button { + padding: 3px 18px; + &:default { + @include button(normal); + &:hover,&:focus { @include button(hover); } + &:active { @include button(active); } + &:insensitive { @include button(insensitive); } + } + } +} + + .login-dialog-logo-bin { padding: 24px 0px; } + .login-dialog-banner { color: darken($osd_fg_color,10%); } + .login-dialog-button-box { spacing: 5px; } + .login-dialog-message-warning { color: $warning_color; } + .login-dialog-message-hint { padding-top: 0; padding-bottom: 20px; } + .login-dialog-user-selection-box { + padding: 100px 0px; + .login-dialog-not-listed-label { + padding-left: 2px; + .login-dialog-not-listed-button:focus &, + .login-dialog-not-listed-button:hover & { + color: $osd_fg_color; + } + } + } + .login-dialog-not-listed-label { + font-size: 90%; + font-weight: bold; + color: darken($osd_fg_color,30%); + padding-top: 1em; + } + + .login-dialog-user-list-view { -st-vfade-offset: 1em; } + .login-dialog-user-list { + spacing: 12px; + padding: .2em; + width: 23em; + &:expanded .login-dialog-user-list-item:focus { background-color: $selected_bg_color; color: $selected_fg_color; } + &:expanded .login-dialog-user-list-item:logged-in { border-right: 2px solid $selected_bg_color; } + } + .login-dialog-user-list-item { + border-radius: 5px; + padding: .2em; + color: darken($osd_fg_color,30%); + &:ltr { padding-right: 1em; } + &:rtl { padding-left: 1em; } + &:hover { background-color: $selected_bg_color; color: $selected_fg_color; } + .login-dialog-timed-login-indicator { + height: 2px; + margin: 2px 0 0 0; + background-color: $osd_fg_color; + } + &:focus .login-dialog-timed-login-indicator { background-color: $selected_fg_color; } + } + + .login-dialog-username, + .user-widget-label { + color: $osd_fg_color; + font-size: 120%; + font-weight: bold; + text-align: left; + padding-left: 15px; + } + .user-widget-label { + &:ltr { padding-left: 18px; } + &:rtl { padding-right: 18px; } + } + + .login-dialog-prompt-layout { + padding-top: 24px; + padding-bottom: 12px; + spacing: 8px; + width: 23em; + } + + .login-dialog-prompt-label { + color: darken($osd_fg_color, 20%); + font-size: 110%; + padding-top: 1em; + } + + .login-dialog-session-list-button StIcon { + icon-size: 1.25em; + } + + .login-dialog-session-list-button { + color: darken($osd_fg_color,30%); + &:hover,&:focus { color: $osd_fg_color; } + &:active { color: darken($osd_fg_color, 50%); } + } + +// +// Screen Shield +// +.screen-shield-arrows { + padding-bottom: 3em; +} + +.screen-shield-arrows Gjs_Arrow { + color: white; + width: 80px; + height: 48px; + -arrow-thickness: 12px; + -arrow-shadow: 0 1px 1px rgba(0,0,0,0.4); +} + +.screen-shield-clock { + color: white; + text-shadow: 0px 1px 2px rgba(0,0,0,0.6); + font-weight: bold; + text-align: center; + padding-bottom: 1.5em; +} + +.screen-shield-clock-time { + font-size: 72pt; + text-shadow: 0px 2px 2px rgba(0,0,0,0.4); +} + +.screen-shield-clock-date { font-size: 28pt; } + +.screen-shield-notifications-container { + spacing: 6px; + width: 30em; + background-color: transparent; + max-height: 500px; + .summary-notification-stack-scrollview { + padding-top: 0; + padding-bottom: 0; + } + + .notification, + .screen-shield-notification-source { + padding: 12px 6px; + border: 1px solid $_bubble_borders_color; + background-color: transparentize($osd_bg_color,0.5); + color: $_bubble_fg_color; + border-radius: 4px; + } + .notification { margin-right: 15px; } //compensate for space allocated to the scrollbar +} + + +.screen-shield-notification-label { + font-weight: bold; + padding: 0px 0px 0px 12px; +} + +.screen-shield-notification-count-text { padding: 0px 0px 0px 12px; } + +#panel.lock-screen { background-color: transparentize($_bubble_bg_color, 0.5); } + +.screen-shield-background { //just the shadow, really + background: black; + box-shadow: 0px 2px 4px transparentize(black,0.6); +} + +#lockDialogGroup { + background: #2e3436 url(misc/noise-texture.png); + background-repeat: repeat; +} + +#screenShieldNotifications { + StButton#vhandle, StButton#hhandle { + background-color: transparentize($bg_color,0.7); + &:hover, &:focus { background-color: transparentize($bg_color,0.5); } + &:active { background-color: transparentize($selected_bg_color,0.5); } + } +} + +// +// Looking Glass +// +#LookingGlassDialog { + spacing: 4px; + padding: 8px 8px 10px 8px; + background-color: transparentize(black, 0.3); + border: 1px solid black; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + border-radius: 2px; + color: $osd_fg_color; + + & > #Toolbar { + padding: 3px; + border: none; + background-color: transparent; + border-radius: 0px; + } + .labels { spacing: 4px; } + + .notebook-tab { + -natural-hpadding: 12px; + -minimum-hpadding: 6px; + font-weight: bold; + color: $osd_fg_color; + transition-duration: 100ms; + padding-left: .3em; + padding-right: .3em; + + &:hover { + color: $selected_fg_color; + text-shadow: black 0px 2px 2px; + } + &:selected { + border-bottom-width: 0px; + color: $selected_bg_color; + text-shadow: black 0px 2px 2px; + } + } + StBoxLayout#EvalBox { padding: 4px; spacing: 4px; } + StBoxLayout#ResultsArea { spacing: 4px; } +} + +.lg-dialog { + + StEntry { + selection-background-color: $selected_bg_color; + selected-color: $selected_fg_color; + + @include entry(osd); + &:focus { @include entry(osd-focus); } + } + .shell-link { + color: $link_color; + &:hover { color: lighten($link_color,10%); } + } +} + +.lg-completions-text { + font-size: .9em; + font-style: italic; +} + +.lg-obj-inspector-title { + spacing: 4px; +} + +.lg-obj-inspector-button { + border: 1px solid gray; + padding: 4px; + border-radius: 4px; + &:hover { border: 1px solid #ffffff; } +} + +#lookingGlassExtensions { padding: 4px; } + +.lg-extensions-list { + padding: 4px; + spacing: 6px; +} + +.lg-extension { + border: 1px solid $osd_borders_color; + border-radius: 2px; + background-color: $osd_bg_color; + padding: 4px; +} + +.lg-extension-name { + font-weight: bold; +} + +.lg-extension-meta { + spacing: 6px; +} + +#LookingGlassPropertyInspector { + background: transparentize(black, 0.3); + border: 1px solid grey; + border-radius: 2px; + padding: 6px; +} diff --git a/common/gnome-shell/3.14/sass/_drawing.scss b/common/gnome-shell/3.14/sass/_drawing.scss new file mode 100644 index 0000000..03b9f15 --- /dev/null +++ b/common/gnome-shell/3.14/sass/_drawing.scss @@ -0,0 +1,157 @@ +// Drawing mixins + +// generic drawing of more complex things + +// provide font size in rem, with px fallback +@mixin fontsize($size: 24, $base: 16) { + font-size: round($size) + pt; + //font-size: ($size / $base) * 1rem; +} + +// Entries + +@mixin entry($t, $dark:false) { +// +// Entries drawing function +// + //@extend %reset_style; + box-shadow: inset 0 0 transparentize($base_color, 1); + + @if $t==normal { + color: $text_color; + background-color: $entry_bg; + border: 1px solid $entry_border; + } + + @if $t==focus { + color: $fg_color; + background-color: $entry_bg; + border: 1px solid $selected_bg_color; + } + + @if $t==insensitive { + color: $insensitive_fg_color; + background-color: mix($entry_bg, $bg_color, 55%); + border-color: 1px solid mix($entry_border, $bg_color, 55%); + } + + @if $t==osd { + color: $osd_fg_color; + background-color: transparentize(black, 0.8); + border: 1px solid transparentize(black, 0.6); + } + + @if $t==osd-focus { + color: $osd_fg_color; + background-color: transparentize(black, 0.8); + border: 1px solid $selected_bg_color; + } + + @if $t==osd-insensitive { + color: $osd_insensitive_fg_color; + background-color: transparentize(black, 0.9); + border-color: 1px solid transparentize(black, 0.6); + } +} + +// Buttons + +@mixin button($t) { +// +// Button drawing function +// + //@extend %reset_style; + + text-shadow: 0 1px transparentize($base_color, 1); + box-shadow: inset 0 0 transparentize($base_color, 1); + + @if $t==normal { + // + // normal button + // + color: $fg_color; + background-color: $button_bg; + border: 1px solid $button_border; + } + + @else if $t==focus { + // + // focused button + // + color: $fg_color; + background-color: $button_bg; + border: 1px solid $selected_bg_color; + } + + @else if $t==focus-hover { + // + // focused button + // + color: $selected_bg_color; + background-color: $button_bg; + border: 1px solid $selected_bg_color; + } + + @else if $t==hover { + // + // hovered button + // + color: $fg_color; + background-color: $button_bg; + border: 1px solid $selected_bg_color; + } + + @else if $t==active { + // + // pushed button + // + color: $selected_fg_color; + background-color: $selected_bg_color; + border: 1px solid $selected_bg_color; + } + + @else if $t==insensitive { + // + // insensitive button + // + color: $insensitive_fg_color; + border: 1px solid transparentize($button_border, 0.45); + background-color: transparentize($button_bg, 0.45); + } + + @else if $t==osd { + // + // normal osd button + // + color: $osd_fg_color; + border: 1px solid transparentize(black, 0.55); + background-color: transparentize(black, 0.7); + } + + @else if $t==osd-hover { + // + // active osd button + // + color: $osd_fg_color; + border: 1px solid $selected_bg_color; + background-color: transparentize(black, 0.7); + } + + @else if $t==osd-active { + // + // active osd button + // + color: $selected_fg_color; + border: 1px solid $selected_bg_color; + background-color: $selected_bg_color; + } + + @else if $t==osd-insensitive { + // + // insensitive osd button + // + color: $osd_insensitive_fg_color; + border: 1px solid transparentize(black, 0.55); + background-color: transparentize(black, 0.85); + } +} diff --git a/common/gnome-shell/3.14/sass/gnome-shell.scss b/common/gnome-shell/3.14/sass/gnome-shell.scss new file mode 100644 index 0000000..674f742 --- /dev/null +++ b/common/gnome-shell/3.14/sass/gnome-shell.scss @@ -0,0 +1,7 @@ +$variant: 'light'; +$transparency: 'true'; +$darker: 'false'; + +@import "_colors"; //use gtk colors +@import "_drawing"; +@import "_common"; diff --git a/common/gnome-shell/3.16/.nvmrc b/common/gnome-shell/3.16/.nvmrc index 43c2417..2bf5ad0 100644 --- a/common/gnome-shell/3.16/.nvmrc +++ b/common/gnome-shell/3.16/.nvmrc @@ -1 +1 @@ -0.12.5 +stable diff --git a/common/gnome-shell/3.16/common-assets/dash/dash-bottom.svg b/common/gnome-shell/3.16/common-assets/dash/dash-bottom.svg new file mode 100644 index 0000000..b9e8761 --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/dash/dash-bottom.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/common-assets/dash/dash-extended-bottom.svg b/common/gnome-shell/3.16/common-assets/dash/dash-extended-bottom.svg new file mode 100644 index 0000000..2d7ca3b --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/dash/dash-extended-bottom.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.16/common-assets/dash/dash-extended-left.svg b/common/gnome-shell/3.16/common-assets/dash/dash-extended-left.svg new file mode 100644 index 0000000..e80ed3f --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/dash/dash-extended-left.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.16/common-assets/dash/dash-extended-right.svg b/common/gnome-shell/3.16/common-assets/dash/dash-extended-right.svg new file mode 100644 index 0000000..5c68f7f --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/dash/dash-extended-right.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.16/common-assets/dash/dash-extended-top.svg b/common/gnome-shell/3.16/common-assets/dash/dash-extended-top.svg new file mode 100644 index 0000000..b56904e --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/dash/dash-extended-top.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.16/common-assets/dash/dash-left.svg b/common/gnome-shell/3.16/common-assets/dash/dash-left.svg new file mode 100644 index 0000000..12d3b6b --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/dash/dash-left.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dash/dash-placeholder.svg b/common/gnome-shell/3.16/common-assets/dash/dash-placeholder.svg similarity index 100% rename from common/gnome-shell/3.16/dash/dash-placeholder.svg rename to common/gnome-shell/3.16/common-assets/dash/dash-placeholder.svg diff --git a/common/gnome-shell/3.16/common-assets/dash/dash-right.svg b/common/gnome-shell/3.16/common-assets/dash/dash-right.svg new file mode 100644 index 0000000..e7f7551 --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/dash/dash-right.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.16/common-assets/dash/dash-top.svg b/common/gnome-shell/3.16/common-assets/dash/dash-top.svg new file mode 100644 index 0000000..1d05a3c --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/dash/dash-top.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/common-assets/dash/running1.svg b/common/gnome-shell/3.16/common-assets/dash/running1.svg new file mode 100644 index 0000000..322dc8d --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/dash/running1.svg @@ -0,0 +1,142 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/common/gnome-shell/3.16/common-assets/dash/running2.svg b/common/gnome-shell/3.16/common-assets/dash/running2.svg new file mode 100644 index 0000000..731f8e0 --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/dash/running2.svg @@ -0,0 +1,149 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/common/gnome-shell/3.16/common-assets/dash/running3.svg b/common/gnome-shell/3.16/common-assets/dash/running3.svg new file mode 100644 index 0000000..ca85562 --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/dash/running3.svg @@ -0,0 +1,156 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.16/common-assets/dash/running4.svg b/common/gnome-shell/3.16/common-assets/dash/running4.svg new file mode 100644 index 0000000..7393122 --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/dash/running4.svg @@ -0,0 +1,163 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/menu/menu-separator.svg b/common/gnome-shell/3.16/common-assets/menu/menu-separator.svg similarity index 100% rename from common/gnome-shell/3.16/menu/menu-separator.svg rename to common/gnome-shell/3.16/common-assets/menu/menu-separator.svg diff --git a/common/gnome-shell/3.16/common-assets/misc/bg.svg b/common/gnome-shell/3.16/common-assets/misc/bg.svg new file mode 100644 index 0000000..cf27958 --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/misc/bg.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/common-assets/misc/button-box.svg b/common/gnome-shell/3.16/common-assets/misc/button-box.svg new file mode 100644 index 0000000..7435084 --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/misc/button-box.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.16/misc/close-active.svg b/common/gnome-shell/3.16/common-assets/misc/close-active.svg similarity index 83% rename from common/gnome-shell/3.16/misc/close-active.svg rename to common/gnome-shell/3.16/common-assets/misc/close-active.svg index a541886..95822bf 100644 --- a/common/gnome-shell/3.16/misc/close-active.svg +++ b/common/gnome-shell/3.16/common-assets/misc/close-active.svg @@ -20,32 +20,12 @@ xml:space="preserve" sodipodi:version="0.32" inkscape:version="0.91 r13725" - sodipodi:docname="message-list-close-active.svg" + sodipodi:docname="close-active.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape">image/svg+xmlimage/svg+xmlimage/svg+xml diff --git a/common/gnome-shell/3.14/misc/corner-ripple-rtl.svg b/common/gnome-shell/3.16/common-assets/misc/corner-ripple-rtl.svg similarity index 98% rename from common/gnome-shell/3.14/misc/corner-ripple-rtl.svg rename to common/gnome-shell/3.16/common-assets/misc/corner-ripple-rtl.svg index 408edb3..57176d2 100644 --- a/common/gnome-shell/3.14/misc/corner-ripple-rtl.svg +++ b/common/gnome-shell/3.16/common-assets/misc/corner-ripple-rtl.svg @@ -14,7 +14,7 @@ width="52" height="52" id="svg2" - inkscape:version="0.48.5 r10040" + inkscape:version="0.91 r13725" sodipodi:docname="corner-ripple-rtl.svg"> - - - - - + id="defs12432" /> + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/misc/page-indicator-active.svg b/common/gnome-shell/3.16/common-assets/misc/page-indicator-active.svg similarity index 100% rename from common/gnome-shell/3.16/misc/page-indicator-active.svg rename to common/gnome-shell/3.16/common-assets/misc/page-indicator-active.svg diff --git a/common/gnome-shell/3.14/misc/page-indicator-checked.svg b/common/gnome-shell/3.16/common-assets/misc/page-indicator-checked.svg similarity index 98% rename from common/gnome-shell/3.14/misc/page-indicator-checked.svg rename to common/gnome-shell/3.16/common-assets/misc/page-indicator-checked.svg index 05984c2..249100d 100755 --- a/common/gnome-shell/3.14/misc/page-indicator-checked.svg +++ b/common/gnome-shell/3.16/common-assets/misc/page-indicator-checked.svg @@ -48,7 +48,7 @@ image/svg+xml - + diff --git a/common/gnome-shell/3.14/misc/page-indicator-hover.svg b/common/gnome-shell/3.16/common-assets/misc/page-indicator-hover.svg similarity index 98% rename from common/gnome-shell/3.14/misc/page-indicator-hover.svg rename to common/gnome-shell/3.16/common-assets/misc/page-indicator-hover.svg index 3aad35d..b560780 100755 --- a/common/gnome-shell/3.14/misc/page-indicator-hover.svg +++ b/common/gnome-shell/3.16/common-assets/misc/page-indicator-hover.svg @@ -48,7 +48,7 @@ image/svg+xml - + diff --git a/common/gnome-shell/3.14/misc/page-indicator-inactive.svg b/common/gnome-shell/3.16/common-assets/misc/page-indicator-inactive.svg similarity index 98% rename from common/gnome-shell/3.14/misc/page-indicator-inactive.svg rename to common/gnome-shell/3.16/common-assets/misc/page-indicator-inactive.svg index a3e418b..712573b 100755 --- a/common/gnome-shell/3.14/misc/page-indicator-inactive.svg +++ b/common/gnome-shell/3.16/common-assets/misc/page-indicator-inactive.svg @@ -48,7 +48,7 @@ image/svg+xml - + diff --git a/common/gnome-shell/3.16/common-assets/misc/process-working.svg b/common/gnome-shell/3.16/common-assets/misc/process-working.svg new file mode 100755 index 0000000..33ebb09 --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/misc/process-working.svg @@ -0,0 +1,287 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/misc/ws-switch-arrow-down.png b/common/gnome-shell/3.16/common-assets/misc/ws-switch-arrow-down.png similarity index 100% rename from common/gnome-shell/3.16/misc/ws-switch-arrow-down.png rename to common/gnome-shell/3.16/common-assets/misc/ws-switch-arrow-down.png diff --git a/common/gnome-shell/3.16/misc/ws-switch-arrow-up.png b/common/gnome-shell/3.16/common-assets/misc/ws-switch-arrow-up.png similarity index 100% rename from common/gnome-shell/3.16/misc/ws-switch-arrow-up.png rename to common/gnome-shell/3.16/common-assets/misc/ws-switch-arrow-up.png diff --git a/common/gnome-shell/3.16/common-assets/panel/activities-active.svg b/common/gnome-shell/3.16/common-assets/panel/activities-active.svg new file mode 100644 index 0000000..6986f5c --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/panel/activities-active.svg @@ -0,0 +1,158 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.14/misc/activities.svg b/common/gnome-shell/3.16/common-assets/panel/activities.svg similarity index 79% rename from common/gnome-shell/3.14/misc/activities.svg rename to common/gnome-shell/3.16/common-assets/panel/activities.svg index 4586285..b4a4b0d 100644 --- a/common/gnome-shell/3.14/misc/activities.svg +++ b/common/gnome-shell/3.16/common-assets/panel/activities.svg @@ -24,19 +24,19 @@ stroke="#ef2929" fill="#f57900" id="base" - pagecolor="#8c8c8c" - bordercolor="#ff5e00" + pagecolor="#bebebe" + bordercolor="#525252" borderopacity="1" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="45.254834" - inkscape:cx="18.117513" - inkscape:cy="8.8930078" + inkscape:zoom="22.627417" + inkscape:cx="11.305916" + inkscape:cy="11.635941" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" inkscape:document-units="px" - inkscape:showpageshadow="false" + inkscape:showpageshadow="true" inkscape:window-width="1600" inkscape:window-height="848" inkscape:window-x="0" @@ -133,23 +133,26 @@ inkscape:label="Base" id="layer1" transform="translate(0,-276)"> - - - + + + diff --git a/common/gnome-shell/3.16/common-assets/panel/panel-overview.svg b/common/gnome-shell/3.16/common-assets/panel/panel-overview.svg new file mode 100644 index 0000000..7e48535 --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/panel/panel-overview.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.16/common-assets/panel/panel.svg b/common/gnome-shell/3.16/common-assets/panel/panel.svg new file mode 100644 index 0000000..106ffac --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/panel/panel.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/checkbox/checkbox-checked-focused.svg b/common/gnome-shell/3.16/dark-assets/checkbox/checkbox-checked-focused.svg new file mode 100644 index 0000000..d1b59ee --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/checkbox/checkbox-checked-focused.svg @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/checkbox/checkbox-checked.svg b/common/gnome-shell/3.16/dark-assets/checkbox/checkbox-checked.svg new file mode 100644 index 0000000..fee35ec --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/checkbox/checkbox-checked.svg @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/checkbox/checkbox-unchecked-focused.svg b/common/gnome-shell/3.16/dark-assets/checkbox/checkbox-unchecked-focused.svg new file mode 100644 index 0000000..513b1ad --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/checkbox/checkbox-unchecked-focused.svg @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/checkbox/checkbox-unchecked.svg b/common/gnome-shell/3.16/dark-assets/checkbox/checkbox-unchecked.svg new file mode 100644 index 0000000..1a34771 --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/checkbox/checkbox-unchecked.svg @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/menu/menu-hover.svg b/common/gnome-shell/3.16/dark-assets/menu/menu-hover.svg new file mode 100644 index 0000000..a023a8e --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/menu/menu-hover.svg @@ -0,0 +1,97 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/menu/menu.svg b/common/gnome-shell/3.16/dark-assets/menu/menu.svg new file mode 100644 index 0000000..d6a9fea --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/menu/menu.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/menu/submenu-open.svg b/common/gnome-shell/3.16/dark-assets/menu/submenu-open.svg new file mode 100644 index 0000000..bd817b0 --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/menu/submenu-open.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/menu/submenu.svg b/common/gnome-shell/3.16/dark-assets/menu/submenu.svg new file mode 100644 index 0000000..ebab963 --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/menu/submenu.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/misc/calendar-arrow-left-hover.svg b/common/gnome-shell/3.16/dark-assets/misc/calendar-arrow-left-hover.svg new file mode 100644 index 0000000..7f292f8 --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/misc/calendar-arrow-left-hover.svg @@ -0,0 +1,169 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/misc/calendar-arrow-left.svg b/common/gnome-shell/3.16/dark-assets/misc/calendar-arrow-left.svg new file mode 100644 index 0000000..5602eff --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/misc/calendar-arrow-left.svg @@ -0,0 +1,169 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/misc/calendar-arrow-right-hover.svg b/common/gnome-shell/3.16/dark-assets/misc/calendar-arrow-right-hover.svg new file mode 100644 index 0000000..beadead --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/misc/calendar-arrow-right-hover.svg @@ -0,0 +1,171 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/misc/calendar-arrow-right.svg b/common/gnome-shell/3.16/dark-assets/misc/calendar-arrow-right.svg new file mode 100644 index 0000000..734b53b --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/misc/calendar-arrow-right.svg @@ -0,0 +1,171 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/misc/message-active.svg b/common/gnome-shell/3.16/dark-assets/misc/message-active.svg new file mode 100644 index 0000000..06860fd --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/misc/message-active.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/misc/message-close-active.svg b/common/gnome-shell/3.16/dark-assets/misc/message-close-active.svg new file mode 100644 index 0000000..58fab12 --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/misc/message-close-active.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/misc/message-close-hover.svg b/common/gnome-shell/3.16/dark-assets/misc/message-close-hover.svg new file mode 100644 index 0000000..65aa6cc --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/misc/message-close-hover.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/misc/message-close.svg b/common/gnome-shell/3.16/dark-assets/misc/message-close.svg new file mode 100644 index 0000000..66a5203 --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/misc/message-close.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/misc/message-hover.svg b/common/gnome-shell/3.16/dark-assets/misc/message-hover.svg new file mode 100644 index 0000000..87ead75 --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/misc/message-hover.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/misc/message.svg b/common/gnome-shell/3.16/dark-assets/misc/message.svg new file mode 100644 index 0000000..2fb2d4f --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/misc/message.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/misc/modal.svg b/common/gnome-shell/3.16/dark-assets/misc/modal.svg new file mode 100644 index 0000000..4f5a61b --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/misc/modal.svg @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/switch/switch-off.svg b/common/gnome-shell/3.16/dark-assets/switch/switch-off.svg new file mode 100644 index 0000000..bfd52bd --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/switch/switch-off.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/dark-assets/switch/switch-on.svg b/common/gnome-shell/3.16/dark-assets/switch/switch-on.svg new file mode 100644 index 0000000..a2dd168 --- /dev/null +++ b/common/gnome-shell/3.16/dark-assets/switch/switch-on.svg @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index 67d565c..17db047 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -17,13 +17,11 @@ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ stage { - font-family: Cantarell, Sans-Serif; + font-family: Futura Bk bt, Cantarell, Sans-Serif; font-size: 9pt; color: #5c616c; } -.button, .notification-banner .notification-button, -.notification-banner:hover .notification-button, -.notification-banner:focus .notification-button { +.button { min-height: 20px; padding: 5px 32px; transition-duration: 0; @@ -31,39 +29,71 @@ stage { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; - background-color: #fcfdfd; + background-color: #fbfbfc; border: 1px solid #cfd6e6; } - .button:focus, .notification-banner .notification-button:focus { + .button:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; - background-color: #fcfdfd; + background-color: #fbfbfc; border: 1px solid #5294E2; } - .button:hover, .notification-banner .notification-button:hover { + .button:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; - background-color: #fcfdfd; + background-color: #fbfbfc; border: 1px solid #5294E2; } - .button:hover:focus, .notification-banner .notification-button:hover:focus { + .button:hover:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5294E2; - background-color: #fcfdfd; + background-color: #fbfbfc; border: 1px solid #5294E2; } - .button:active, .notification-banner .notification-button:active, - .button:active:focus, .notification-banner .notification-button:active:focus { + .button:active, .button:active:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; background-color: #5294E2; border: 1px solid #5294E2; } - .button:insensitive, .notification-banner .notification-button:insensitive { + .button:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); - background-color: rgba(252, 253, 253, 0.55); } + background-color: rgba(251, 251, 252, 0.55); } + +.modal-dialog-button-box .button, .notification-banner .notification-button, +.notification-banner:hover .notification-button, +.notification-banner:focus .notification-button, .hotplug-notification-item { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + border: 1px solid rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } + .modal-dialog-button-box .button:hover, .notification-banner .notification-button:hover, + .hotplug-notification-item:hover { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + border: 1px solid #5294E2; + background-color: rgba(0, 0, 0, 0.3); } + .modal-dialog-button-box .button:focus, .notification-banner .notification-button:focus, + .hotplug-notification-item:focus { + color: #5294E2; } + .modal-dialog-button-box .button:active, .notification-banner .notification-button:active, + .hotplug-notification-item:active { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #ffffff; + border: 1px solid #5294E2; + background-color: #5294E2; } + .modal-dialog-button-box .button:insensitive, .notification-banner .notification-button:insensitive, + .hotplug-notification-item:insensitive { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #555a62; + border: 1px solid rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } StEntry { padding: 7px; @@ -84,8 +114,8 @@ StEntry { StEntry:insensitive { box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: rgba(92, 97, 108, 0.55); - background-color: #fcfdfd; - border-color: 1px solid #e2e6ef; } + background-color: #fbfbfb; + border-color: 1px solid #e0e4ee; } StEntry StIcon.capslock-warning { icon-size: 16px; warning-color: #F27835; @@ -107,11 +137,11 @@ StScrollBar { border-radius: 8px; } StScrollBar StButton#vhandle, StScrollBar StButton#hhandle { border-radius: 4px; - background-color: #babdc2; + background-color: #b8babf; border: 0px solid; margin: 0px; } StScrollBar StButton#vhandle:hover, StScrollBar StButton#hhandle:hover { - background-color: #caccd0; } + background-color: #c7c9cd; } StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { background-color: #5294E2; } @@ -135,25 +165,25 @@ StScrollBar { .check-box StBin { width: 16px; height: 16px; - background-image: url("checkbox/checkbox-unchecked.svg"); } + background-image: url("light-assets/checkbox/checkbox-unchecked.svg"); } .check-box:focus StBin { - background-image: url("checkbox/checkbox-unchecked-focused.svg"); } + background-image: url("light-assets/checkbox/checkbox-unchecked-focused.svg"); } .check-box:checked StBin { - background-image: url("checkbox/checkbox-checked.svg"); } + background-image: url("light-assets/checkbox/checkbox-checked.svg"); } .check-box:focus:checked StBin { - background-image: url("checkbox/checkbox-checked-focused.svg"); } + background-image: url("light-assets/checkbox/checkbox-checked-focused.svg"); } .toggle-switch { - width: 52px; - height: 24px; + width: 50px; + height: 20px; background-size: contain; } .toggle-switch-us, .toggle-switch-intl { - background-image: url("switch/switch-off.svg"); } + background-image: url("light-assets/switch/switch-off.svg"); } .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("switch/switch-on.svg"); } + background-image: url("light-assets/switch/switch-on.svg"); } .shell-link { color: #2679db; } @@ -170,59 +200,31 @@ StScrollBar { background-color: white; } .modal-dialog { - border-radius: 3px; color: #5c616c; - background-color: rgba(249, 250, 251, 0); + background-color: rgba(245, 246, 247, 0); border: none; - border-image: url("misc/modal.svg") 10 10 10 10; - padding: 0 6px 6px 6px; } - .modal-dialog > * { - padding: 14px; } + border-image: url("light-assets/misc/modal.svg") 9 9 9 67; + padding: 0 5px 6px 5px; } + .modal-dialog > StBoxLayout:first-child { + padding: 20px 10px 10px 10px; } .modal-dialog-button-box { - spacing: 0px; + spacing: 0; margin: 0px; - padding: 12px 24px; - background-color: #3c4049; - border: solid 0px rgba(0, 0, 0, 0.3); - border-top: 1px; - border-radius: 0px 0px 1px 1px; } - .modal-dialog-button-box .button, .modal-dialog-button-box .notification-banner .notification-button, .notification-banner .modal-dialog-button-box .notification-button { - text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); - color: #c4c7cc; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: rgba(48, 52, 59, 0.95); } - .modal-dialog-button-box .button:hover, .modal-dialog-button-box .notification-banner .notification-button:hover, .notification-banner .modal-dialog-button-box .notification-button:hover { - text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); - color: #ffffff; - border-color: #5294E2; - background-color: rgba(48, 52, 59, 0.95); } - .modal-dialog-button-box .button:focus, .modal-dialog-button-box .notification-banner .notification-button:focus, .notification-banner .modal-dialog-button-box .notification-button:focus { - color: #5294E2; } - .modal-dialog-button-box .button:active, .modal-dialog-button-box .notification-banner .notification-button:active, .notification-banner .modal-dialog-button-box .notification-button:active { - text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); - color: #ffffff; - border-color: #5294E2; - background-color: #5294E2; } - .modal-dialog-button-box .button:insensitive, .modal-dialog-button-box .notification-banner .notification-button:insensitive, .notification-banner .modal-dialog-button-box .notification-button:insensitive { - text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: rgba(53, 57, 65, 0.95); } + padding: 14px 10px; + background: none; + border: none; + border-image: url("common-assets/misc/button-box.svg") 9 9 9 9; } + .modal-dialog-button-box .button { + padding-top: 0; + padding-bottom: 0; + height: 30px; } .modal-dialog .run-dialog-entry { - width: 23em; } + width: 21em; } .modal-dialog .run-dialog-error-box { padding-top: 5px; spacing: 5px; } .modal-dialog .run-dialog-label { - font-size: 10pt; - font-weight: normal; - color: #5c616c; - padding-bottom: .8em; } + font-size: 0; } .show-processes-dialog-subject, .mount-question-dialog-subject, @@ -278,15 +280,15 @@ StScrollBar { .end-session-dialog-app-list-item-description { color: #686d7a; font-size: 8pt; } - .end-session-dialog .button:last-child, .end-session-dialog .notification-banner .notification-button:last-child, .notification-banner .end-session-dialog .notification-button:last-child { + .end-session-dialog .button:last-child { color: #ffffff; background-color: #F04A50; border-color: #F04A50; } - .end-session-dialog .button:last-child:hover, .end-session-dialog .notification-banner .notification-button:last-child:hover, .notification-banner .end-session-dialog .notification-button:last-child:hover { + .end-session-dialog .button:last-child:hover { color: #ffffff; background-color: #f47479; border-color: #f47479; } - .end-session-dialog .button:last-child:active, .end-session-dialog .notification-banner .notification-button:last-child:active, .notification-banner .end-session-dialog .notification-button:last-child:active { + .end-session-dialog .button:last-child:active { color: #ffffff; background-color: #ee3239; border-color: #ee3239; } @@ -404,11 +406,11 @@ StScrollBar { .popup-menu { min-width: 200px; color: #5c616c; - border-image: url("menu/menu.svg") 10 10 35 14; } + border-image: url("light-assets/menu/menu.svg") 9 9 9 9; } .popup-menu .popup-sub-menu { background: none; box-shadow: none; - border-image: url("menu/submenu.svg") 8 8 2 2; } + border-image: url("light-assets/menu/submenu.svg") 9 9 9 9; } .popup-menu .popup-menu-content { padding: 1em 0em 1em 0em; } .popup-menu .popup-menu-item { @@ -420,12 +422,11 @@ StScrollBar { .popup-menu .popup-menu-item:checked { background: none; box-shadow: none; - font-weight: normal; - border-image: url("menu/submenu-open.svg") 8 8 2 2; } + border-image: url("light-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { color: #5c616c; background-color: transparent; - border-image: url("menu/menu-hover.svg") 7 7 1 1; } + border-image: url("light-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { color: rgba(92, 97, 108, 0.5); background: none; } @@ -452,9 +453,9 @@ StScrollBar { .candidate-popup-boxpointer { -arrow-border-radius: 2px; - -arrow-background-color: rgba(37, 39, 45, 0.95); + -arrow-background-color: rgba(42, 44, 51, 0.95); -arrow-border-width: 1px; - -arrow-border-color: rgba(21, 22, 25, 0.95); + -arrow-border-color: rgba(0, 0, 0, 0.4); -arrow-base: 5; -arrow-rise: 5; } @@ -463,7 +464,7 @@ StScrollBar { margin: 10px 0px; background-color: transparent; border: none; - border-image: url("menu/menu-separator.svg") 1 1 1 1; } + border-image: url("common-assets/menu-separator.svg") 1 1 1 1; } .background-menu { -boxpointer-gap: 4px; @@ -481,7 +482,7 @@ StScrollBar { background: none; border: none; border-radius: 5px; - border-image: url("misc/osd.svg") 10 10 9 11; } + border-image: url("common-assets/misc/osd.svg") 9 9 9 9; } .osd-window .osd-monitor-label { font-size: 3em; } .osd-window .level { @@ -492,11 +493,11 @@ StScrollBar { color: #5294E2; } .resize-popup { - color: #A8ADB5; + color: #BAC3CF; background: none; border: none; border-radius: 5px; - border-image: url("misc/osd.svg") 10 10 9 11; + border-image: url("common-assets/misc/osd.svg") 9 9 9 9; padding: 12px; } .switcher-popup { @@ -506,7 +507,7 @@ StScrollBar { .switcher-list { background: none; border: none; - border-image: url("misc/bg.svg") 10 10 35 14; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; border-radius: 3px; padding: 20px; } .switcher-list-item-container { @@ -532,7 +533,7 @@ StScrollBar { .switcher-arrow { border-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } .switcher-arrow:highlighted { color: #ffffff; } @@ -550,7 +551,7 @@ StScrollBar { .workspace-switcher-group { padding: 12px; } .workspace-switcher-container { - border-image: url("misc/bg.svg") 10 10 35 14; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; border-radius: 3px; padding: 20px; padding-bottom: 24px; } @@ -563,10 +564,10 @@ StScrollBar { border: 1px solid #5294E2; } .ws-switcher-active-up { - background-image: url("misc/ws-switch-arrow-up.png"); } + background-image: url("common-assets/misc/ws-switch-arrow-up.png"); } .ws-switcher-active-down { - background-image: url("misc/ws-switch-arrow-down.png"); } + background-image: url("common-assets/misc/ws-switch-arrow-down.png"); } .ws-switcher-box { height: 96px; @@ -585,19 +586,17 @@ StScrollBar { border-radius: 0px 0px 0 0; } #panel { - background-color: rgba(37, 39, 45, 0.95); - border-color: rgba(16, 17, 20, 0.95); - border-bottom-width: 1px; font-weight: bold; height: 2.1em; - min-height: 26px; } + min-height: 27px; + border-image: url("common-assets/panel/panel.svg") 1 1 1 1; } #panel.unlock-screen, #panel.login-screen, #panel.lock-screen { background-color: transparent; border-image: none; } #panel:overview { - background-color: rgba(14, 15, 17, 0.8); } + border-image: url("common-assets/panel/panel-overview.svg") 1 1 1 1; } #panel #panelLeft, #panel #panelCenter { spacing: 8px; } #panel .panel-corner { @@ -612,28 +611,34 @@ StScrollBar { -panel-corner-background-color: transparent; -panel-corner-border-color: transparent; } #panel .panel-button { - -natural-hpadding: 12px; + -natural-hpadding: 10px; -minimum-hpadding: 6px; font-weight: bold; color: #ffffff; - transition-duration: 100ms; } + transition-duration: 100ms; + border-bottom-width: 1px; + border-color: transparent; } #panel .panel-button .app-menu-icon { width: 0; height: 0; - margin-left: 4px; - margin-right: 4px; } + margin-left: 0px; + margin-right: 0px; } #panel .panel-button:hover { color: #ffffff; - background-color: rgba(0, 0, 0, 0.17); } + background-color: rgba(0, 0, 0, 0.17); + border-bottom-width: 1px; + border-color: transparent; } #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked { color: #ffffff; background-color: #5294E2; - box-shadow: none; } + box-shadow: none; + border-bottom-width: 1px; + border-color: black; } #panel .panel-button:active > .system-status-icon, #panel .panel-button:overview > .system-status-icon, #panel .panel-button:focus > .system-status-icon, #panel .panel-button:checked > .system-status-icon { icon-shadow: none; } #panel .panel-button .system-status-icon { icon-size: 16px; - padding: 0 8px; } + padding: 0 4px; } .unlock-screen #panel .panel-button, .login-screen #panel .panel-button, .lock-screen #panel .panel-button { @@ -646,20 +651,21 @@ StScrollBar { .login-screen #panel .panel-button:active, .lock-screen #panel .panel-button:focus, .lock-screen #panel .panel-button:hover, .lock-screen #panel .panel-button:active { color: #737a88; } + #panel #panelActivities.panel-button { + -natural-hpadding: 12px; } #panel .panel-status-indicators-box, #panel .panel-status-menu-box { spacing: 2px; } #panel .screencast-indicator { - color: red; } + color: #FC4138; } + #panel .clock-display > * > *:last-child { + color: #5294E2; + margin-left: .3em; } + #panel .popup-menu-arrow { + width: 0; } -#panelActivities > *, -#panelActivities:hover > *, -#panelActivities:focus > *, -#panelActivities:active > *, -#panelActivities:overview > *, -#panel:overview #panelActivities.panel-button:active > *, -#panel:overview #panelActivities.panel-button:focus > * { - background-image: url("misc/activities.svg"); +#panel #panelActivities.panel-button > * { + background-image: url("common-assets/panel/activities.svg"); background-position: center top; width: 24px; height: 24px; @@ -671,13 +677,22 @@ StScrollBar { box-shadow: none !important; color: transparent; } +#panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked { + background-color: transparent; + box-shadow: none; + border-bottom-width: 1px; + border-color: transparent; } + #panel #panelActivities.panel-button:active > *, #panel #panelActivities.panel-button:overview > *, #panel #panelActivities.panel-button:focus > *, #panel #panelActivities.panel-button:checked > * { + background-image: url("common-assets/panel/activities-active.svg"); } + .system-switch-user-submenu-icon { icon-size: 24px; border: 1px solid rgba(92, 97, 108, 0.4); } #appMenu { - spinner-image: url("misc/process-working.svg"); - spacing: 4px; } + spinner-image: url("common-assets/misc/process-working.svg"); + spacing: 4px; + padding: 0 8px; } #appMenu .label-shadow { color: transparent; } @@ -748,7 +763,7 @@ StScrollBar { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; - background-color: #fcfdfd; + background-color: #fbfbfc; border: 1px solid #5294E2; } .datemenu-today-button:active, .world-clocks-button:active, @@ -787,30 +802,30 @@ StScrollBar { background-color: transparent; } .calendar-change-month-back { - background-image: url("misc/calendar-arrow-left.svg"); } + background-image: url("light-assets/misc/calendar-arrow-left.svg"); } .calendar-change-month-back:focus, .calendar-change-month-back:hover { - background-image: url("misc/calendar-arrow-left-hover.svg"); } + background-image: url("light-assets/misc/calendar-arrow-left-hover.svg"); } .calendar-change-month-back:active { - background-image: url("misc/calendar-arrow-left.svg"); } + background-image: url("light-assets/misc/calendar-arrow-left.svg"); } .calendar-change-month-back:rtl { - background-image: url("misc/calendar-arrow-right.svg"); } + background-image: url("light-assets/misc/calendar-arrow-right.svg"); } .calendar-change-month-back:rtl:focus, .calendar-change-month-back:rtl:hover { - background-image: url("misc/calendar-arrow-right-hover.svg"); } + background-image: url("light-assets/misc/calendar-arrow-right-hover.svg"); } .calendar-change-month-back:rtl:active { - background-image: url("misc/calendar-arrow-right.svg"); } + background-image: url("light-assets/misc/calendar-arrow-right.svg"); } .calendar-change-month-forward { - background-image: url("misc/calendar-arrow-right.svg"); } + background-image: url("light-assets/misc/calendar-arrow-right.svg"); } .calendar-change-month-forward:focus, .calendar-change-month-forward:hover { - background-image: url("misc/calendar-arrow-right-hover.svg"); } + background-image: url("light-assets/misc/calendar-arrow-right-hover.svg"); } .calendar-change-month-forward:active { - background-image: url("misc/calendar-arrow-right.svg"); } + background-image: url("light-assets/misc/calendar-arrow-right.svg"); } .calendar-change-month-forward:rtl { - background-image: url("misc/calendar-arrow-left.svg"); } + background-image: url("light-assets/misc/calendar-arrow-left.svg"); } .calendar-change-month-forward:rtl:focus, .calendar-change-month-forward:rtl:hover { - background-image: url("misc/calendar-arrow-left-hover.svg"); } + background-image: url("light-assets/misc/calendar-arrow-left-hover.svg"); } .calendar-change-month-forward:rtl:active { - background-image: url("misc/calendar-arrow-left.svg"); } + background-image: url("light-assets/misc/calendar-arrow-left.svg"); } .calendar-day-base { font-size: 80%; @@ -867,74 +882,66 @@ StScrollBar { .message-list { width: 420px; } - -.message-list-sections { - spacing: 1.5em; } - -.message-list-section, -.message-list-section-list { - spacing: 0.7em; } - -.message-list-section-title-box { - spacing: 0.4em; } - -.message-list-section-close > StIcon { - icon-size: 16px; - border-radius: 8px; - color: #ffffff; - background-color: rgba(92, 97, 108, 0.5); } - -.message-list-section-close:hover > StIcon, -.message-list-section-close:focus > StIcon { - color: #ffffff; - background-color: #5c616c; } - -.message-list-section-close:active > StIcon { - color: #ffffff; - background-color: #5294E2; } + .message-list-sections { + spacing: 1.5em; } + .message-list-section, + .message-list-section-list { + spacing: 0.7em; } + .message-list-section-list-title-box { + spacing: 0.4em; } + .message-list-placeholder StIcon { + width: 0; + height: 0; } + .message-list-placeholder StLabel { + color: rgba(92, 97, 108, 0.55); } + .message-list-section-close > StIcon { + icon-size: 18px; + border-radius: 0px; + color: transparent; + background-color: transparent; + background-image: url("light-assets/misc/message-close.svg"); } + .message-list-section-close:hover > StIcon { + color: transparent; + background-color: transparent; + background-image: url("light-assets/misc/message-close-hover.svg"); } + .message-list-section-close:active > StIcon { + color: transparent; + background-color: transparent; + background-image: url("light-assets/misc/message-close-active.svg"); } .message { padding: 4px; color: #5c616c; - background-color: #fcfdfd; - border: 1px solid #cfd6e6; } + border-image: url("light-assets/misc/message.svg") 9 9 9 9; } .message:hover, .message:focus { color: #5c616c; - background-color: #fcfdfd; - border: 1px solid #5294E2; } + border-image: url("light-assets/misc/message-hover.svg") 9 9 9 9; } .message:active { color: #ffffff; - background-color: #5294E2; - border: 1px solid #5294E2; } - -.message-icon-bin { - padding: 8px 0px 8px 8px; } - .message-icon-bin:rtl { - padding: 8px 8px 8px 0px; } - -.message-icon-bin > StIcon { - icon-size: 48px; } - -.message-secondary-bin { - color: rgba(92, 97, 108, 0.4); } - -.message-secondary-bin > StIcon { - icon-size: 16px; } - -.message-title { - font-weight: bold; - padding: 2px 0 2px 0; } - -.message-content { - padding: 8px; } + border-image: url("light-assets/misc/message-active.svg") 9 9 9 9; } + .message-icon-bin { + padding: 8px 0px 8px 8px; } + .message-icon-bin:rtl { + padding: 8px 8px 8px 0px; } + .message-icon-bin > StIcon { + icon-size: 48px; } + .message-secondary-bin { + color: rgba(92, 97, 108, 0.4); } + .message-secondary-bin > StIcon { + icon-size: 16px; } + .message-title { + font-weight: bold; + padding: 2px 0 2px 0; } + .message-content { + padding: 8px; } .ripple-box { width: 52px; height: 52px; - background-image: url("misc/corner-ripple-ltr.svg"); + background-image: url("common-assets/misc/corner-ripple-ltr.svg"); background-size: contain; } .ripple-box:rtl { - background-image: url("misc/corner-ripple-rtl.svg"); } + background-image: url("common-assets/misc/corner-ripple-rtl.svg"); } .popup-menu-arrow { width: 16px; @@ -944,12 +951,12 @@ StScrollBar { icon-size: 16px; } .window-close { - background-image: url("misc/close.svg"); + background-image: url("common-assets/misc/close.svg"); background-size: 26px; height: 26px; width: 26px; } .window-close:hover { - background-image: url("misc/close-hover.svg"); + background-image: url("common-assets/misc/close-hover.svg"); background-size: 26px; height: 26px; width: 26px; } @@ -981,7 +988,7 @@ StScrollBar { .nm-dialog-header-icon { icon-size: 32px; } .nm-dialog-scroll-view { - border: 1px solid #dde3e9; + border: 1px solid #dbdfe3; border-radius: 2px; background-color: #ffffff; } .nm-dialog-header { @@ -1028,7 +1035,7 @@ StScrollBar { .window-caption, .window-caption:hover { spacing: 25px; - color: #A8ADB5; + color: #BAC3CF; background-color: rgba(0, 0, 0, 0.7); border-radius: 2px; padding: 4px 12px; @@ -1094,27 +1101,35 @@ StScrollBar { .search-provider-icon-more { width: 16px; height: 16px; - background-image: url("misc/more-results.svg"); } + background-image: url("common-assets/misc/more-results.svg"); } #dash { font-size: 1em; - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0.87); - padding: 6px 0px 6px 0px; - border-color: rgba(16, 17, 20, 0.87); - border-radius: 0px 3px 3px 0px; } + color: #BAC3CF; + background-color: transparent; + border: none; + padding: 6px 1px 6px 0px; + border-image: url("common-assets/dash/dash-left.svg") 3 3 3 3; } + .extended.left #dash { + border-image: url("common-assets/dash/dash-extended-left.svg") 3 3 3 3; } .right #dash, #dash:rtl { - padding: 6px 0px 6px 0px; - border-radius: 3px 0 0 3px; } + padding: 6px 0px 6px 1px; + border-image: url("common-assets/dash/dash-right.svg") 3 3 3 3; } + .extended.right #dash { + border-image: url("common-assets/dash/dash-extended-right.svg") 3 3 3 3; } .bottom #dash { - padding: 0px 6px 0px 6px; - border-radius: 3px 3px 0 0; } + padding: 1px 6px 0px 6px; + border-image: url("common-assets/dash/dash-bottom.svg") 3 3 3 3; } + .extended.bottom #dash { + border-image: url("common-assets/dash/dash-extended-bottom.svg") 3 3 3 3; } .top #dash { - padding: 0px 6px 0px 6px; - border-radius: 0 0 3px 3px; } + padding: 0px 6px 1px 6px; + border-image: url("common-assets/dash/dash-top.svg") 3 3 3 3; } + .extended.top #dash { + border-image: url("common-assets/dash/dash-extended-top.svg") 3 3 3 3; } #dash .placeholder { - background-image: url("dash/dash-placeholder.svg"); + background-image: url("common-assets/dash/dash-placeholder.svg"); background-size: contain; height: 24px; } #dash .empty-dash-drop-target { @@ -1166,6 +1181,23 @@ StScrollBar { margin-bottom: 6px; background-color: #5294E2; } +#dashtodockContainer .app-well-app-running-dot { + background: none; + width: 28px; + height: 4px; } + +#dashtodockContainer .running1 .app-well-app-running-dot { + background-image: url("common-assets/dash/running1.svg"); } + +#dashtodockContainer .running2 .app-well-app-running-dot { + background-image: url("common-assets/dash/running2.svg"); } + +#dashtodockContainer .running3 .app-well-app-running-dot { + background-image: url("common-assets/dash/running3.svg"); } + +#dashtodockContainer .running4 .app-well-app-running-dot { + background-image: url("common-assets/dash/running4.svg"); } + .show-apps .overview-icon { padding: 11px; background-color: rgba(0, 0, 0, 0.5); @@ -1197,34 +1229,36 @@ StScrollBar { .app-view-control { padding: 4px 32px; - color: rgba(255, 255, 255, 0.8); - background-color: rgba(14, 15, 17, 0.8); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(42, 44, 51, 0.95); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.7); } .app-view-control:hover { - color: #ffffff; - background-color: rgba(14, 15, 17, 0.8); + background-color: rgba(42, 44, 51, 0.95); + color: #BAC3CF; border-color: #5294E2; } .app-view-control:checked { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; - border-color: #5294E2; + border: 1px solid #5294E2; background-color: #5294E2; } - .app-view-control:first-child:ltr, .app-view-control:last-child:rtl { + .app-view-control:first-child:ltr, + .app-view-control:last-child:rtl { border-radius: 2px 0 0 2px; } - .app-view-control:last-child:ltr, .app-view-control:first-child:rtl { + .app-view-control:last-child:ltr, + .app-view-control:first-child:rtl { border-radius: 0 2px 2px 0; } .search-provider-icon:active, .search-provider-icon:checked, .list-search-result:active, .list-search-result:checked { - background-color: rgba(37, 39, 45, 0.85); } + background-color: rgba(19, 20, 23, 0.85); } .search-provider-icon:focus, .search-provider-icon:selected, .search-provider-icon:hover, .list-search-result:focus, .list-search-result:selected, .list-search-result:hover { - background-color: rgba(168, 173, 181, 0.4); + background-color: rgba(186, 195, 207, 0.4); transition-duration: 200ms; } .app-well-app:active .overview-icon, @@ -1233,7 +1267,7 @@ StScrollBar { .app-well-app.app-folder:checked .overview-icon, .grid-search-result:active .overview-icon, .grid-search-result:checked .overview-icon { - background-color: rgba(37, 39, 45, 0.85); + background-color: rgba(19, 20, 23, 0.85); box-shadow: inset 0 0 #5294E2; } .app-well-app:hover .overview-icon, @@ -1245,7 +1279,7 @@ StScrollBar { .grid-search-result:hover .overview-icon, .grid-search-result:focus .overview-icon, .grid-search-result:selected .overview-icon { - background-color: rgba(168, 173, 181, 0.4); + background-color: rgba(186, 195, 207, 0.4); transition-duration: 0ms; border-image: none; background-image: none; } @@ -1268,11 +1302,11 @@ StScrollBar { text-align: center; } .app-well-app.app-folder > .overview-icon { - background-color: rgba(14, 15, 17, 0.8); - border: 1px solid rgba(168, 173, 181, 0.3); } + background-color: rgba(8, 8, 9, 0.8); + border: 1px solid rgba(186, 195, 207, 0.3); } .app-well-app.app-folder:hover > .overview-icon { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(54, 57, 65, 0.95); } .app-well-app.app-folder:active > .overview-icon, .app-well-app.app-folder:checked > .overview-icon { background-color: #5294E2; @@ -1283,11 +1317,12 @@ StScrollBar { .app-folder-popup { -arrow-border-radius: 2px; - -arrow-background-color: rgba(14, 15, 17, 0.8); - -arrow-border-color: rgba(168, 173, 181, 0.3); - -arrow-border-width: 1px; - -arrow-base: 5; - -arrow-rise: 5; } + -arrow-background-color: transparent; + -arrow-border-color: transparent; + -arrow-border-width: 0; + -arrow-base: 0; + -arrow-rise: 0; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; } .app-folder-popup-bin { padding: 5px; } @@ -1302,14 +1337,14 @@ StScrollBar { .page-indicator .page-indicator-icon { width: 18px; height: 18px; - background-image: url(misc/page-indicator-inactive.svg); } + background-image: url(common-assets/misc/page-indicator-inactive.svg); } .page-indicator:hover .page-indicator-icon { - background-image: url(misc/page-indicator-hover.svg); } + background-image: url(common-assets/misc/page-indicator-hover.svg); } .page-indicator:active .page-indicator-icon { - background-image: url(misc/page-indicator-active.svg); } + background-image: url(common-assets/misc/page-indicator-active.svg); } .page-indicator:checked .page-indicator-icon, .page-indicator:checked:active { - background-image: url(misc/page-indicator-checked.svg); } + background-image: url(common-assets/misc/page-indicator-checked.svg); } .app-well-app > .overview-icon.overview-icon-with-label, .grid-search-result .overview-icon.overview-icon-with-label { @@ -1321,13 +1356,11 @@ StScrollBar { spacing: 11px; padding: 12px; padding-right: 7px; - border-radius: 3px 0 0 3px; - background-color: rgba(37, 39, 45, 0.87); - border-color: rgba(16, 17, 20, 0.87); } + border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; } .workspace-thumbnails:rtl { padding: 12px; padding-left: 7px; - border-radius: 0 3px 3px 0; } + border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } .workspace-thumbnail-indicator { border: 4px solid rgba(82, 148, 226, 0.8); @@ -1354,11 +1387,10 @@ StScrollBar { width: 34em; margin: 5px; padding: 10px; - border-radius: 2px; - color: #5c616c; - background-color: #f9fafb; - border: 0px solid transparent; - box-shadow: 0 1px 5px rgba(0, 0, 0, 0.2); } + color: #BAC3CF; + background-color: transparent; + border: 1px solid transparent; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; } .notification-banner .notification-icon, .notification-banner:hover .notification-icon, .notification-banner:focus .notification-icon { @@ -1377,7 +1409,7 @@ StScrollBar { .notification-banner:focus .notification-actions { background-color: transparent; padding: 2px 2px 0 2px; - spacing: 1px; } + spacing: 3px; } .notification-banner .notification-button, .notification-banner:hover .notification-button, .notification-banner:focus .notification-button { @@ -1399,7 +1431,7 @@ StScrollBar { margin: 5px; } .chat-log-message { - color: #5c616c; } + color: #BAC3CF; } .chat-new-group { padding-top: 1em; } @@ -1410,6 +1442,17 @@ StScrollBar { padding-left: 0px; padding-right: 4px; } +StEntry.chat-response { + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + background-color: rgba(0, 0, 0, 0.2); + border: 1px solid rgba(0, 0, 0, 0.4); } + StEntry.chat-response:focus { + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + background-color: rgba(0, 0, 0, 0.2); + border: 1px solid #5294E2; } + .chat-sent { padding-left: 18pt; color: #5294E2; } @@ -1421,7 +1464,7 @@ StScrollBar { padding-left: 4px; font-size: 9pt; font-weight: bold; - color: rgba(92, 97, 108, 0.6); } + color: rgba(186, 195, 207, 0.6); } .chat-meta-message:rtl { padding-left: 0; padding-right: 4px; } @@ -1436,7 +1479,7 @@ StScrollBar { .hotplug-notification-item { padding: 2px 10px; } .hotplug-notification-item:focus { - padding: 1px 71px 1px 11px; } + padding: 2px 10px; } .hotplug-notification-item-icon { icon-size: 24px; @@ -1449,7 +1492,7 @@ StScrollBar { spacing: 8px; border-radius: 4px; } .hotplug-resident-mount:hover { - background-color: rgba(249, 250, 251, 0.3); } + background-color: rgba(245, 246, 247, 0.3); } .hotplug-resident-mount-label { color: inherit; @@ -1468,7 +1511,7 @@ StScrollBar { color: pink; } .legacy-tray { - background-color: rgba(37, 39, 45, 0.95); + background-color: rgba(31, 33, 37, 0.95); border-width: 0; } .legacy-tray:ltr { border-radius: 0 2px 0 0; @@ -1504,7 +1547,10 @@ StScrollBar { border-width: 0; } #keyboard { - background-color: rgba(37, 39, 45, 0.9); } + background-color: rgba(42, 44, 51, 0.95); + border-width: 0; + border-top-width: 1px; + border-color: rgba(0, 0, 0, 0.4); } .keyboard-layout { spacing: 10px; @@ -1514,48 +1560,43 @@ StScrollBar { spacing: 15px; } .keyboard-key { - text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); - color: #c4c7cc; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: rgba(48, 52, 59, 0.95); min-height: 2em; min-width: 2em; font-size: 14pt; font-weight: bold; border-radius: 3px; - box-shadow: none; } - .keyboard-key:focus { + box-shadow: none; + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + border: 1px solid rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } + .keyboard-key:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); - color: #5c616c; - background-color: #fcfdfd; - border: 1px solid #5294E2; } - .keyboard-key:hover, .keyboard-key:checked { + color: #BAC3CF; + border: 1px solid #5294E2; + background-color: rgba(0, 0, 0, 0.3); } + .keyboard-key:active, .keyboard-key:checked { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; - border-color: #5294E2; - background-color: rgba(48, 52, 59, 0.95); } - .keyboard-key:active { - text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); - color: #ffffff; - border-color: #5294E2; + border: 1px solid #5294E2; background-color: #5294E2; } .keyboard-key:grayed { - background-color: rgba(60, 64, 73, 0.95); - color: #A8ADB5; - border-color: rgba(0, 0, 0, 0.7); } + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #555a62; + border: 1px solid rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .keyboard-subkeys { - color: white; + color: #BAC3CF; padding: 5px; -arrow-border-radius: 2px; - -arrow-background-color: rgba(37, 39, 45, 0.9); - -arrow-border-width: 0px; - -arrow-border-color: transparent; + -arrow-background-color: rgba(42, 44, 51, 0.95); + -arrow-border-width: 1px; + -arrow-border-color: rgba(0, 0, 0, 0.4); -arrow-base: 20px; -arrow-rise: 10px; -boxpointer-gap: 5px; } @@ -1563,17 +1604,17 @@ StScrollBar { .candidate-popup-content { padding: 0.5em; spacing: 0.3em; - color: #A8ADB5; + color: #BAC3CF; font-size: 1.15em; } .candidate-index { padding: 0 0.5em 0 0; - color: #c4c7cc; } + color: #d8dde4; } .candidate-box { padding: 0.3em 0.5em 0.3em 0.5em; - border-radius: 4px; - color: #A8ADB5; } + border-radius: 2px; + color: #BAC3CF; } .candidate-box:selected, .candidate-box:hover { background-color: #5294E2; color: #ffffff; } @@ -1605,7 +1646,7 @@ StScrollBar { border-radius: 2px; } .framed-user-icon:hover { border-color: transparent; - color: #fbfbfb; } + color: white; } .login-dialog-banner-view { padding-top: 24px; @@ -1622,13 +1663,13 @@ StScrollBar { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; - background-color: #fcfdfd; + background-color: #fbfbfc; border: 1px solid #cfd6e6; } .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; - background-color: #fcfdfd; + background-color: #fbfbfc; border: 1px solid #5294E2; } .login-dialog .modal-dialog-button:default:active { text-shadow: 0 1px rgba(255, 255, 255, 0); @@ -1641,13 +1682,13 @@ StScrollBar { box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); - background-color: rgba(252, 253, 253, 0.55); } + background-color: rgba(251, 251, 252, 0.55); } .login-dialog-logo-bin { padding: 24px 0px; } .login-dialog-banner { - color: #8c939e; } + color: #9ca9ba; } .login-dialog-button-box { spacing: 5px; } @@ -1665,12 +1706,12 @@ StScrollBar { padding-left: 2px; } .login-dialog-not-listed-button:focus .login-dialog-user-selection-box .login-dialog-not-listed-label, .login-dialog-not-listed-button:hover .login-dialog-user-selection-box .login-dialog-not-listed-label { - color: #A8ADB5; } + color: #BAC3CF; } .login-dialog-not-listed-label { font-size: 90%; font-weight: bold; - color: #5a606a; + color: #62758e; padding-top: 1em; } .login-dialog-user-list-view { @@ -1689,7 +1730,7 @@ StScrollBar { .login-dialog-user-list-item { border-radius: 5px; padding: .2em; - color: #5a606a; } + color: #62758e; } .login-dialog-user-list-item:ltr { padding-right: 1em; } .login-dialog-user-list-item:rtl { @@ -1700,13 +1741,13 @@ StScrollBar { .login-dialog-user-list-item .login-dialog-timed-login-indicator { height: 2px; margin: 2px 0 0 0; - background-color: #A8ADB5; } + background-color: #BAC3CF; } .login-dialog-user-list-item:focus .login-dialog-timed-login-indicator { background-color: #ffffff; } .login-dialog-username, .user-widget-label { - color: #A8ADB5; + color: #BAC3CF; font-size: 120%; font-weight: bold; text-align: left; @@ -1725,7 +1766,7 @@ StScrollBar { width: 23em; } .login-dialog-prompt-label { - color: #727985; + color: #7e8fa5; font-size: 110%; padding-top: 1em; } @@ -1733,11 +1774,11 @@ StScrollBar { icon-size: 1.25em; } .login-dialog-session-list-button { - color: #5a606a; } + color: #62758e; } .login-dialog-session-list-button:hover, .login-dialog-session-list-button:focus { - color: #A8ADB5; } + color: #BAC3CF; } .login-dialog-session-list-button:active { - color: #2b2e33; } + color: #394351; } .screen-shield-arrows { padding-bottom: 3em; } @@ -1774,9 +1815,9 @@ StScrollBar { .screen-shield-notifications-container .notification, .screen-shield-notifications-container .screen-shield-notification-source { padding: 12px 6px; - border: 1px solid rgba(168, 173, 181, 0.2); - background-color: rgba(60, 64, 73, 0.45); - color: #A8ADB5; + border: 1px solid rgba(186, 195, 207, 0.2); + background-color: rgba(42, 44, 51, 0.45); + color: #BAC3CF; border-radius: 4px; } .screen-shield-notifications-container .notification { margin-right: 15px; } @@ -1789,7 +1830,7 @@ StScrollBar { padding: 0px 0px 0px 12px; } #panel.lock-screen { - background-color: rgba(60, 64, 73, 0.5); } + background-color: rgba(42, 44, 51, 0.5); } .screen-shield-background { background: black; @@ -1800,9 +1841,9 @@ StScrollBar { background-repeat: repeat; } #screenShieldNotifications StButton#vhandle, #screenShieldNotifications StButton#hhandle { - background-color: rgba(249, 250, 251, 0.3); } + background-color: rgba(245, 246, 247, 0.3); } #screenShieldNotifications StButton#vhandle:hover, #screenShieldNotifications StButton#vhandle:focus, #screenShieldNotifications StButton#hhandle:hover, #screenShieldNotifications StButton#hhandle:focus { - background-color: rgba(249, 250, 251, 0.5); } + background-color: rgba(245, 246, 247, 0.5); } #screenShieldNotifications StButton#vhandle:active, #screenShieldNotifications StButton#hhandle:active { background-color: rgba(82, 148, 226, 0.5); } @@ -1811,12 +1852,12 @@ StScrollBar { padding: 8px 8px 10px 8px; background-color: rgba(0, 0, 0, 0.7); border: 1px solid black; - border-image: url("misc/osd.svg") 10 10 9 11; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; border-radius: 2px; - color: #A8ADB5; } + color: #BAC3CF; } #LookingGlassDialog > #Toolbar { padding: 3px; - border: 1px solid rgba(44, 47, 53, 0.95); + border: none; background-color: transparent; border-radius: 0px; } #LookingGlassDialog .labels { @@ -1825,7 +1866,7 @@ StScrollBar { -natural-hpadding: 12px; -minimum-hpadding: 6px; font-weight: bold; - color: #A8ADB5; + color: #BAC3CF; transition-duration: 100ms; padding-left: .3em; padding-right: .3em; } @@ -1843,13 +1884,17 @@ StScrollBar { spacing: 4px; } .lg-dialog StEntry { - background-color: rgba(0, 0, 0, 0.3); - color: #A8ADB5; selection-background-color: #5294E2; selected-color: #ffffff; - border-color: rgba(168, 173, 181, 0.3); } + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + background-color: rgba(0, 0, 0, 0.2); + border: 1px solid rgba(0, 0, 0, 0.4); } .lg-dialog StEntry:focus { - border-color: #5294E2; } + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + background-color: rgba(0, 0, 0, 0.2); + border: 1px solid #5294E2; } .lg-dialog .shell-link { color: #2679db; } @@ -1878,9 +1923,9 @@ StScrollBar { spacing: 6px; } .lg-extension { - border: 1px solid #dde3e9; + border: 1px solid rgba(0, 0, 0, 0.7); border-radius: 2px; - background-color: #f9fafb; + background-color: rgba(42, 44, 51, 0.95); padding: 4px; } .lg-extension-name { @@ -1894,3 +1939,15 @@ StScrollBar { border: 1px solid grey; border-radius: 2px; padding: 6px; } + +/*tweaks*/ +.panel-button:active, +.panel-button:overview, +.panel-button:focus, +.panel-button:hover, +#appMenu, +#panel { + text-shadow: 0px 0px white; } + +stage { + font-weight: bold; } diff --git a/common/gnome-shell/3.16/checkbox/checkbox-checked-focused.svg b/common/gnome-shell/3.16/light-assets/checkbox/checkbox-checked-focused.svg similarity index 100% rename from common/gnome-shell/3.16/checkbox/checkbox-checked-focused.svg rename to common/gnome-shell/3.16/light-assets/checkbox/checkbox-checked-focused.svg diff --git a/common/gnome-shell/3.16/checkbox/checkbox-checked.svg b/common/gnome-shell/3.16/light-assets/checkbox/checkbox-checked.svg similarity index 100% rename from common/gnome-shell/3.16/checkbox/checkbox-checked.svg rename to common/gnome-shell/3.16/light-assets/checkbox/checkbox-checked.svg diff --git a/common/gnome-shell/3.16/checkbox/checkbox-unchecked-focused.svg b/common/gnome-shell/3.16/light-assets/checkbox/checkbox-unchecked-focused.svg similarity index 100% rename from common/gnome-shell/3.16/checkbox/checkbox-unchecked-focused.svg rename to common/gnome-shell/3.16/light-assets/checkbox/checkbox-unchecked-focused.svg diff --git a/common/gnome-shell/3.16/checkbox/checkbox-unchecked.svg b/common/gnome-shell/3.16/light-assets/checkbox/checkbox-unchecked.svg similarity index 100% rename from common/gnome-shell/3.16/checkbox/checkbox-unchecked.svg rename to common/gnome-shell/3.16/light-assets/checkbox/checkbox-unchecked.svg diff --git a/common/gnome-shell/3.14/menu/menu-hover.svg b/common/gnome-shell/3.16/light-assets/menu/menu-hover.svg similarity index 93% rename from common/gnome-shell/3.14/menu/menu-hover.svg rename to common/gnome-shell/3.16/light-assets/menu/menu-hover.svg index d371bd7..938245a 100644 --- a/common/gnome-shell/3.14/menu/menu-hover.svg +++ b/common/gnome-shell/3.16/light-assets/menu/menu-hover.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="1.0550014" - inkscape:cy="18.020602" + inkscape:cx="4.0327991" + inkscape:cy="13.945988" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -69,7 +69,7 @@ id="layer1" transform="translate(-137,-382.36221)"> diff --git a/common/gnome-shell/3.16/light-assets/menu/menu.svg b/common/gnome-shell/3.16/light-assets/menu/menu.svg new file mode 100644 index 0000000..5ae7466 --- /dev/null +++ b/common/gnome-shell/3.16/light-assets/menu/menu.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/menu/submenu-open.svg b/common/gnome-shell/3.16/light-assets/menu/submenu-open.svg similarity index 85% rename from common/gnome-shell/3.14/menu/submenu-open.svg rename to common/gnome-shell/3.16/light-assets/menu/submenu-open.svg index 5d57a31..8062443 100644 --- a/common/gnome-shell/3.14/menu/submenu-open.svg +++ b/common/gnome-shell/3.16/light-assets/menu/submenu-open.svg @@ -28,8 +28,8 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="16.000001" - inkscape:cx="19.724947" - inkscape:cy="6.8134088" + inkscape:cx="7.5374477" + inkscape:cy="6.5634088" inkscape:document-units="px" inkscape:current-layer="g3027" showgrid="true" @@ -76,7 +76,7 @@ image/svg+xml - + @@ -91,27 +91,19 @@ - diff --git a/common/gnome-shell/3.16/menu/submenu.svg b/common/gnome-shell/3.16/light-assets/menu/submenu.svg similarity index 86% rename from common/gnome-shell/3.16/menu/submenu.svg rename to common/gnome-shell/3.16/light-assets/menu/submenu.svg index 9172367..766c82e 100644 --- a/common/gnome-shell/3.16/menu/submenu.svg +++ b/common/gnome-shell/3.16/light-assets/menu/submenu.svg @@ -28,8 +28,8 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="16.000001" - inkscape:cx="19.724947" - inkscape:cy="6.8134088" + inkscape:cx="7.5374477" + inkscape:cy="6.5634088" inkscape:document-units="px" inkscape:current-layer="g3027" showgrid="true" @@ -91,27 +91,19 @@ - diff --git a/common/gnome-shell/3.16/light-assets/misc/calendar-arrow-left-hover.svg b/common/gnome-shell/3.16/light-assets/misc/calendar-arrow-left-hover.svg new file mode 100644 index 0000000..7f292f8 --- /dev/null +++ b/common/gnome-shell/3.16/light-assets/misc/calendar-arrow-left-hover.svg @@ -0,0 +1,169 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/light-assets/misc/calendar-arrow-left.svg b/common/gnome-shell/3.16/light-assets/misc/calendar-arrow-left.svg new file mode 100644 index 0000000..5602eff --- /dev/null +++ b/common/gnome-shell/3.16/light-assets/misc/calendar-arrow-left.svg @@ -0,0 +1,169 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/light-assets/misc/calendar-arrow-right-hover.svg b/common/gnome-shell/3.16/light-assets/misc/calendar-arrow-right-hover.svg new file mode 100644 index 0000000..beadead --- /dev/null +++ b/common/gnome-shell/3.16/light-assets/misc/calendar-arrow-right-hover.svg @@ -0,0 +1,171 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/light-assets/misc/calendar-arrow-right.svg b/common/gnome-shell/3.16/light-assets/misc/calendar-arrow-right.svg new file mode 100644 index 0000000..734b53b --- /dev/null +++ b/common/gnome-shell/3.16/light-assets/misc/calendar-arrow-right.svg @@ -0,0 +1,171 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/light-assets/misc/message-active.svg b/common/gnome-shell/3.16/light-assets/misc/message-active.svg new file mode 100644 index 0000000..06860fd --- /dev/null +++ b/common/gnome-shell/3.16/light-assets/misc/message-active.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/common/gnome-shell/3.16/light-assets/misc/message-close-active.svg b/common/gnome-shell/3.16/light-assets/misc/message-close-active.svg new file mode 100644 index 0000000..58fab12 --- /dev/null +++ b/common/gnome-shell/3.16/light-assets/misc/message-close-active.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/light-assets/misc/message-close-hover.svg b/common/gnome-shell/3.16/light-assets/misc/message-close-hover.svg new file mode 100644 index 0000000..359aad5 --- /dev/null +++ b/common/gnome-shell/3.16/light-assets/misc/message-close-hover.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/light-assets/misc/message-close.svg b/common/gnome-shell/3.16/light-assets/misc/message-close.svg new file mode 100644 index 0000000..cd11de2 --- /dev/null +++ b/common/gnome-shell/3.16/light-assets/misc/message-close.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/light-assets/misc/message-hover.svg b/common/gnome-shell/3.16/light-assets/misc/message-hover.svg new file mode 100644 index 0000000..64a79b6 --- /dev/null +++ b/common/gnome-shell/3.16/light-assets/misc/message-hover.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.16/light-assets/misc/message.svg b/common/gnome-shell/3.16/light-assets/misc/message.svg new file mode 100644 index 0000000..a1f8615 --- /dev/null +++ b/common/gnome-shell/3.16/light-assets/misc/message.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/gnome-shell/3.16/light-assets/misc/modal.svg b/common/gnome-shell/3.16/light-assets/misc/modal.svg new file mode 100644 index 0000000..b61f537 --- /dev/null +++ b/common/gnome-shell/3.16/light-assets/misc/modal.svg @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/switch/switch-off.svg b/common/gnome-shell/3.16/light-assets/switch/switch-off.svg similarity index 97% rename from common/gnome-shell/3.14/switch/switch-off.svg rename to common/gnome-shell/3.16/light-assets/switch/switch-off.svg index 908e1af..96749e2 100644 --- a/common/gnome-shell/3.14/switch/switch-off.svg +++ b/common/gnome-shell/3.16/light-assets/switch/switch-off.svg @@ -9,8 +9,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="52" - height="24" + width="50" + height="20" id="svg7539" version="1.1" inkscape:version="0.91 r13725" @@ -100,8 +100,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="8.2495794" - inkscape:cx="26.503493" - inkscape:cy="2.8843151" + inkscape:cx="19.533441" + inkscape:cy="12.339343" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" @@ -148,9 +148,9 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" - transform="translate(-120,91.999997)"> + transform="translate(-120,87.999997)"> diff --git a/common/gnome-shell/3.16/switch/switch-on.svg b/common/gnome-shell/3.16/light-assets/switch/switch-on.svg similarity index 96% rename from common/gnome-shell/3.16/switch/switch-on.svg rename to common/gnome-shell/3.16/light-assets/switch/switch-on.svg index f7b1bfc..0203bbb 100644 --- a/common/gnome-shell/3.16/switch/switch-on.svg +++ b/common/gnome-shell/3.16/light-assets/switch/switch-on.svg @@ -9,8 +9,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="52" - height="24" + width="50" + height="20" id="svg7539" version="1.1" inkscape:version="0.91 r13725" @@ -99,9 +99,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="8.2495794" - inkscape:cx="26.503493" - inkscape:cy="31.976708" + inkscape:zoom="32.998318" + inkscape:cx="6.3160735" + inkscape:cy="9.1853829" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" @@ -140,7 +140,7 @@ image/svg+xml - + @@ -148,9 +148,9 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" - transform="translate(-120,91.999997)"> + transform="translate(-120,87.999997)"> diff --git a/common/gnome-shell/3.16/menu/menu-arrow-symbolic.svg b/common/gnome-shell/3.16/menu/menu-arrow-symbolic.svg deleted file mode 100644 index 2ae260c..0000000 --- a/common/gnome-shell/3.16/menu/menu-arrow-symbolic.svg +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/common/gnome-shell/3.16/menu/menu.svg b/common/gnome-shell/3.16/menu/menu.svg deleted file mode 100644 index f363e0b..0000000 --- a/common/gnome-shell/3.16/menu/menu.svg +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/common/gnome-shell/3.16/misc/bg.svg b/common/gnome-shell/3.16/misc/bg.svg deleted file mode 100644 index 5e219e0..0000000 --- a/common/gnome-shell/3.16/misc/bg.svg +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/common/gnome-shell/3.16/misc/logged-in-indicator.svg b/common/gnome-shell/3.16/misc/logged-in-indicator.svg deleted file mode 100755 index c0267ea..0000000 --- a/common/gnome-shell/3.16/misc/logged-in-indicator.svg +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/gnome-shell/3.16/misc/modal.svg b/common/gnome-shell/3.16/misc/modal.svg deleted file mode 100644 index 5648294..0000000 --- a/common/gnome-shell/3.16/misc/modal.svg +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/common/gnome-shell/3.16/misc/noise-texture.png b/common/gnome-shell/3.16/misc/noise-texture.png deleted file mode 100755 index 6b70a2d40790fcbec68b2db067f4f6b0d47ec740..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 79464 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 MD{I5+6fGkE2SYF}a{vGU diff --git a/common/gnome-shell/3.16/misc/osd.svg b/common/gnome-shell/3.16/misc/osd.svg deleted file mode 100644 index 64bf7f4..0000000 --- a/common/gnome-shell/3.16/misc/osd.svg +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/common/gnome-shell/3.16/misc/process-working.svg b/common/gnome-shell/3.16/misc/process-working.svg deleted file mode 100755 index 43ffcca..0000000 --- a/common/gnome-shell/3.16/misc/process-working.svg +++ /dev/null @@ -1,811 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/gnome-shell/3.16/sass/_colors.scss b/common/gnome-shell/3.16/sass/_colors.scss index ee3049c..9c51858 100644 --- a/common/gnome-shell/3.16/sass/_colors.scss +++ b/common/gnome-shell/3.16/sass/_colors.scss @@ -2,57 +2,89 @@ // it gets @if ed depending on $variant -$base_color: #ffffff; -$text_color: #5c616c; -$bg_color: #f9fafb; -$fg_color: #5c616c; +$base_color: if($variant =='light', #ffffff, #383C45); +$text_color: if($variant == 'light', #5c616c, #D3DAE3); +$bg_color: if($variant =='light', #F5F6F7, #444852); +$fg_color: if($variant =='light', #5c616c, #D3DAE3); $selected_fg_color: #ffffff; $selected_bg_color: #5294E2; $selected_borders_color: darken($selected_bg_color, 20%); -$borders_color: darken($bg_color,9%); +$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,10%)); -$link_color: darken($selected_bg_color,10%); -$link_visited_color: darken($selected_bg_color,20%); +$link_color: if($variant == 'light', darken($selected_bg_color,10%), + lighten($selected_bg_color,20%)); +$link_visited_color: if($variant == 'light', darken($selected_bg_color,20%), + lighten($selected_bg_color,10%)); -$selection_mode_bg: rgba(36, 80, 130, 0.95); +$selection_mode_bg: if($transparency == 'true', transparentize($selected_bg_color, 0.05), $selected_bg_color); $warning_color: #F27835; $error_color: #FC4138; $success_color: #73d216; $destructive_color: #F04A50; -$suggested_color: #9EA4B5; +$suggested_color: #4DADD4; -$osd_fg_color: #A8ADB5; -$osd_bg_color: transparentize(#3c4049, 0.05); -$osd_button_bg: darken($osd_bg_color, 3%); +//insensitive state derived colors +$insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55)); +$insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%)); + + +$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); +$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); + +$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); +$button_border: $entry_border; + +$header_bg: red; +@if $transparency=='true' and $variant=='light' { $header_bg: transparentize(#e7e8eb, 0.05); } +@if $transparency=='false' and $variant=='light' { $header_bg: #e7e8eb; } +@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343b, 0.03); } +@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343b; } + +$header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%)); + +$header_border: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); + +$header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%)); +$header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg); + +$dark_sidebar_bg: if($transparency == 'true', transparentize(#3c4049, 0.05), #3c4049); +$dark_sidebar_fg: #BAC3CF; +$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 10%)); + +$osd_fg_color: $dark_sidebar_fg; +$osd_bg_color: darken($dark_sidebar_bg, 8%); $osd_insensitive_bg_color: darken($osd_bg_color, 3%); $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%); $osd_borders_color: transparentize(black, 0.3); +$panel_bg: darken($osd_bg_color, 4.7%); +$panel_fg: $osd_fg_color; -$tooltip_bg: $osd_bg_color; -$tooltip_fg: #edf5fb; -$tooltip_borders_color: transparentize(white, 0.9); +//WM Buttons -//insensitive state derived colors -$insensitive_fg_color: transparentize($fg_color, 0.45); -$insensitive_bg_color: mix($bg_color, $base_color, 40%); +// Close +$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f37076, #e45e65); +$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f79da1, #f48085); +$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #ef4048, #e6262f); +$wm_icon_close_bg: $selected_fg_color; +$wm_icon_close_hover_bg: $selected_fg_color; +$wm_icon_close_active_bg: $selected_fg_color; -$entry_bg: $base_color; -$entry_border: #cfd6e6; -$entry_focus_border: $selected_bg_color; +// Minimize, Maximize +$wm_button_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32); +$wm_button_unfocused_bg: if($variant == 'light' and $darker == 'false', #f6f7f8, #2a3035); +$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32); +$wm_button_active_bg: $selected_bg_color; -$button_bg: lighten($bg_color, 1%); -$button_border: $entry_border; +$wm_button_border: if($variant == 'light' and $darker == 'false', #d8dae0, #191C21); +$wm_button_unfocused_border: if($variant == 'light' and $darker == 'false', #dddee2, #1F2328); +$wm_button_hover_border: $selected_bg_color; +$wm_button_active_border: $selected_bg_color; -$header_bg: transparentize(#e7e8eb, 0.05); -$header_fg: saturate(transparentize($fg_color, 0.2), 10%); - -$dark_sidebar_bg: $osd_bg_color; -$dark_sidebar_fg: $osd_fg_color; -$dark_sidebar_border: $dark_sidebar_bg; - -$panel_bg: darken($dark_sidebar_bg, 10%); -$panel_fg: $dark_sidebar_fg; +$wm_icon_bg: if($variant == 'light' and $darker == 'false', #8d93a4, #939ca8); +$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #b8bcc7, #686f78); +$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #70788d, #afb8c5); +$wm_icon_active_bg: $selected_fg_color; diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index b55a299..4f72cbe 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -1,6 +1,7 @@ //This is the RIGHT PLACE to edit the stylesheet $panel-corner-radius: 0px; +$asset_path: if($variant == 'dark', dark-assets, light-assets); /* Copyright 2009, 2015 Red Hat, Inc. * @@ -25,7 +26,7 @@ $panel-corner-radius: 0px; // Globals // $font-size: 9; -$font-family: Cantarell, Sans-Serif; +$font-family: Futura Bk bt, Cantarell, Sans-Serif; $_bubble_bg_color: opacify($osd_bg_color,0.25); $_bubble_fg_color: $osd_fg_color; $_bubble_borders_color: transparentize($osd_fg_color,0.8); @@ -55,16 +56,21 @@ stage { @include button(normal); &:focus { @include button(focus); } - &:hover { @include button(hover); } - &:hover:focus { @include button(focus-hover); } - &:active, &:active:focus { @include button(active); } - &:insensitive { @include button(insensitive); } } +%osd_button { + @include button(osd); + + &:hover { @include button(osd-hover); } + &:focus { color: $selected_bg_color; } + &:active { @include button(osd-active); } + &:insensitive { @include button(osd-insensitive); } +} + // // Entries // @@ -79,7 +85,6 @@ StEntry { @include entry(normal); &:focus, &:hover { @include entry(focus); } - &:insensitive { @include entry(insensitive); } StIcon.capslock-warning { @@ -151,28 +156,28 @@ StScrollBar { StBin { width: 16px; height: 16px; - background-image: url("checkbox/checkbox-unchecked.svg"); + background-image: url("#{$asset_path}/checkbox/checkbox-unchecked.svg"); } - &:focus StBin { background-image: url("checkbox/checkbox-unchecked-focused.svg"); } + &:focus StBin { background-image: url("#{$asset_path}/checkbox/checkbox-unchecked-focused.svg"); } - &:checked StBin { background-image: url("checkbox/checkbox-checked.svg"); } + &:checked StBin { background-image: url("#{$asset_path}/checkbox/checkbox-checked.svg"); } - &:focus:checked StBin { background-image: url("checkbox/checkbox-checked-focused.svg"); } + &:focus:checked StBin { background-image: url("#{$asset_path}/checkbox/checkbox-checked-focused.svg"); } } // // Switches // .toggle-switch { - width: 52px; - height: 24px; + width: 50px; + height: 20px; background-size: contain; &-us, &-intl { - background-image: url("switch/switch-off.svg"); + background-image: url("#{$asset_path}/switch/switch-off.svg"); - &:checked { background-image: url("switch/switch-on.svg"); } + &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } } } @@ -193,35 +198,34 @@ StScrollBar { .flashspot { background-color: white; } .modal-dialog { - border-radius: 3px; color: $fg_color; background-color: transparentize($bg_color, 1); border: none; - border-image: url("misc/modal.svg") 10 10 10 10; - padding: 0 6px 6px 6px; + border-image: url("#{$asset_path}/misc/modal.svg") 9 9 9 67; + padding: 0 5px 6px 5px; - > * { padding: 14px; } + > StBoxLayout:first-child { + padding: 20px 10px 10px 10px; + } &-button-box { - spacing: 0px; + spacing: 0; margin: 0px; - padding: 12px 24px; - background-color: opacify($osd_bg_color, 1); - border: solid 0px rgba(0,0,0,0.3); - border-top: 1px; - border-radius: 0px 0px 1px 1px; + padding: 14px 10px; + background: none; + border: none; + border-image: url("common-assets/misc/button-box.svg") 9 9 9 9; .button { - @include button(osd); + padding-top: 0; + padding-bottom: 0; + height: 30px; - &:hover { @include button(osd-hover); } - &:focus { color: $selected_bg_color; } - &:active { @include button(osd-active); } - &:insensitive { @include button(osd-insensitive); } + @extend %osd_button; } } - .run-dialog-entry { width: 23em; } + .run-dialog-entry { width: 21em; } .run-dialog-error-box { padding-top: 5px; spacing: 5px; @@ -229,10 +233,7 @@ StScrollBar { //.run-dialog-button-box { padding-top: 1em; } .run-dialog-label { - @include fontsize($font-size * 1.1); - font-weight: normal; - color: $fg_color; - padding-bottom: .8em; + font-size: 0; } } @@ -505,13 +506,13 @@ StScrollBar { .popup-menu { min-width: 200px; color: $fg_color; - border-image: url("menu/menu.svg") 10 10 35 14; + border-image: url("#{$asset_path}/menu/menu.svg") 9 9 9 9; .popup-menu-arrow { } //defined globally in the TOP BAR .popup-sub-menu { background: none; box-shadow: none; - border-image: url("menu/submenu.svg") 8 8 2 2; + border-image: url("#{$asset_path}/menu/submenu.svg") 9 9 9 9; } .popup-menu-content { padding: 1em 0em 1em 0em; } @@ -524,14 +525,13 @@ StScrollBar { &:checked { background: none; box-shadow: none; - font-weight: normal; - border-image: url("menu/submenu-open.svg") 8 8 2 2; + border-image: url("#{$asset_path}/menu/submenu-open.svg") 9 9 9 9; } &:active, &.selected { color: $fg_color; background-color: transparent; - border-image: url("menu/menu-hover.svg") 7 7 1 1; + border-image: url("#{$asset_path}/menu/menu-hover.svg") 9 9 1 1; } &:insensitive { @@ -569,9 +569,9 @@ StScrollBar { .candidate-popup-boxpointer { -arrow-border-radius: 2px; - -arrow-background-color: $panel_bg; + -arrow-background-color: $osd_bg_color; -arrow-border-width: 1px; - -arrow-border-color: darken($panel_bg, 7%); + -arrow-border-color: transparentize(black, 0.6); -arrow-base: 5; -arrow-rise: 5; } @@ -582,7 +582,7 @@ StScrollBar { margin: 10px 0px; background-color: transparent; border: none; - border-image: url("menu/menu-separator.svg") 1 1 1 1; + border-image: url("common-assets/menu-separator.svg") 1 1 1 1; } // Background menu @@ -609,7 +609,7 @@ StScrollBar { background: none; border: none; border-radius: 5px; - border-image: url("misc/osd.svg") 10 10 9 11; + border-image: url("common-assets/misc/osd.svg") 9 9 9 9; .osd-monitor-label { font-size: 3em; } @@ -627,7 +627,7 @@ StScrollBar { background: none; border: none; border-radius: 5px; - border-image: url("misc/osd.svg") 10 10 9 11; + border-image: url("common-assets/misc/osd.svg") 9 9 9 9; padding: 12px; } @@ -642,7 +642,7 @@ StScrollBar { .switcher-list { background: none; border: none; - border-image: url("misc/bg.svg") 10 10 35 14; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; border-radius: 3px; padding: 20px; @@ -709,7 +709,7 @@ StScrollBar { &-group { padding: 12px; } &-container { - border-image: url("misc/bg.svg") 10 10 35 14; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; border-radius: 3px; padding: 20px; padding-bottom: 24px; @@ -725,11 +725,11 @@ StScrollBar { } .ws-switcher-active-up { - background-image: url("misc/ws-switch-arrow-up.png"); + background-image: url("common-assets/misc/ws-switch-arrow-up.png"); } .ws-switcher-active-down { - background-image: url("misc/ws-switch-arrow-down.png"); + background-image: url("common-assets/misc/ws-switch-arrow-down.png"); } .ws-switcher-box { @@ -763,12 +763,10 @@ StScrollBar { // Top Bar // #panel { - background-color: $panel_bg; - border-color: darken($panel_bg, 9%); - border-bottom-width: 1px; font-weight: bold; height: 2.1em; - min-height: 26px; + min-height: 27px; + border-image: url('common-assets/panel/panel.svg') 1 1 1 1; &.unlock-screen, &.login-screen, @@ -777,7 +775,7 @@ StScrollBar { border-image: none; } - &:overview { background-color: transparentize(darken($panel_bg,10%), 0.15); } + &:overview { border-image: url('common-assets/panel/panel-overview.svg') 1 1 1 1; } #panelLeft, #panelCenter { // spacing between activities<>app menu and such spacing: 8px; @@ -801,33 +799,39 @@ StScrollBar { } .panel-button { - -natural-hpadding: 12px; + -natural-hpadding: 10px; -minimum-hpadding: 6px; font-weight: bold; color: $selected_fg_color; transition-duration: 100ms; + border-bottom-width: 1px; + border-color: transparent; .app-menu-icon { width: 0; height: 0; - margin-left: 4px; - margin-right: 4px; + margin-left: 0px; + margin-right: 0px; } &:hover { color: $selected_fg_color; background-color: transparentize(black, 0.83); + border-bottom-width: 1px; + border-color: transparent; } &:active, &:overview, &:focus, &:checked { color: $selected_fg_color; background-color: $selected_bg_color; box-shadow: none; + border-bottom-width: 1px; + border-color: black; & > .system-status-icon { icon-shadow: none; } } - .system-status-icon { icon-size: 16px; padding: 0 8px; } + .system-status-icon { icon-size: 16px; padding: 0 4px; } .unlock-screen &, .login-screen &, .lock-screen & { @@ -836,23 +840,28 @@ StScrollBar { } } + #panelActivities.panel-button { -natural-hpadding: 12px; } + .panel-status-indicators-box, .panel-status-menu-box { spacing: 2px; } - .screencast-indicator { color: red; } + .screencast-indicator { color: $error_color; } + + .clock-display > * > *:last-child { + color: $selected_bg_color; + margin-left: .3em; + } + + .popup-menu-arrow { width: 0; } } // Activities button -#panelActivities > *, -#panelActivities:hover > *, -#panelActivities:focus > *, -#panelActivities:active > *, -#panelActivities:overview > *, -#panel:overview #panelActivities.panel-button:active > *, -#panel:overview #panelActivities.panel-button:focus > * { - background-image: url("misc/activities.svg"); +#panel #panelActivities.panel-button { + + > * { + background-image: url("common-assets/panel/activities.svg"); background-position: center top; width: 24px; height: 24px; @@ -863,48 +872,59 @@ StScrollBar { transition-duration: 0ms !important; box-shadow: none !important; color: transparent; + } + + &:active, &:overview, &:focus, &:checked { + background-color: transparent; + box-shadow: none; + border-bottom-width: 1px; + border-color: transparent; + + > * { background-image: url("common-assets/panel/activities-active.svg"); } + } } - // a little unstructured mess: +// a little unstructured mess: - .system-switch-user-submenu-icon { - icon-size: 24px; - border: 1px solid transparentize($fg_color,0.6); - } +.system-switch-user-submenu-icon { + icon-size: 24px; + border: 1px solid transparentize($fg_color,0.6); +} - #appMenu { - spinner-image: url("misc/process-working.svg"); - spacing: 4px; +#appMenu { + spinner-image: url("common-assets/misc/process-working.svg"); + spacing: 4px; + padding: 0 8px; - .label-shadow { color: transparent; } - } + .label-shadow { color: transparent; } +} - .aggregate-menu { - width: 360px; - .popup-menu-icon { padding: 0 4px; } - } +.aggregate-menu { + width: 360px; + .popup-menu-icon { padding: 0 4px; } +} - .system-menu-action { +.system-menu-action { + padding: 13px; + color: $fg_color; + border-radius: 32px; /* wish we could do 50% */ + border: 1px solid transparent; + + &:hover, &:focus { + transition-duration: 100ms; padding: 13px; color: $fg_color; - border-radius: 32px; /* wish we could do 50% */ - border: 1px solid transparent; - - &:hover, &:focus { - transition-duration: 100ms; - padding: 13px; - color: $fg_color; - background-color: transparent; - border: 1px solid $selected_bg_color; - } - &:active { - color: $selected_fg_color; - background-color: $selected_bg_color; - border: 1px solid $selected_bg_color; - } - - & > StIcon { icon-size: 16px; } + background-color: transparent; + border: 1px solid $selected_bg_color; } + &:active { + color: $selected_fg_color; + background-color: $selected_bg_color; + border: 1px solid $selected_bg_color; + } + + & > StIcon { icon-size: 16px; } +} // // Calendar popover @@ -948,13 +968,8 @@ StScrollBar { padding: 7px 10px 7px 10px; border: 1px solid transparentize($base_color, 1); - &:hover, &:focus { - @include button(hover); - } - - &:active { - @include button(active); - } + &:hover, &:focus { @include button(hover); } + &:active { @include button(active); } } .datemenu-today-button .day-label { @@ -996,35 +1011,35 @@ StScrollBar { //arrow back .calendar-change-month-back { - background-image: url("misc/calendar-arrow-left.svg"); + background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); - &:focus, &:hover { background-image: url("misc/calendar-arrow-left-hover.svg"); } + &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-left-hover.svg"); } - &:active { background-image: url("misc/calendar-arrow-left.svg"); } + &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); } &:rtl { - background-image: url("misc/calendar-arrow-right.svg"); + background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); - &:focus, &:hover { background-image: url("misc/calendar-arrow-right-hover.svg"); } + &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-right-hover.svg"); } - &:active { background-image: url("misc/calendar-arrow-right.svg"); } + &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); } } } //arrow forward .calendar-change-month-forward { - background-image: url("misc/calendar-arrow-right.svg"); + background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); - &:focus, &:hover { background-image: url("misc/calendar-arrow-right-hover.svg"); } + &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-right-hover.svg"); } - &:active { background-image: url("misc/calendar-arrow-right.svg"); } + &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); } &:rtl { - background-image: url("misc/calendar-arrow-left.svg"); + background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); - &:focus, &:hover { background-image: url("misc/calendar-arrow-left-hover.svg"); } + &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-left-hover.svg"); } - &:active { background-image: url("misc/calendar-arrow-left.svg"); } + &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); } } } @@ -1060,9 +1075,7 @@ StScrollBar { .calendar-day-left { border-left-width: 0; } -.calendar-work-day { - -} +.calendar-work-day {} .calendar-nonwork-day { color: $fg_color; @@ -1096,82 +1109,74 @@ StScrollBar { // .message-list { width: 420px; -} -.message-list-sections { - spacing: 1.5em; -} + &-sections { spacing: 1.5em; } -.message-list-section, -.message-list-section-list { - spacing: 0.7em; -} + &-section, + &-section-list { spacing: 0.7em; } -.message-list-section-title-box { - spacing: 0.4em; -} + &-section-list-title-box { spacing: 0.4em; } -.message-list-section-close > StIcon { - icon-size: 16px; - border-radius: 8px; - color: $selected_fg_color; - background-color: transparentize($fg_color, 0.5); -} + &-placeholder { + StIcon { width: 0; height: 0; } + StLabel { color: $insensitive_fg_color; } + } -.message-list-section-close:hover > StIcon, -.message-list-section-close:focus > StIcon { - color: $selected_fg_color; - background-color: $fg_color; -} + &-section-close { -.message-list-section-close:active > StIcon { - color: $selected_fg_color; - background-color: $selected_bg_color; + > StIcon { + icon-size: 18px; + border-radius: 0px; + color: transparent; + background-color: transparent; + background-image: url('#{$asset_path}/misc/message-close.svg'); + } + &:hover > StIcon { + color: transparent; + background-color: transparent; + background-image: url('#{$asset_path}/misc/message-close-hover.svg'); + } + &:active > StIcon { + color: transparent; + background-color: transparent; + background-image: url('#{$asset_path}/misc/message-close-active.svg'); + } + + } } .message { padding: 4px; color: $fg_color; - background-color: $button_bg; - border: 1px solid $button_border; + border-image: url("#{$asset_path}/misc/message.svg") 9 9 9 9; &:hover, &:focus { color: $fg_color; - background-color: $button_bg; - border: 1px solid $selected_bg_color; + border-image: url("#{$asset_path}/misc/message-hover.svg") 9 9 9 9; } &:active { color: $selected_fg_color; - background-color: $selected_bg_color; - border: 1px solid $selected_bg_color; + border-image: url("#{$asset_path}/misc/message-active.svg") 9 9 9 9; } -} -.message-icon-bin { - padding: 8px 0px 8px 8px; + &-icon-bin { + padding: 8px 0px 8px 8px; - &:rtl { padding: 8px 8px 8px 0px; } -} + &:rtl { padding: 8px 8px 8px 0px; } -.message-icon-bin > StIcon { - icon-size: 48px; -} + > StIcon { icon-size: 48px; } + } -.message-secondary-bin { - color: transparentize($fg_color, 0.6); -} + &-secondary-bin { color: transparentize($fg_color, 0.6); } + &-secondary-bin > StIcon { icon-size: 16px; } -.message-secondary-bin > StIcon { - icon-size: 16px; -} + &-title { + font-weight: bold; + padding: 2px 0 2px 0; + } -.message-title { - font-weight: bold; - padding: 2px 0 2px 0; -} -.message-content { - padding: 8px; + &-content { padding: 8px; } } @@ -1181,10 +1186,10 @@ StScrollBar { .ripple-box { width: 52px; height: 52px; - background-image: url("misc/corner-ripple-ltr.svg"); + background-image: url("common-assets/misc/corner-ripple-ltr.svg"); background-size: contain; - &:rtl { background-image: url("misc/corner-ripple-rtl.svg"); } + &:rtl { background-image: url("common-assets/misc/corner-ripple-rtl.svg"); } } // not really top bar only @@ -1196,13 +1201,13 @@ StScrollBar { //Close buttons // .window-close { - background-image: url("misc/close.svg"); + background-image: url("common-assets/misc/close.svg"); background-size: 26px; height: 26px; width: 26px; &:hover { - background-image: url("misc/close-hover.svg"); + background-image: url("common-assets/misc/close-hover.svg"); background-size: 26px; height: 26px; width: 26px; @@ -1380,7 +1385,7 @@ StScrollBar { .search-provider-icon-more { width: 16px; height: 16px; - background-image: url("misc/more-results.svg"); + background-image: url("common-assets/misc/more-results.svg"); } // @@ -1389,29 +1394,34 @@ StScrollBar { #dash { font-size: 1em; color: $osd_fg_color; - background-color: transparentize($panel_bg, 0.08); - padding: 6px 0px 6px 0px; - border-color: transparentize(darken($panel_bg, 9%), 0.08); - border-radius: 0px 3px 3px 0px; + background-color: transparent; + border: none; + padding: 6px 1px 6px 0px; + border-image: url('common-assets/dash/dash-left.svg') 3 3 3 3; + + .extended.left & { border-image: url('common-assets/dash/dash-extended-left.svg') 3 3 3 3; } .right &, &:rtl { - padding: 6px 0px 6px 0px; - border-radius: 3px 0 0 3px; + padding: 6px 0px 6px 1px; + border-image: url('common-assets/dash/dash-right.svg') 3 3 3 3; } + .extended.right & { border-image: url('common-assets/dash/dash-extended-right.svg') 3 3 3 3; } .bottom & { - padding: 0px 6px 0px 6px; - border-radius: 3px 3px 0 0; + padding: 1px 6px 0px 6px; + border-image: url('common-assets/dash/dash-bottom.svg') 3 3 3 3; } + .extended.bottom & { border-image: url('common-assets/dash/dash-extended-bottom.svg') 3 3 3 3; } .top & { - padding: 0px 6px 0px 6px; - border-radius: 0 0 3px 3px; + padding: 0px 6px 1px 6px; + border-image: url('common-assets/dash/dash-top.svg') 3 3 3 3; } + .extended.top & { border-image: url('common-assets/dash/dash-extended-top.svg') 3 3 3 3; } .placeholder { - background-image: url("dash/dash-placeholder.svg"); + background-image: url("common-assets/dash/dash-placeholder.svg"); background-size: contain; height: 24px; } @@ -1478,6 +1488,20 @@ StScrollBar { } } +#dashtodockContainer { + .app-well-app-running-dot { + background: none; + width: 28px; + height: 4px; + } + + @each $var in 1, 2, 3, 4 { + .running#{$var} .app-well-app-running-dot { + background-image: url("common-assets/dash/running#{$var}.svg"); + } + } +} + .show-apps { .overview-icon { @@ -1523,28 +1547,22 @@ StScrollBar { .app-view-control { padding: 4px 32px; - color: transparentize($selected_fg_color, 0.2); - background-color: transparentize(darken($panel_bg,10%), 0.15); - border-color: transparentize($osd_fg_color, 0.7); + background-color: $osd_bg_color; + color: $osd_fg_color; + border-color: rgba(0,0,0,0.7); &:hover { - color: $selected_fg_color; - background-color: transparentize(darken($panel_bg,10%), 0.15); + background-color: $osd_bg_color; + color: $osd_fg_color; border-color: $selected_bg_color; } &:checked { @include button(osd-active); } - &:first-child:ltr, &:last-child:rtl { - border-radius: 2px 0 0 2px; + &:first-child:ltr, + &:last-child:rtl { border-radius: 2px 0 0 2px; } - - &:hover { } - } - &:last-child:ltr, &:first-child:rtl { - border-radius: 0 2px 2px 0; - - &:hover { } - } + &:last-child:ltr, + &:first-child:rtl { border-radius: 0 2px 2px 0; } } // @@ -1563,7 +1581,6 @@ StScrollBar { } .app-well-app, .app-well-app.app-folder, -//.show-apps, .grid-search-result { .overview-icon { @@ -1628,11 +1645,12 @@ StScrollBar { .app-folder-popup { //expanded collection -arrow-border-radius: 2px; - -arrow-background-color: transparentize(darken($panel_bg,10%), 0.15); - -arrow-border-color: transparentize($osd_fg_color, 0.7); - -arrow-border-width: 1px; - -arrow-base: 5; - -arrow-rise: 5; + -arrow-background-color: transparent; + -arrow-border-color: transparent; + -arrow-border-width: 0; + -arrow-base: 0; + -arrow-rise: 0; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; } .app-folder-popup-bin { padding: 5px; } .app-folder-icon { @@ -1647,13 +1665,13 @@ StScrollBar { .page-indicator-icon { width: 18px; height: 18px; - background-image: url(misc/page-indicator-inactive.svg); + background-image: url(common-assets/misc/page-indicator-inactive.svg); } - &:hover .page-indicator-icon { background-image: url(misc/page-indicator-hover.svg); } - &:active .page-indicator-icon { background-image: url(misc/page-indicator-active.svg); } + &:hover .page-indicator-icon { background-image: url(common-assets/misc/page-indicator-hover.svg); } + &:active .page-indicator-icon { background-image: url(common-assets/misc/page-indicator-active.svg); } &:checked .page-indicator-icon, - &:checked:active { background-image: url(misc/page-indicator-checked.svg); } + &:checked:active { background-image: url(common-assets/misc/page-indicator-checked.svg); } } .no-frequent-applications-label { @extend %status_text; } @@ -1672,14 +1690,12 @@ StScrollBar { spacing: 11px; padding: 12px; padding-right: 7px; - border-radius: 3px 0 0 3px; - background-color: transparentize($panel_bg, 0.08); - border-color: transparentize(darken($panel_bg, 9%), 0.08); + border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; &:rtl { padding: 12px; padding-left: 7px; - border-radius: 0 3px 3px 0; + border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } } @@ -1716,11 +1732,10 @@ StScrollBar { width: 34em; margin: 5px; padding: 10px; - border-radius: 2px; - color: $fg_color; - background-color: $bg_color; - border: 0px solid transparent; - box-shadow: 0 1px 5px transparentize(black, 0.8); + color: $osd_fg_color; + background-color: transparent; + border: 1px solid transparent; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; .notification-icon { padding: 5px; } @@ -1731,15 +1746,13 @@ StScrollBar { .notification-actions { background-color: transparent; padding: 2px 2px 0 2px; - spacing: 1px; + spacing: 3px; } .notification-button { padding: 4px 4px 5px; - @extend .button; + @extend %osd_button; - &:first-child, &:last-child { - border-radius: 2px; - } + &:first-child, &:last-child { border-radius: 2px; } } } @@ -1748,7 +1761,7 @@ StScrollBar { // Chat Bubbles .chat-body { spacing: 5px; } .chat-response { margin: 5px; } -.chat-log-message { color: $fg_color; } +.chat-log-message { color: $osd_fg_color; } .chat-new-group { padding-top: 1em; } .chat-received { padding-left: 4px; @@ -1756,6 +1769,12 @@ StScrollBar { &:rtl { padding-left: 0px; padding-right: 4px; } } +StEntry.chat-response { + @include entry(osd); + + &:focus { @include entry(osd-focus); } +} + .chat-sent { padding-left: 18pt; color: $selected_bg_color; @@ -1767,7 +1786,7 @@ StScrollBar { padding-left: 4px; font-size: 9pt; font-weight: bold; - color: transparentize($fg_color, 0.4); + color: transparentize($osd_fg_color, 0.4); &:rtl { padding-left: 0; padding-right: 4px; } } @@ -1780,43 +1799,45 @@ StScrollBar { padding: 2px 72px 2px 12px; } - .hotplug-notification-item { - padding: 2px 10px; - &:focus { padding: 1px 71px 1px 11px; } - } +.hotplug-notification-item { + padding: 2px 10px; + @extend %osd_button; - .hotplug-notification-item-icon { - icon-size: 24px; - padding: 2px 5px; - } + &:focus { padding: 2px 10px; } +} - .hotplug-resident-box { spacing: 8px; } +.hotplug-notification-item-icon { + icon-size: 24px; + padding: 2px 5px; +} - .hotplug-resident-mount { - spacing: 8px; - border-radius: 4px; - &:hover { background-color: transparentize($bg_color,0.7); } - } +.hotplug-resident-box { spacing: 8px; } - .hotplug-resident-mount-label { - color: inherit; - padding-left: 6px; - } +.hotplug-resident-mount { + spacing: 8px; + border-radius: 4px; + &:hover { background-color: transparentize($bg_color,0.7); } +} - .hotplug-resident-mount-icon { - icon-size: 24px; - padding-left: 6px; - } +.hotplug-resident-mount-label { + color: inherit; + padding-left: 6px; +} - .hotplug-resident-eject-icon { - icon-size: 16px; - } +.hotplug-resident-mount-icon { + icon-size: 24px; + padding-left: 6px; +} - .hotplug-resident-eject-button { - padding: 7px; - border-radius: 5px; - color: pink; - } +.hotplug-resident-eject-icon { + icon-size: 16px; +} + +.hotplug-resident-eject-button { + padding: 7px; + border-radius: 5px; + color: pink; +} // Eeeky things @@ -1855,47 +1876,48 @@ $legacy_icon_size: 24px; // On-Screen Keyboard // #keyboard { - background-color: transparentize($panel_bg, 0.05); + background-color: $osd_bg_color; + border-width: 0; + border-top-width: 1px; + border-color: transparentize(black, 0.6); } - .keyboard-layout { - spacing: 10px; - padding: 10px; - } +.keyboard-layout { + spacing: 10px; + padding: 10px; +} - .keyboard-row { - spacing: 15px; - } +.keyboard-row { + spacing: 15px; +} - .keyboard-key { - @include button(osd); - min-height: 2em; - min-width: 2em; - font-size: 14pt; - font-weight: bold; - border-radius: 3px; - box-shadow: none; - &:focus { @include button(focus); } - &:hover,&:checked { @include button(osd-hover); } - &:active { @include button(osd-active);} - &:grayed { //FIXME - background-color: $osd_bg_color; - color: $osd_fg_color; - border-color: $osd_borders_color; - } - } +.keyboard-key { + min-height: 2em; + min-width: 2em; + font-size: 14pt; + font-weight: bold; + border-radius: 3px; + box-shadow: none; - .keyboard-subkeys { //long press on a key popup - color: white; - padding: 5px; - -arrow-border-radius: 2px; - -arrow-background-color: transparentize($panel_bg, 0.05); - -arrow-border-width: 0px; - -arrow-border-color: transparent; - -arrow-base: 20px; - -arrow-rise: 10px; - -boxpointer-gap: 5px; - } + @include button(osd); + + &:hover { @include button(osd-hover); } + &:active, &:checked { @include button(osd-active); } + + &:grayed { @include button(osd-insensitive); } +} + +.keyboard-subkeys { //long press on a key popup + color: $osd_fg_color; + padding: 5px; + -arrow-border-radius: 2px; + -arrow-background-color: $osd_bg_color; + -arrow-border-width: 1px; + -arrow-border-color: transparentize(black, 0.6);; + -arrow-base: 20px; + -arrow-rise: 10px; + -boxpointer-gap: 5px; +} // // IBus Candidate Popup @@ -1914,7 +1936,7 @@ $legacy_icon_size: 24px; .candidate-box { padding: 0.3em 0.5em 0.3em 0.5em; - border-radius: 4px; + border-radius: 2px; color: $osd_fg_color; &:selected,&:hover { background-color: $selected_bg_color; color: $selected_fg_color; } } @@ -2140,17 +2162,18 @@ $legacy_icon_size: 24px; padding: 8px 8px 10px 8px; background-color: transparentize(black, 0.3); border: 1px solid black; - border-image: url("misc/osd.svg") 10 10 9 11; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; border-radius: 2px; color: $osd_fg_color; & > #Toolbar { padding: 3px; - border: 1px solid darken($osd_bg_color, 7%); + border: none; background-color: transparent; border-radius: 0px; } .labels { spacing: 4px; } + .notebook-tab { -natural-hpadding: 12px; -minimum-hpadding: 6px; @@ -2159,6 +2182,7 @@ $legacy_icon_size: 24px; transition-duration: 100ms; padding-left: .3em; padding-right: .3em; + &:hover { color: $selected_fg_color; text-shadow: black 0px 2px 2px; @@ -2173,63 +2197,76 @@ $legacy_icon_size: 24px; StBoxLayout#ResultsArea { spacing: 4px; } } - .lg-dialog { - StEntry { - background-color: transparentize(black, 0.7); - color: $osd_fg_color; - selection-background-color: $selected_bg_color; - selected-color: $selected_fg_color; - border-color: transparentize($osd_fg_color, 0.7); +.lg-dialog { - &:focus { border-color: $selected_bg_color; } - } - .shell-link { - color: $link_color; - &:hover { color: lighten($link_color,10%); } - } + StEntry { + selection-background-color: $selected_bg_color; + selected-color: $selected_fg_color; + + @include entry(osd); + &:focus { @include entry(osd-focus); } } - - .lg-completions-text { - font-size: .9em; - font-style: italic; + .shell-link { + color: $link_color; + &:hover { color: lighten($link_color,10%); } } +} - .lg-obj-inspector-title { - spacing: 4px; - } +.lg-completions-text { + font-size: .9em; + font-style: italic; +} - .lg-obj-inspector-button { - border: 1px solid gray; - padding: 4px; - border-radius: 4px; - &:hover { border: 1px solid #ffffff; } - } +.lg-obj-inspector-title { + spacing: 4px; +} - #lookingGlassExtensions { padding: 4px; } +.lg-obj-inspector-button { + border: 1px solid gray; + padding: 4px; + border-radius: 4px; + &:hover { border: 1px solid #ffffff; } +} - .lg-extensions-list { - padding: 4px; - spacing: 6px; - } +#lookingGlassExtensions { padding: 4px; } - .lg-extension { - border: 1px solid $borders_color; - border-radius: 2px; - background-color: $bg_color; - padding: 4px; - } +.lg-extensions-list { + padding: 4px; + spacing: 6px; +} - .lg-extension-name { +.lg-extension { + border: 1px solid $osd_borders_color; + border-radius: 2px; + background-color: $osd_bg_color; + padding: 4px; +} + +.lg-extension-name { + font-weight: bold; +} + +.lg-extension-meta { + spacing: 6px; +} + +#LookingGlassPropertyInspector { + background: transparentize(black, 0.3); + border: 1px solid grey; + border-radius: 2px; + padding: 6px; +} + +/*tweaks*/ +.panel-button:active, +.panel-button:overview, +.panel-button:focus, +.panel-button:hover, +#appMenu, + #panel { + text-shadow: 0px 0px white; +} + +stage { font-weight: bold; - } - - .lg-extension-meta { - spacing: 6px; - } - - #LookingGlassPropertyInspector { - background: transparentize(black, 0.3); - border: 1px solid grey; - border-radius: 2px; - padding: 6px; - } +} diff --git a/common/gnome-shell/3.16/sass/_drawing.scss b/common/gnome-shell/3.16/sass/_drawing.scss index 0e60551..03b9f15 100644 --- a/common/gnome-shell/3.16/sass/_drawing.scss +++ b/common/gnome-shell/3.16/sass/_drawing.scss @@ -34,6 +34,24 @@ background-color: mix($entry_bg, $bg_color, 55%); border-color: 1px solid mix($entry_border, $bg_color, 55%); } + + @if $t==osd { + color: $osd_fg_color; + background-color: transparentize(black, 0.8); + border: 1px solid transparentize(black, 0.6); + } + + @if $t==osd-focus { + color: $osd_fg_color; + background-color: transparentize(black, 0.8); + border: 1px solid $selected_bg_color; + } + + @if $t==osd-insensitive { + color: $osd_insensitive_fg_color; + background-color: transparentize(black, 0.9); + border-color: 1px solid transparentize(black, 0.6); + } } // Buttons @@ -105,19 +123,18 @@ // // normal osd button // - color: lighten($osd_fg_color, 10%); - outline-color: transparentize($osd_fg_color, 0.7); - border-color: transparentize($osd_fg_color, 0.7); - background-color: darken($osd_bg_color, 5%); + color: $osd_fg_color; + border: 1px solid transparentize(black, 0.55); + background-color: transparentize(black, 0.7); } @else if $t==osd-hover { // // active osd button // - color: $selected_fg_color; - border-color: $selected_bg_color; - background-color: darken($osd_bg_color, 5%); + color: $osd_fg_color; + border: 1px solid $selected_bg_color; + background-color: transparentize(black, 0.7); } @else if $t==osd-active { @@ -125,7 +142,7 @@ // active osd button // color: $selected_fg_color; - border-color: $selected_bg_color; + border: 1px solid $selected_bg_color; background-color: $selected_bg_color; } @@ -134,7 +151,7 @@ // insensitive osd button // color: $osd_insensitive_fg_color; - border-color: transparentize($osd_fg_color, 0.8); - background-image: $osd_insensitive_bg_color; + border: 1px solid transparentize(black, 0.55); + background-color: transparentize(black, 0.85); } } diff --git a/common/gnome-shell/3.16/sass/gnome-shell.scss b/common/gnome-shell/3.16/sass/gnome-shell.scss index 3418548..674f742 100644 --- a/common/gnome-shell/3.16/sass/gnome-shell.scss +++ b/common/gnome-shell/3.16/sass/gnome-shell.scss @@ -1,3 +1,7 @@ +$variant: 'light'; +$transparency: 'true'; +$darker: 'false'; + @import "_colors"; //use gtk colors @import "_drawing"; @import "_common"; diff --git a/common/gtk-2.0/apps.rc b/common/gtk-2.0/apps.rc index f919fe9..6a010b0 100644 --- a/common/gtk-2.0/apps.rc +++ b/common/gtk-2.0/apps.rc @@ -11,7 +11,7 @@ style "dark-sidebar" { base[NORMAL] = @dark_sidebar_bg base[INSENSITIVE] = @dark_sidebar_bg - text[NORMAL] = "#a8adb5" + text[NORMAL] = "#BAC3CF" text[ACTIVE] = @selected_fg_color text[SELECTED] = @selected_fg_color } diff --git a/common/gtk-2.0/panel.rc b/common/gtk-2.0/panel.rc index 9974b76..5d57781 100644 --- a/common/gtk-2.0/panel.rc +++ b/common/gtk-2.0/panel.rc @@ -7,15 +7,15 @@ style "theme-panel" { bg[PRELIGHT] = shade(1.1, @selected_bg_color) bg[SELECTED] = @selected_bg_color - fg[NORMAL] = "#A8ADB5" + fg[NORMAL] = "#BAC3CF" fg[PRELIGHT] = @selected_fg_color fg[ACTIVE] = @selected_fg_color fg[SELECTED] = @selected_fg_color - text[NORMAL] = "#A8ADB5" - text[PRELIGHT] = "#A8ADB5" - text[ACTIVE] = "#A8ADB5" - text[SELECTED] = "#A8ADB5" + text[NORMAL] = "#BAC3CF" + text[PRELIGHT] = "#BAC3CF" + text[ACTIVE] = "#BAC3CF" + text[SELECTED] = "#BAC3CF" engine "murrine" { reliefstyle = 0 diff --git a/common/gtk-3.0/3.14/.nvmrc b/common/gtk-3.0/3.14/.nvmrc index 43c2417..2bf5ad0 100644 --- a/common/gtk-3.0/3.14/.nvmrc +++ b/common/gtk-3.0/3.14/.nvmrc @@ -1 +1 @@ -0.12.5 +stable diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css index e091bb4..1855f44 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -109,13 +109,12 @@ GtkFlowBox .grid-child { GtkFlowBox .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkFlowBox .grid-child { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkFlowBox .grid-child { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkFlowBox .grid-child { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -821,9 +818,9 @@ GtkComboBox { background-color: #444852; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.85); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); @@ -1786,7 +1783,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, rgba(42, 44, 51, 0.95)); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1816,8 +1813,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(47, 50, 58, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, rgba(58, 62, 70, 0.95)); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -1962,6 +1959,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; + color: #BAC3CF; background-color: rgba(60, 64, 73, 0.95); background-clip: border-box; border-radius: 0 0 2px 2px; @@ -1970,32 +1968,31 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(37, 39, 45, 0.95); } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2158,10 +2155,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2850,16 +2847,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2937,8 +2934,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, rgba(31, 33, 37, 0.95)); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2946,10 +2943,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2970,7 +2967,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2979,21 +2976,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: rgba(31, 33, 37, 0.95); } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(54, 57, 65, 0.95); } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: rgba(15, 16, 18, 0.95); } .floating-bar { background-color: #5294E2; @@ -3178,8 +3175,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3345,18 +3342,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: rgba(31, 33, 37, 0.95); + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px rgba(15, 16, 18, 0.95); /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3374,9 +3371,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(68, 72, 82, 0.95); + background-color: #383C45; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #D3DAE3; @@ -3405,30 +3404,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: rgba(42, 44, 51, 0.95); + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px rgba(19, 20, 23, 0.95); } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #D3DAE3; @@ -3439,50 +3440,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3503,12 +3502,12 @@ NemoWindow { GtkFileChooserDialog .sidebar, NautilusWindow .sidebar, NemoWindow .sidebar { - border-right: 1px solid rgba(46, 49, 56, 0.95); } + border-right: 1px solid rgba(37, 39, 45, 0.95); } GtkFileChooserDialog .sidebar:dir(rtl), NautilusWindow .sidebar:dir(rtl), NemoWindow .sidebar:dir(rtl) { - border-left: 1px solid rgba(46, 49, 56, 0.95); } + border-left: 1px solid rgba(37, 39, 45, 0.95); } GtkFileChooserDialog.csd.background, GtkFileChooserDialog .source-list, @@ -3542,7 +3541,7 @@ NemoWindow .sidebar, NemoWindow MarlinPlacesSidebar, NemoWindow NemoPlacesSidebar, MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindow NemoPlacesSidebar { - background-color: rgba(69, 74, 84, 0.95); } + background-color: rgba(60, 64, 73, 0.95); } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, @@ -3563,7 +3562,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .source-list.sidebar row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row, MarlinViewWindow NemoPlacesSidebar .view, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, @@ -3583,7 +3582,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .view.image, NemoWindow NemoPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow NemoPlacesSidebar .view.image, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, @@ -3615,7 +3614,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar.frame, NemoWindow NemoPlacesSidebar.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, @@ -3660,7 +3659,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, @@ -3671,7 +3670,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar .scrollbar.slider:hover, NemoWindow NemoPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, @@ -3721,16 +3720,16 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #454a54; } + background-color: #3c4049; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: rgba(46, 49, 56, 0.95); } + background-color: rgba(37, 39, 45, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: rgba(69, 74, 84, 0.95); } + background-color: rgba(60, 64, 73, 0.95); } GtkFileChooserDialog .sidebar { background-color: transparent; } @@ -3742,23 +3741,23 @@ GtkFileChooserDialog .dialog-action-box { background-color: #444852; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: rgba(35, 37, 42, 0.95); } + border-color: rgba(25, 27, 31, 0.95); } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: rgba(46, 49, 56, 0.95); } + background-color: rgba(37, 39, 45, 0.95); } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, @@ -3769,19 +3768,19 @@ GeditWindow.background.csd { background-color: #383C45; } .gedit-document-panel { - background-color: rgba(69, 74, 84, 0.95); } + background-color: rgba(60, 64, 73, 0.95); } .maximized .gedit-document-panel { - background-color: #454a54; } + background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3795,21 +3794,21 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: rgba(69, 74, 84, 0.95); } + background-color: rgba(60, 64, 73, 0.95); } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #454a54; } + background-color: #3c4049; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.trough { background-color: transparent; border-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider.fine-tune { @@ -3825,60 +3824,59 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: rgba(53, 57, 65, 0.95); } + border-color: rgba(44, 47, 53, 0.95); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #D3DAE3; diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css index d933516..aea037c 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -109,13 +109,12 @@ GtkFlowBox .grid-child { GtkFlowBox .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkFlowBox .grid-child { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkFlowBox .grid-child { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkFlowBox .grid-child { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -821,9 +818,9 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.85); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); @@ -1787,7 +1784,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, rgba(42, 44, 51, 0.95)); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1817,8 +1814,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(207, 214, 230, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, rgba(58, 62, 70, 0.95)); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -1963,6 +1960,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; + color: #BAC3CF; background-color: rgba(60, 64, 73, 0.95); background-clip: border-box; border-radius: 0 0 2px 2px; @@ -1971,32 +1969,31 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(37, 39, 45, 0.95); } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2159,10 +2156,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2851,16 +2848,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2938,8 +2935,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, rgba(31, 33, 37, 0.95)); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2947,10 +2944,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2971,7 +2968,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2980,21 +2977,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: rgba(31, 33, 37, 0.95); } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(54, 57, 65, 0.95); } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: rgba(15, 16, 18, 0.95); } .floating-bar { background-color: #5294E2; @@ -3179,8 +3176,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3346,18 +3343,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: rgba(31, 33, 37, 0.95); + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px rgba(15, 16, 18, 0.95); /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3375,9 +3372,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(245, 246, 247, 0.95); + background-color: #F5F6F7; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #5c616c; @@ -3406,30 +3405,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: rgba(42, 44, 51, 0.95); + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px rgba(19, 20, 23, 0.95); } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #5c616c; @@ -3440,50 +3441,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3554,7 +3553,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .source-list.sidebar row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row, MarlinViewWindow NemoPlacesSidebar .view, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, @@ -3574,7 +3573,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .view.image, NemoWindow NemoPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow NemoPlacesSidebar .view.image, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, @@ -3606,7 +3605,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar.frame, NemoWindow NemoPlacesSidebar.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, @@ -3651,7 +3650,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, @@ -3662,7 +3661,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar .scrollbar.slider:hover, NemoWindow NemoPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, @@ -3733,7 +3732,7 @@ GtkFileChooserDialog .dialog-action-box { background-color: #F5F6F7; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { @@ -3743,7 +3742,7 @@ GtkFileChooserDialog .action-bar.frame { GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } @@ -3764,15 +3763,15 @@ GeditWindow.background.csd { .maximized .gedit-document-panel { background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3786,7 +3785,7 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { background-color: rgba(60, 64, 73, 0.95); } @@ -3798,9 +3797,9 @@ GeditWindow.background.csd GeditFileBrowserWidget { GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider.fine-tune { @@ -3818,58 +3817,57 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; border-color: rgba(44, 47, 53, 0.95); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css index 1419d47..ee7935c 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css @@ -109,13 +109,12 @@ GtkFlowBox .grid-child { GtkFlowBox .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkFlowBox .grid-child { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkFlowBox .grid-child { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkFlowBox .grid-child { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -821,9 +818,9 @@ GtkComboBox { background-color: #444852; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.9); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); @@ -1786,7 +1783,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, #2a2c33); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1816,8 +1813,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(47, 50, 58, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, #3a3e46); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -1962,40 +1959,40 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; - background-color: rgba(60, 64, 73, 0.95); + color: #BAC3CF; + background-color: #3c4049; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: rgba(37, 39, 45, 0.95); } + border-color: #25272d; } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2158,10 +2155,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2850,16 +2847,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2937,8 +2934,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, #1f2125); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2946,10 +2943,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2970,7 +2967,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2979,21 +2976,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: #1f2125; } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: #363941; } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: #0f1012; } .floating-bar { background-color: #5294E2; @@ -3178,8 +3175,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3345,18 +3342,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: #1f2125; + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px #0f1012; /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3374,9 +3371,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(68, 72, 82, 0.95); + background-color: #383C45; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #D3DAE3; @@ -3405,30 +3404,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: #2a2c33; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px #131417; } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #D3DAE3; @@ -3439,50 +3440,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3503,12 +3502,12 @@ NemoWindow { GtkFileChooserDialog .sidebar, NautilusWindow .sidebar, NemoWindow .sidebar { - border-right: 1px solid #2e3138; } + border-right: 1px solid #25272d; } GtkFileChooserDialog .sidebar:dir(rtl), NautilusWindow .sidebar:dir(rtl), NemoWindow .sidebar:dir(rtl) { - border-left: 1px solid #2e3138; } + border-left: 1px solid #25272d; } GtkFileChooserDialog.csd.background, GtkFileChooserDialog .source-list, @@ -3542,7 +3541,7 @@ NemoWindow .sidebar, NemoWindow MarlinPlacesSidebar, NemoWindow NemoPlacesSidebar, MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindow NemoPlacesSidebar { - background-color: #454a54; } + background-color: #3c4049; } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, @@ -3563,7 +3562,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .source-list.sidebar row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row, MarlinViewWindow NemoPlacesSidebar .view, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, @@ -3583,7 +3582,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .view.image, NemoWindow NemoPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow NemoPlacesSidebar .view.image, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, @@ -3615,7 +3614,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar.frame, NemoWindow NemoPlacesSidebar.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, @@ -3660,7 +3659,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, @@ -3671,7 +3670,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar .scrollbar.slider:hover, NemoWindow NemoPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, @@ -3721,16 +3720,16 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #454a54; } + background-color: #3c4049; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: #2e3138; } + background-color: #25272d; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: #454a54; } + background-color: #3c4049; } GtkFileChooserDialog .sidebar { background-color: transparent; } @@ -3742,23 +3741,23 @@ GtkFileChooserDialog .dialog-action-box { background-color: #444852; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: #23252a; } + border-color: #191b1f; } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: #2e3138; } + background-color: #25272d; } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, @@ -3769,19 +3768,19 @@ GeditWindow.background.csd { background-color: #383C45; } .gedit-document-panel { - background-color: #454a54; } + background-color: #3c4049; } .maximized .gedit-document-panel { - background-color: #454a54; } + background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3795,21 +3794,21 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #454a54; } + background-color: #3c4049; } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #454a54; } + background-color: #3c4049; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.trough { background-color: transparent; border-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider.fine-tune { @@ -3825,60 +3824,59 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: #353941; } + border-color: #2c2f35; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #D3DAE3; diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css index 4499de0..9635c04 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css @@ -109,13 +109,12 @@ GtkFlowBox .grid-child { GtkFlowBox .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkFlowBox .grid-child { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkFlowBox .grid-child { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkFlowBox .grid-child { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -821,9 +818,9 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.9); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); @@ -1787,7 +1784,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, #2a2c33); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1817,8 +1814,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(207, 214, 230, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, #3a3e46); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -1963,40 +1960,40 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; - background-color: rgba(60, 64, 73, 0.95); + color: #BAC3CF; + background-color: #3c4049; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: rgba(37, 39, 45, 0.95); } + border-color: #25272d; } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2159,10 +2156,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2851,16 +2848,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2938,8 +2935,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, #1f2125); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2947,10 +2944,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2971,7 +2968,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2980,21 +2977,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: #1f2125; } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: #363941; } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: #0f1012; } .floating-bar { background-color: #5294E2; @@ -3179,8 +3176,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3346,18 +3343,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: #1f2125; + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px #0f1012; /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3375,9 +3372,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(245, 246, 247, 0.95); + background-color: #F5F6F7; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #5c616c; @@ -3406,30 +3405,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: #2a2c33; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px #131417; } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #5c616c; @@ -3440,50 +3441,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3554,7 +3553,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .source-list.sidebar row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row, MarlinViewWindow NemoPlacesSidebar .view, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, @@ -3574,7 +3573,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .view.image, NemoWindow NemoPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow NemoPlacesSidebar .view.image, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, @@ -3606,7 +3605,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar.frame, NemoWindow NemoPlacesSidebar.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, @@ -3651,7 +3650,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, @@ -3662,7 +3661,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar .scrollbar.slider:hover, NemoWindow NemoPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, @@ -3733,7 +3732,7 @@ GtkFileChooserDialog .dialog-action-box { background-color: #F5F6F7; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { @@ -3743,7 +3742,7 @@ GtkFileChooserDialog .action-bar.frame { GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } @@ -3764,15 +3763,15 @@ GeditWindow.background.csd { .maximized .gedit-document-panel { background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3786,7 +3785,7 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { background-color: #3c4049; } @@ -3798,9 +3797,9 @@ GeditWindow.background.csd GeditFileBrowserWidget { GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider.fine-tune { @@ -3818,58 +3817,57 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; border-color: #2c2f35; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css index b13e7ba..3d506be 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -109,13 +109,12 @@ GtkFlowBox .grid-child { GtkFlowBox .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkFlowBox .grid-child { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkFlowBox .grid-child { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkFlowBox .grid-child { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -821,9 +818,9 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.9); } .primary-toolbar { color: rgba(82, 93, 118, 0.8); @@ -1786,7 +1783,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, #2a2c33); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1816,8 +1813,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(207, 214, 230, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, #3a3e46); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -1962,40 +1959,40 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; - background-color: rgba(60, 64, 73, 0.95); + color: #BAC3CF; + background-color: #3c4049; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: rgba(37, 39, 45, 0.95); } + border-color: #25272d; } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2158,10 +2155,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2850,16 +2847,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2937,8 +2934,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, #1f2125); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2946,10 +2943,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2970,7 +2967,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2979,21 +2976,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: #1f2125; } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: #363941; } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: #0f1012; } .floating-bar { background-color: #5294E2; @@ -3178,8 +3175,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3345,18 +3342,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: #1f2125; + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px #0f1012; /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3374,9 +3371,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(245, 246, 247, 0.95); + background-color: #F5F6F7; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #5c616c; @@ -3405,30 +3404,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: #2a2c33; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px #131417; } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #5c616c; @@ -3439,50 +3440,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3553,7 +3552,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .source-list.sidebar row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row, MarlinViewWindow NemoPlacesSidebar .view, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, @@ -3573,7 +3572,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .view.image, NemoWindow NemoPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow NemoPlacesSidebar .view.image, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, @@ -3605,7 +3604,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar.frame, NemoWindow NemoPlacesSidebar.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, @@ -3650,7 +3649,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, @@ -3661,7 +3660,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar .scrollbar.slider:hover, NemoWindow NemoPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, @@ -3732,7 +3731,7 @@ GtkFileChooserDialog .dialog-action-box { background-color: #F5F6F7; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { @@ -3742,7 +3741,7 @@ GtkFileChooserDialog .action-bar.frame { GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } @@ -3763,15 +3762,15 @@ GeditWindow.background.csd { .maximized .gedit-document-panel { background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3785,7 +3784,7 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { background-color: #3c4049; } @@ -3797,9 +3796,9 @@ GeditWindow.background.csd GeditFileBrowserWidget { GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider.fine-tune { @@ -3817,58 +3816,57 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; border-color: #2c2f35; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index a17f928..c01f5d5 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -109,13 +109,12 @@ GtkFlowBox .grid-child { GtkFlowBox .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkFlowBox .grid-child { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkFlowBox .grid-child { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkFlowBox .grid-child { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -821,9 +818,9 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.85); } .primary-toolbar { color: rgba(82, 93, 118, 0.8); @@ -1786,7 +1783,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, rgba(42, 44, 51, 0.95)); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1816,8 +1813,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(207, 214, 230, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, rgba(58, 62, 70, 0.95)); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -1962,6 +1959,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; + color: #BAC3CF; background-color: rgba(60, 64, 73, 0.95); background-clip: border-box; border-radius: 0 0 2px 2px; @@ -1970,32 +1968,31 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(37, 39, 45, 0.95); } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2158,10 +2155,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2850,16 +2847,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2937,8 +2934,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, rgba(31, 33, 37, 0.95)); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2946,10 +2943,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2970,7 +2967,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2979,21 +2976,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: rgba(31, 33, 37, 0.95); } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(54, 57, 65, 0.95); } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: rgba(15, 16, 18, 0.95); } .floating-bar { background-color: #5294E2; @@ -3178,8 +3175,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3345,18 +3342,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: rgba(31, 33, 37, 0.95); + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px rgba(15, 16, 18, 0.95); /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3374,9 +3371,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(245, 246, 247, 0.95); + background-color: #F5F6F7; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #5c616c; @@ -3405,30 +3404,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: rgba(42, 44, 51, 0.95); + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px rgba(19, 20, 23, 0.95); } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #5c616c; @@ -3439,50 +3440,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3553,7 +3552,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .source-list.sidebar row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row, MarlinViewWindow NemoPlacesSidebar .view, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, @@ -3573,7 +3572,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow NemoPlacesSidebar .view.image, NemoWindow NemoPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow NemoPlacesSidebar .view.image, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, @@ -3605,7 +3604,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar.frame, NemoWindow NemoPlacesSidebar.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, @@ -3650,7 +3649,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, @@ -3661,7 +3660,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindo NemoWindow MarlinPlacesSidebar .scrollbar.slider:hover, NemoWindow NemoPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, @@ -3732,7 +3731,7 @@ GtkFileChooserDialog .dialog-action-box { background-color: #F5F6F7; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { @@ -3742,7 +3741,7 @@ GtkFileChooserDialog .action-bar.frame { GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } @@ -3763,15 +3762,15 @@ GeditWindow.background.csd { .maximized .gedit-document-panel { background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3785,7 +3784,7 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { background-color: rgba(60, 64, 73, 0.95); } @@ -3797,9 +3796,9 @@ GeditWindow.background.csd GeditFileBrowserWidget { GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.slider.fine-tune { @@ -3817,58 +3816,57 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; border-color: rgba(44, 47, 53, 0.95); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; diff --git a/common/gtk-3.0/3.14/sass/_colors.scss b/common/gtk-3.0/3.14/sass/_colors.scss index c32b223..9c51858 100644 --- a/common/gtk-3.0/3.14/sass/_colors.scss +++ b/common/gtk-3.0/3.14/sass/_colors.scss @@ -24,19 +24,6 @@ $success_color: #73d216; $destructive_color: #F04A50; $suggested_color: #4DADD4; -$osd_fg_color: #A8ADB5; -$osd_bg_color: transparentize(#3c4049, 0.05); -$osd_button_bg: darken($osd_bg_color, 3%); - -$osd_insensitive_bg_color: darken($osd_bg_color, 3%); -$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%); -$osd_borders_color: transparentize(black, 0.3); - - -$tooltip_bg: $osd_bg_color; -$tooltip_fg: #edf5fb; -$tooltip_borders_color: transparentize(white, 0.9); - //insensitive state derived colors $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55)); $insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%)); @@ -44,7 +31,6 @@ $insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), $entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); $entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); -$entry_focus_border: $selected_bg_color; $button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); $button_border: $entry_border; @@ -55,8 +41,6 @@ $header_bg: red; @if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343b, 0.03); } @if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343b; } -//$header_bg: if(($darker == 'true' or $variant == 'dark') and $transparency == 'true', transparentize(#2f343b, 0.03), #2f343b); - $header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%)); $header_border: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); @@ -64,15 +48,19 @@ $header_border: if($variant == 'light', darken($header_bg, 7%), darken($header_b $header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%)); $header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg); -$dark_sidebar_bg: if($transparency == 'true' and $variant == 'light', $osd_bg_color, opacify($osd_bg_color, 1)); -@if $variant==dark { $dark_sidebar_bg: if($transparency == 'true', lighten($osd_bg_color, 4%), lighten(opacify($osd_bg_color, 1), 4%)); } - -$dark_sidebar_fg: $osd_fg_color; +$dark_sidebar_bg: if($transparency == 'true', transparentize(#3c4049, 0.05), #3c4049); +$dark_sidebar_fg: #BAC3CF; $dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 10%)); -$panel_bg: darken($osd_bg_color, 10%); -$panel_fg: $dark_sidebar_fg; +$osd_fg_color: $dark_sidebar_fg; +$osd_bg_color: darken($dark_sidebar_bg, 8%); +$osd_insensitive_bg_color: darken($osd_bg_color, 3%); +$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%); +$osd_borders_color: transparentize(black, 0.3); + +$panel_bg: darken($osd_bg_color, 4.7%); +$panel_fg: $osd_fg_color; //WM Buttons diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index 20189f8..49eb41f 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -441,7 +441,7 @@ $_dot_color: $selected_bg_color; &.image-button { padding: 10px; } - &:hover { @include button(osd-hover); border-color: transparentize($osd_fg_color, 0.7)} + &:hover { @include button(osd-hover); background-color: $osd_bg_color; } &:active, &:checked { @include button(osd-active); } &:insensitive { @include button(osd-insensitive); } } @@ -970,9 +970,9 @@ GtkComboBox { background-color: $bg_color; .osd &, &.osd { padding: 7px; - border: none; - border-radius: 4px; - background-color: $osd_bg_color; + border: 1px solid transparentize(black, 0.4); + border-radius: 3px; + background-color: transparentize($osd_bg_color, 0.1); } } @@ -1377,7 +1377,6 @@ GtkTreeView.view { // treeview grid lines a background-color: $selected_fg_color; } } - &.trough, &.trough:selected { // progress bar trough in treeviews color: $fg_color; background-color: $button_border; @@ -1637,12 +1636,6 @@ column-header.button.dnd { // for treeview-like derive widgets &.top, &.bottom { padding-left: 12px; // for a nicer close button padding-right: 12px; // placement - //border-left-width: 1px; - //border-right-width: 1px; - } - &.left, &.right { - //border-bottom-width: 1px; - //border-top-width: 1px; } } @each $_tab in (top, bottom, right, left) { @@ -1790,6 +1783,7 @@ column-header.button.dnd { // for treeview-like derive widgets background-color: $base_color; } + /********** * Switch * **********/ @@ -2189,15 +2183,15 @@ GtkScrolledWindow { .app-notification, .app-notification.frame { - @extend %osd; padding: 10px; - background-color: $osd_bg_color; + color: $dark_sidebar_fg; + background-color: $dark_sidebar_bg; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: darken($osd_bg_color, 10%); - + border-color: darken($dark_sidebar_bg, 10%); + .button { @include button(osd); &.flat { @@ -2459,11 +2453,11 @@ GtkInfoBar { &.background { // background-color needs to be set this way otherwise it gets drawn twice // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details. - background-color: $tooltip_bg; + background-color: $osd_bg_color; background-clip: padding-box; } - color: $tooltip_fg; + color: $osd_fg_color; border-radius: 2px; &.window-frame.csd { diff --git a/common/gtk-3.0/3.14/sass/_drawing.scss b/common/gtk-3.0/3.14/sass/_drawing.scss index 378e5d9..c073126 100644 --- a/common/gtk-3.0/3.14/sass/_drawing.scss +++ b/common/gtk-3.0/3.14/sass/_drawing.scss @@ -87,30 +87,30 @@ @else if $t==osd { // - // normal osd button + // normal osd entry // color: $osd_fg_color; - border-color: transparentize($osd_fg_color, 0.7); + border-color: transparentize(black, 0.6); background-color: transparent; - background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%)); + background-image: linear-gradient(to bottom, transparentize(black, 0.8)); } @else if $t==osd-focus { // - // active osd button + // active osd entry // - color: $selected_bg_color; + color: $osd_fg_color; border-color: $selected_bg_color; - background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%)); + background-image: linear-gradient(to bottom, transparentize(black, 0.8)); } @else if $t==osd-insensitive { // - // insensitive osd button + // insensitive osd entry // color: $osd_insensitive_fg_color; - border-color: transparentize($osd_fg_color, 0.8); - background-image: linear-gradient(to bottom, $osd_insensitive_bg_color); + border-color: transparentize(black, 0.6); + background-image: linear-gradient(to bottom, transparentize(black, 0.9)); } } @@ -237,19 +237,18 @@ // color: $osd_fg_color; outline-color: transparentize($osd_fg_color, 0.7); - border-color: transparentize($osd_fg_color, 0.7); - background-color: transparent; - background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%)); + border-color: transparentize(black, 0.55); + background-color: transparentize(black, 0.7); } @else if $t==osd-hover { // // active osd button // - color: $selected_bg_color; + color: $osd_fg_color; outline-color: transparentize($osd_fg_color, 0.7); border-color: $selected_bg_color; - background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%)); + background-color: transparentize(black, 0.7); } @else if $t==osd-active { @@ -259,7 +258,7 @@ color: $selected_fg_color; outline-color: transparentize($selected_fg_color, 0.7); border-color: $selected_bg_color; - background-image: linear-gradient(to bottom, $selected_bg_color); + background-color: $selected_bg_color; } @else if $t==osd-insensitive { @@ -267,8 +266,8 @@ // insensitive osd button // color: $osd_insensitive_fg_color; - border-color: transparentize($osd_fg_color, 0.8); - background-image: linear-gradient(to bottom, $osd_insensitive_bg_color); + border-color: transparentize(black, 0.55); + background-color: transparentize(black, 0.85); } @else if $t==suggested_destructive { diff --git a/common/gtk-3.0/3.14/sass/_lightdm.scss b/common/gtk-3.0/3.14/sass/_lightdm.scss index 9b14d09..9b2fa76 100644 --- a/common/gtk-3.0/3.14/sass/_lightdm.scss +++ b/common/gtk-3.0/3.14/sass/_lightdm.scss @@ -14,7 +14,7 @@ } .menubar .menuitem:insensitive { - color: darken($panel_fg, 20%); + color: transparentize($panel_fg, 0.5); GtkLabel { color: inherit; } } @@ -34,9 +34,11 @@ /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: transparentize($bg_color, 0.05); + background-color: if($variant == 'light', $bg_color, $base_color); border-top-left-radius: 2px; border-top-right-radius: 2px; + border: solid transparentize(black, 0.9); + border-width: 1px 1px 0 1px; } #content_frame .button { @@ -53,8 +55,11 @@ padding-bottom: 0px; border-style: none; background-color: $osd_bg_color; - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid transparentize(black, 0.9); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px darken($osd_bg_color, 10%); } #buttonbox_frame .button{ @@ -76,7 +81,7 @@ /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; + border-radius: 2px; } /* the border around the user's avatar box */ @@ -84,54 +89,18 @@ /* the shutdown button */ #shutdown_button.button { - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: $destructive_color; - background-color: $destructive_color; - background-image: none; - background-clip: border-box; + @include button(suggested_destructive, $destructive_color); - &:hover { - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: lighten($destructive_color, 9%); - background-color: lighten($destructive_color, 9%); - background-image: none; - } - &:active, &:checked { - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: darken($destructive_color, 7%); - background-color: darken($destructive_color, 7%); - background-image: none; - } + &:hover { @include button(suggested_destructive, lighten($destructive_color, 10%)); } + &:active, &:checked { @include button(suggested_destructive, darken($destructive_color, 10%)); } } /* the restart button */ #restart_button.button { - $_restart_bg: #51CF74; + @include button(suggested_destructive, $suggested_color); - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: $_restart_bg; - background-color: $_restart_bg; - background-image: none; - background-clip: border-box; - - &:hover { - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: lighten($_restart_bg, 9%); - background-color: lighten($_restart_bg, 9%); - background-image: none; - } - &:active, &:checked { - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: darken($_restart_bg, 7%); - background-color: darken($_restart_bg, 7%); - background-image: none; - } + &:hover { @include button(suggested_destructive, lighten($suggested_color, 10%)); } + &:active, &:checked { @include button(suggested_destructive, darken($suggested_color, 10%)); } } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ diff --git a/common/gtk-3.0/3.14/sass/_transparent_widgets.scss b/common/gtk-3.0/3.14/sass/_transparent_widgets.scss index 2e05e43..e10fb05 100644 --- a/common/gtk-3.0/3.14/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.14/sass/_transparent_widgets.scss @@ -38,7 +38,7 @@ MarlinViewWindow { background-color: transparent; color: $dark_sidebar_fg; - &.image { color: transparentize($dark_sidebar_fg, 0.4); } + &.image { color: transparentize($dark_sidebar_fg, 0.3); } &.cell:selected { background-color: $selected_bg_color; diff --git a/common/gtk-3.0/3.16/.nvmrc b/common/gtk-3.0/3.16/.nvmrc index 43c2417..2bf5ad0 100644 --- a/common/gtk-3.0/3.16/.nvmrc +++ b/common/gtk-3.0/3.16/.nvmrc @@ -1 +1 @@ -0.12.5 +stable diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index 21827fd..9c16d81 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -109,13 +109,12 @@ GtkTextView { .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkTextView { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkTextView { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkTextView { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -821,9 +818,9 @@ GtkComboBox { background-color: #444852; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.85); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); @@ -1844,7 +1841,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, rgba(42, 44, 51, 0.95)); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1874,8 +1871,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(47, 50, 58, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, rgba(58, 62, 70, 0.95)); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -2020,6 +2017,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; + color: #BAC3CF; background-color: rgba(60, 64, 73, 0.95); background-clip: border-box; border-radius: 0 0 2px 2px; @@ -2028,32 +2026,31 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(37, 39, 45, 0.95); } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2224,10 +2221,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2816,16 +2813,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2903,8 +2900,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, rgba(31, 33, 37, 0.95)); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2912,10 +2909,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2936,7 +2933,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2945,21 +2942,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: rgba(31, 33, 37, 0.95); } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(54, 57, 65, 0.95); } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: rgba(15, 16, 18, 0.95); } .floating-bar { background-color: #5294E2; @@ -3144,8 +3141,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3311,18 +3308,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: rgba(31, 33, 37, 0.95); + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px rgba(15, 16, 18, 0.95); /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3340,9 +3337,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(68, 72, 82, 0.95); + background-color: #383C45; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #D3DAE3; @@ -3371,30 +3370,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: rgba(42, 44, 51, 0.95); + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px rgba(19, 20, 23, 0.95); } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #D3DAE3; @@ -3405,50 +3406,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3469,12 +3468,12 @@ NemoWindow { GtkFileChooserDialog .sidebar, NautilusWindow .sidebar, NemoWindow .sidebar { - border-right: 1px solid rgba(46, 49, 56, 0.95); } + border-right: 1px solid rgba(37, 39, 45, 0.95); } GtkFileChooserDialog .sidebar:dir(rtl), NautilusWindow .sidebar:dir(rtl), NemoWindow .sidebar:dir(rtl) { - border-left: 1px solid rgba(46, 49, 56, 0.95); } + border-left: 1px solid rgba(37, 39, 45, 0.95); } GtkFileChooserDialog.csd.background, GtkFileChooserDialog .source-list, @@ -3499,7 +3498,7 @@ NautilusWindow .source-list.sidebar.view, NemoWindow .sidebar, NemoWindow .source-list.sidebar.view, MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { - background-color: rgba(69, 74, 84, 0.95); } + background-color: rgba(60, 64, 73, 0.95); } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar row, GtkFileChooserDialog .source-list.sidebar.view .view, @@ -3514,7 +3513,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .source-list.sidebar.view row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar row, MarlinViewWindow .source-list.sidebar.view .view, MarlinViewWindow .source-list.sidebar.view row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar row.image, GtkFileChooserDialog .source-list.sidebar.view .view.image, @@ -3528,7 +3527,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .source-list.sidebar.view .view.image, NemoWindow .source-list.sidebar.view row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar row.image, MarlinViewWindow .source-list.sidebar.view .view.image, MarlinViewWindow .source-list.sidebar.view row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar row.cell:selected, GtkFileChooserDialog .source-list.sidebar.view .view.cell:selected, @@ -3551,7 +3550,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar.frame, NemoWindow .source-list.sidebar.view.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow .source-list.sidebar.view.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog .source-list.sidebar.view .separator, @@ -3570,7 +3569,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, NemoWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { - background-color: #d1d4d8; + background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .sidebar .scrollbar .trough, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough, @@ -3588,7 +3587,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar .slider, NemoWindow .source-list.sidebar.view .scrollbar .slider, MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider { - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar .slider:hover, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:hover, NautilusWindow .sidebar .scrollbar .slider:hover, @@ -3596,7 +3595,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar .slider:hover, NemoWindow .source-list.sidebar.view .scrollbar .slider:hover, MarlinViewWindow .sidebar .scrollbar .slider:hover, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:prelight:active, NautilusWindow .sidebar .scrollbar .slider:prelight:active, @@ -3618,16 +3617,16 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #454a54; } + background-color: #3c4049; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: rgba(46, 49, 56, 0.95); } + background-color: rgba(37, 39, 45, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: rgba(69, 74, 84, 0.95); } + background-color: rgba(60, 64, 73, 0.95); } GtkFileChooserDialog .sidebar { background-color: transparent; } @@ -3639,23 +3638,23 @@ GtkFileChooserDialog .dialog-action-box { background-color: #444852; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: rgba(35, 37, 42, 0.95); } + border-color: rgba(25, 27, 31, 0.95); } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: rgba(46, 49, 56, 0.95); } + background-color: rgba(37, 39, 45, 0.95); } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, @@ -3666,19 +3665,19 @@ GeditWindow.background.csd { background-color: #383C45; } .gedit-document-panel { - background-color: rgba(69, 74, 84, 0.95); } + background-color: rgba(60, 64, 73, 0.95); } .maximized .gedit-document-panel { - background-color: #454a54; } + background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3692,82 +3691,81 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: rgba(69, 74, 84, 0.95); } + background-color: rgba(60, 64, 73, 0.95); } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #454a54; } + background-color: #3c4049; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { - background-color: #d1d4d8; + background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .trough { background-color: rgba(0, 0, 0, 0.2); border: none; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider { - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:hover { - background-color: #d1d4d8; } + background-color: #e7eaee; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:insensitive { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: rgba(53, 57, 65, 0.95); } + border-color: rgba(44, 47, 53, 0.95); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #D3DAE3; diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css index c931495..2056939 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -109,13 +109,12 @@ GtkTextView { .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkTextView { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkTextView { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkTextView { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -821,9 +818,9 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.85); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); @@ -1845,7 +1842,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, rgba(42, 44, 51, 0.95)); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1875,8 +1872,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(207, 214, 230, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, rgba(58, 62, 70, 0.95)); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -2021,6 +2018,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; + color: #BAC3CF; background-color: rgba(60, 64, 73, 0.95); background-clip: border-box; border-radius: 0 0 2px 2px; @@ -2029,32 +2027,31 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(37, 39, 45, 0.95); } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2225,10 +2222,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2817,16 +2814,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2904,8 +2901,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, rgba(31, 33, 37, 0.95)); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2913,10 +2910,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2937,7 +2934,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2946,21 +2943,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: rgba(31, 33, 37, 0.95); } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(54, 57, 65, 0.95); } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: rgba(15, 16, 18, 0.95); } .floating-bar { background-color: #5294E2; @@ -3145,8 +3142,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3312,18 +3309,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: rgba(31, 33, 37, 0.95); + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px rgba(15, 16, 18, 0.95); /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3341,9 +3338,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(245, 246, 247, 0.95); + background-color: #F5F6F7; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #5c616c; @@ -3372,30 +3371,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: rgba(42, 44, 51, 0.95); + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px rgba(19, 20, 23, 0.95); } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #5c616c; @@ -3406,50 +3407,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3505,7 +3504,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .source-list.sidebar.view row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar row, MarlinViewWindow .source-list.sidebar.view .view, MarlinViewWindow .source-list.sidebar.view row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar row.image, GtkFileChooserDialog .source-list.sidebar.view .view.image, @@ -3519,7 +3518,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .source-list.sidebar.view .view.image, NemoWindow .source-list.sidebar.view row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar row.image, MarlinViewWindow .source-list.sidebar.view .view.image, MarlinViewWindow .source-list.sidebar.view row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar row.cell:selected, GtkFileChooserDialog .source-list.sidebar.view .view.cell:selected, @@ -3542,7 +3541,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar.frame, NemoWindow .source-list.sidebar.view.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow .source-list.sidebar.view.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog .source-list.sidebar.view .separator, @@ -3561,7 +3560,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, NemoWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { - background-color: #d1d4d8; + background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .sidebar .scrollbar .trough, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough, @@ -3579,7 +3578,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar .slider, NemoWindow .source-list.sidebar.view .scrollbar .slider, MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider { - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar .slider:hover, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:hover, NautilusWindow .sidebar .scrollbar .slider:hover, @@ -3587,7 +3586,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar .slider:hover, NemoWindow .source-list.sidebar.view .scrollbar .slider:hover, MarlinViewWindow .sidebar .scrollbar .slider:hover, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:prelight:active, NautilusWindow .sidebar .scrollbar .slider:prelight:active, @@ -3630,7 +3629,7 @@ GtkFileChooserDialog .dialog-action-box { background-color: #F5F6F7; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { @@ -3640,7 +3639,7 @@ GtkFileChooserDialog .action-bar.frame { GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } @@ -3661,15 +3660,15 @@ GeditWindow.background.csd { .maximized .gedit-document-panel { background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3683,22 +3682,22 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { background-color: rgba(60, 64, 73, 0.95); } .maximized GeditWindow.background.csd GeditFileBrowserWidget { background-color: #3c4049; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { - background-color: #d1d4d8; + background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .trough { background-color: rgba(0, 0, 0, 0.2); border: none; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider { - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:hover { - background-color: #d1d4d8; } + background-color: #e7eaee; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:insensitive { @@ -3707,58 +3706,57 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; border-color: rgba(44, 47, 53, 0.95); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css index a0f41af..7629519 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css @@ -109,13 +109,12 @@ GtkTextView { .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkTextView { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkTextView { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkTextView { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -821,9 +818,9 @@ GtkComboBox { background-color: #444852; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.9); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); @@ -1844,7 +1841,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, #2a2c33); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1874,8 +1871,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(47, 50, 58, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, #3a3e46); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -2020,40 +2017,40 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; - background-color: rgba(60, 64, 73, 0.95); + color: #BAC3CF; + background-color: #3c4049; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: rgba(37, 39, 45, 0.95); } + border-color: #25272d; } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2224,10 +2221,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2816,16 +2813,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2903,8 +2900,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, #1f2125); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2912,10 +2909,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2936,7 +2933,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2945,21 +2942,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: #1f2125; } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: #363941; } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: #0f1012; } .floating-bar { background-color: #5294E2; @@ -3144,8 +3141,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3311,18 +3308,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: #1f2125; + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px #0f1012; /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3340,9 +3337,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(68, 72, 82, 0.95); + background-color: #383C45; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #D3DAE3; @@ -3371,30 +3370,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: #2a2c33; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px #131417; } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #D3DAE3; @@ -3405,50 +3406,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3469,12 +3468,12 @@ NemoWindow { GtkFileChooserDialog .sidebar, NautilusWindow .sidebar, NemoWindow .sidebar { - border-right: 1px solid #2e3138; } + border-right: 1px solid #25272d; } GtkFileChooserDialog .sidebar:dir(rtl), NautilusWindow .sidebar:dir(rtl), NemoWindow .sidebar:dir(rtl) { - border-left: 1px solid #2e3138; } + border-left: 1px solid #25272d; } GtkFileChooserDialog.csd.background, GtkFileChooserDialog .source-list, @@ -3499,7 +3498,7 @@ NautilusWindow .source-list.sidebar.view, NemoWindow .sidebar, NemoWindow .source-list.sidebar.view, MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { - background-color: #454a54; } + background-color: #3c4049; } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar row, GtkFileChooserDialog .source-list.sidebar.view .view, @@ -3514,7 +3513,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .source-list.sidebar.view row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar row, MarlinViewWindow .source-list.sidebar.view .view, MarlinViewWindow .source-list.sidebar.view row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar row.image, GtkFileChooserDialog .source-list.sidebar.view .view.image, @@ -3528,7 +3527,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .source-list.sidebar.view .view.image, NemoWindow .source-list.sidebar.view row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar row.image, MarlinViewWindow .source-list.sidebar.view .view.image, MarlinViewWindow .source-list.sidebar.view row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar row.cell:selected, GtkFileChooserDialog .source-list.sidebar.view .view.cell:selected, @@ -3551,7 +3550,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar.frame, NemoWindow .source-list.sidebar.view.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow .source-list.sidebar.view.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog .source-list.sidebar.view .separator, @@ -3570,7 +3569,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, NemoWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { - background-color: #d1d4d8; + background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .sidebar .scrollbar .trough, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough, @@ -3588,7 +3587,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar .slider, NemoWindow .source-list.sidebar.view .scrollbar .slider, MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider { - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar .slider:hover, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:hover, NautilusWindow .sidebar .scrollbar .slider:hover, @@ -3596,7 +3595,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar .slider:hover, NemoWindow .source-list.sidebar.view .scrollbar .slider:hover, MarlinViewWindow .sidebar .scrollbar .slider:hover, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:prelight:active, NautilusWindow .sidebar .scrollbar .slider:prelight:active, @@ -3618,16 +3617,16 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #454a54; } + background-color: #3c4049; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: #2e3138; } + background-color: #25272d; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: #454a54; } + background-color: #3c4049; } GtkFileChooserDialog .sidebar { background-color: transparent; } @@ -3639,23 +3638,23 @@ GtkFileChooserDialog .dialog-action-box { background-color: #444852; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: #23252a; } + border-color: #191b1f; } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: #2e3138; } + background-color: #25272d; } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, @@ -3666,19 +3665,19 @@ GeditWindow.background.csd { background-color: #383C45; } .gedit-document-panel { - background-color: #454a54; } + background-color: #3c4049; } .maximized .gedit-document-panel { - background-color: #454a54; } + background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3692,82 +3691,81 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #454a54; } + background-color: #3c4049; } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #454a54; } + background-color: #3c4049; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { - background-color: #d1d4d8; + background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .trough { background-color: rgba(0, 0, 0, 0.2); border: none; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider { - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:hover { - background-color: #d1d4d8; } + background-color: #e7eaee; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:insensitive { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: #353941; } + border-color: #2c2f35; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #D3DAE3; diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css index f4d76fc..a77297f 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css @@ -109,13 +109,12 @@ GtkTextView { .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkTextView { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkTextView { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkTextView { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -821,9 +818,9 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.9); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); @@ -1845,7 +1842,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, #2a2c33); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1875,8 +1872,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(207, 214, 230, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, #3a3e46); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -2021,40 +2018,40 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; - background-color: rgba(60, 64, 73, 0.95); + color: #BAC3CF; + background-color: #3c4049; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: rgba(37, 39, 45, 0.95); } + border-color: #25272d; } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2225,10 +2222,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2817,16 +2814,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2904,8 +2901,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, #1f2125); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2913,10 +2910,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2937,7 +2934,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2946,21 +2943,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: #1f2125; } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: #363941; } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: #0f1012; } .floating-bar { background-color: #5294E2; @@ -3145,8 +3142,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3312,18 +3309,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: #1f2125; + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px #0f1012; /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3341,9 +3338,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(245, 246, 247, 0.95); + background-color: #F5F6F7; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #5c616c; @@ -3372,30 +3371,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: #2a2c33; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px #131417; } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #5c616c; @@ -3406,50 +3407,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3505,7 +3504,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .source-list.sidebar.view row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar row, MarlinViewWindow .source-list.sidebar.view .view, MarlinViewWindow .source-list.sidebar.view row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar row.image, GtkFileChooserDialog .source-list.sidebar.view .view.image, @@ -3519,7 +3518,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .source-list.sidebar.view .view.image, NemoWindow .source-list.sidebar.view row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar row.image, MarlinViewWindow .source-list.sidebar.view .view.image, MarlinViewWindow .source-list.sidebar.view row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar row.cell:selected, GtkFileChooserDialog .source-list.sidebar.view .view.cell:selected, @@ -3542,7 +3541,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar.frame, NemoWindow .source-list.sidebar.view.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow .source-list.sidebar.view.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog .source-list.sidebar.view .separator, @@ -3561,7 +3560,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, NemoWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { - background-color: #d1d4d8; + background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .sidebar .scrollbar .trough, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough, @@ -3579,7 +3578,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar .slider, NemoWindow .source-list.sidebar.view .scrollbar .slider, MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider { - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar .slider:hover, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:hover, NautilusWindow .sidebar .scrollbar .slider:hover, @@ -3587,7 +3586,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar .slider:hover, NemoWindow .source-list.sidebar.view .scrollbar .slider:hover, MarlinViewWindow .sidebar .scrollbar .slider:hover, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:prelight:active, NautilusWindow .sidebar .scrollbar .slider:prelight:active, @@ -3630,7 +3629,7 @@ GtkFileChooserDialog .dialog-action-box { background-color: #F5F6F7; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { @@ -3640,7 +3639,7 @@ GtkFileChooserDialog .action-bar.frame { GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } @@ -3661,15 +3660,15 @@ GeditWindow.background.csd { .maximized .gedit-document-panel { background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3683,22 +3682,22 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { background-color: #3c4049; } .maximized GeditWindow.background.csd GeditFileBrowserWidget { background-color: #3c4049; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { - background-color: #d1d4d8; + background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .trough { background-color: rgba(0, 0, 0, 0.2); border: none; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider { - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:hover { - background-color: #d1d4d8; } + background-color: #e7eaee; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:insensitive { @@ -3707,58 +3706,57 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; border-color: #2c2f35; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css index 99cd85b..b62274a 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -109,13 +109,12 @@ GtkTextView { .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkTextView { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkTextView { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: #2a2c33; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkTextView { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -821,9 +818,9 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.9); } .primary-toolbar { color: rgba(82, 93, 118, 0.8); @@ -1844,7 +1841,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, #2a2c33); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1874,8 +1871,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(207, 214, 230, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, #3a3e46); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -2020,40 +2017,40 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; - background-color: rgba(60, 64, 73, 0.95); + color: #BAC3CF; + background-color: #3c4049; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: rgba(37, 39, 45, 0.95); } + border-color: #25272d; } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2224,10 +2221,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: #2a2c33; background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2816,16 +2813,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2903,8 +2900,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, #1f2125); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2912,10 +2909,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2936,7 +2933,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2945,21 +2942,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: #1f2125; } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: #363941; } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: #0f1012; } .floating-bar { background-color: #5294E2; @@ -3144,8 +3141,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3311,18 +3308,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: #1f2125; + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px #0f1012; /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3340,9 +3337,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(245, 246, 247, 0.95); + background-color: #F5F6F7; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #5c616c; @@ -3371,30 +3370,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: #2a2c33; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px #131417; } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #5c616c; @@ -3405,50 +3406,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3504,7 +3503,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .source-list.sidebar.view row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar row, MarlinViewWindow .source-list.sidebar.view .view, MarlinViewWindow .source-list.sidebar.view row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar row.image, GtkFileChooserDialog .source-list.sidebar.view .view.image, @@ -3518,7 +3517,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .source-list.sidebar.view .view.image, NemoWindow .source-list.sidebar.view row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar row.image, MarlinViewWindow .source-list.sidebar.view .view.image, MarlinViewWindow .source-list.sidebar.view row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar row.cell:selected, GtkFileChooserDialog .source-list.sidebar.view .view.cell:selected, @@ -3541,7 +3540,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar.frame, NemoWindow .source-list.sidebar.view.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow .source-list.sidebar.view.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog .source-list.sidebar.view .separator, @@ -3560,7 +3559,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, NemoWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { - background-color: #d1d4d8; + background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .sidebar .scrollbar .trough, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough, @@ -3578,7 +3577,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar .slider, NemoWindow .source-list.sidebar.view .scrollbar .slider, MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider { - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar .slider:hover, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:hover, NautilusWindow .sidebar .scrollbar .slider:hover, @@ -3586,7 +3585,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar .slider:hover, NemoWindow .source-list.sidebar.view .scrollbar .slider:hover, MarlinViewWindow .sidebar .scrollbar .slider:hover, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:prelight:active, NautilusWindow .sidebar .scrollbar .slider:prelight:active, @@ -3629,7 +3628,7 @@ GtkFileChooserDialog .dialog-action-box { background-color: #F5F6F7; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { @@ -3639,7 +3638,7 @@ GtkFileChooserDialog .action-bar.frame { GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } @@ -3660,15 +3659,15 @@ GeditWindow.background.csd { .maximized .gedit-document-panel { background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3682,22 +3681,22 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { background-color: #3c4049; } .maximized GeditWindow.background.csd GeditFileBrowserWidget { background-color: #3c4049; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { - background-color: #d1d4d8; + background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .trough { background-color: rgba(0, 0, 0, 0.2); border: none; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider { - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:hover { - background-color: #d1d4d8; } + background-color: #e7eaee; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:insensitive { @@ -3706,58 +3705,57 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; border-color: #2c2f35; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 4aef20c..750924f 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -109,13 +109,12 @@ GtkTextView { .grid-child:selected { outline-offset: -2px; } -.popover.osd, .app-notification, -.app-notification.frame, .osd { - color: #A8ADB5; +.popover.osd, .osd { + color: #BAC3CF; border: none; - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; - outline-color: rgba(168, 173, 181, 0.3); + outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } /********************** @@ -245,18 +244,18 @@ GtkTextView { .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } .osd .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /*********** * Buttons * @@ -324,36 +323,34 @@ GtkTextView { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(168, 173, 181, 0.3); - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - background-color: rgba(60, 64, 73, 0.95); } + outline-color: rgba(186, 195, 207, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); - border-color: rgba(168, 173, 181, 0.3); } + background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(42, 44, 51, 0.95); } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.osd:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -373,39 +370,39 @@ GtkTextView { border-radius: 3px; border-style: solid; } .osd .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .osd .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } .osd .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } .osd .button.flat:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .osd .button.flat:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .button.suggested-action { background-clip: border-box; color: #ffffff; @@ -821,9 +818,9 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: none; - border-radius: 4px; - background-color: rgba(60, 64, 73, 0.95); } + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; + background-color: rgba(42, 44, 51, 0.85); } .primary-toolbar { color: rgba(82, 93, 118, 0.8); @@ -1844,7 +1841,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95)); + background-image: linear-gradient(to bottom, rgba(42, 44, 51, 0.95)); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1874,8 +1871,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(207, 214, 230, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95)); - outline-color: rgba(168, 173, 181, 0.2); } + background-image: linear-gradient(to bottom, rgba(58, 62, 70, 0.95)); + outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } @@ -2020,6 +2017,7 @@ GtkScrolledWindow GtkViewport.frame { .app-notification, .app-notification.frame { padding: 10px; + color: #BAC3CF; background-color: rgba(60, 64, 73, 0.95); background-clip: border-box; border-radius: 0 0 2px 2px; @@ -2028,32 +2026,31 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(37, 39, 45, 0.95); } .app-notification .button, .app-notification.frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } .app-notification .button:hover, .app-notification.frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } /************* * Expanders * @@ -2224,10 +2221,10 @@ GtkInfoBar { * Tooltips * ************/ .tooltip { - color: #edf5fb; + color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(42, 44, 51, 0.95); background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2816,16 +2813,16 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #3c4049; } + background-color: #2a2c33; } GtkBox.gb-command-bar-box GtkLabel { - color: #A8ADB5; } + color: #BAC3CF; } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; - color: #A8ADB5; + color: #BAC3CF; background-image: none; - background-color: #3c4049; + background-color: #2a2c33; padding: 6px 6px 6px 6px; border: none; } @@ -2903,8 +2900,8 @@ PanelToplevel, PanelWidget, PanelAppletFrame, PanelApplet { - color: #A8ADB5; - background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); } + color: #BAC3CF; + background-image: linear-gradient(to bottom, rgba(31, 33, 37, 0.95)); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2912,10 +2909,10 @@ PanelApplet .button, PanelApplet .button:backdrop { border-radius: 0; background-image: none; background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } PanelApplet .button:hover { - color: #c4c7cc; + color: #d8dde4; background-color: rgba(0, 0, 0, 0.17); border-color: rgba(0, 0, 0, 0.17); } @@ -2936,7 +2933,7 @@ PanelApplet:hover:active { color: #5294E2; } WnckPager { - color: #54575b; } + color: #5d6268; } WnckPager:selected { color: #5294E2; } @@ -2945,21 +2942,21 @@ NaTrayApplet { -NaTrayApplet-icon-size: 16; } ClockBox { - color: #A8ADB5; } + color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(37, 39, 45, 0.95); } + background-color: rgba(31, 33, 37, 0.95); } .xfce4-panel.panel .button.flat { - color: #A8ADB5; - background-color: rgba(37, 39, 45, 0); + color: #BAC3CF; + background-color: rgba(31, 33, 37, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(54, 57, 65, 0.95); } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(21, 22, 25, 0.95); } + background-color: rgba(15, 16, 18, 0.95); } .floating-bar { background-color: #5294E2; @@ -3144,8 +3141,8 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #25272d); - color: #dfe1e4; + background-image: linear-gradient(to bottom, #1f2125); + color: #f6f7f9; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -3311,18 +3308,18 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(37, 39, 45, 0.95); - color: #A8ADB5; + background-color: rgba(31, 33, 37, 0.95); + color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95); + box-shadow: inset 0 -1px rgba(15, 16, 18, 0.95); /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; - color: #A8ADB5; + color: #BAC3CF; font: bold; } #panel_window .menubar .menuitem:insensitive { - color: #727985; } + color: rgba(186, 195, 207, 0.5); } #panel_window .menubar .menuitem:insensitive GtkLabel { color: inherit; } #panel_window .menubar .menu .menuitem { @@ -3340,9 +3337,11 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: rgba(245, 246, 247, 0.95); + background-color: #F5F6F7; border-top-left-radius: 2px; - border-top-right-radius: 2px; } + border-top-right-radius: 2px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 1px 1px 0 1px; } #content_frame .button { color: #5c616c; @@ -3371,30 +3370,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(60, 64, 73, 0.95); - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; } + background-color: rgba(42, 44, 51, 0.95); + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid rgba(0, 0, 0, 0.1); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px rgba(19, 20, 23, 0.95); } #buttonbox_frame .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } #login_window #user_combobox { color: #5c616c; @@ -3405,50 +3406,48 @@ GtkListBox .h4 { /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; } + border-radius: 2px; } /* the border around the user's avatar box */ /* the shutdown button */ #shutdown_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #F04A50; background-color: #F04A50; - background-image: none; - background-clip: border-box; } + border-color: #F04A50; } #shutdown_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #f47479; - background-color: #f47479; - background-image: none; } + background-color: #f4797e; + border-color: #f4797e; } #shutdown_button.button:active, #shutdown_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #ed2930; - background-color: #ed2930; - background-image: none; } + background-color: #ec1b22; + border-color: #ec1b22; } /* the restart button */ #restart_button.button { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #51CF74; - background-color: #51CF74; - background-image: none; - background-clip: border-box; } + background-color: #4DADD4; + border-color: #4DADD4; } #restart_button.button:hover { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #75d991; - background-color: #75d991; - background-image: none; } + background-color: #76c0de; + border-color: #76c0de; } #restart_button.button:active, #restart_button.button:checked { + background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #37c65e; - background-color: #37c65e; - background-image: none; } + background-color: #2e96c0; + border-color: #2e96c0; } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { @@ -3504,7 +3503,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .source-list.sidebar.view row, MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar row, MarlinViewWindow .source-list.sidebar.view .view, MarlinViewWindow .source-list.sidebar.view row { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar row.image, GtkFileChooserDialog .source-list.sidebar.view .view.image, @@ -3518,7 +3517,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .source-list.sidebar.view .view.image, NemoWindow .source-list.sidebar.view row.image, MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar row.image, MarlinViewWindow .source-list.sidebar.view .view.image, MarlinViewWindow .source-list.sidebar.view row.image { - color: rgba(168, 173, 181, 0.6); } + color: rgba(186, 195, 207, 0.7); } GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar row.cell:selected, GtkFileChooserDialog .source-list.sidebar.view .view.cell:selected, @@ -3541,7 +3540,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar.frame, NemoWindow .source-list.sidebar.view.frame, MarlinViewWindow .sidebar.frame, MarlinViewWindow .source-list.sidebar.view.frame { - color: #A8ADB5; } + color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog .source-list.sidebar.view .separator, @@ -3560,7 +3559,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, NemoWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { - background-color: #d1d4d8; + background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .sidebar .scrollbar .trough, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough, @@ -3578,7 +3577,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar .slider, NemoWindow .source-list.sidebar.view .scrollbar .slider, MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider { - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar .slider:hover, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:hover, NautilusWindow .sidebar .scrollbar .slider:hover, @@ -3586,7 +3585,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { NemoWindow .sidebar .scrollbar .slider:hover, NemoWindow .source-list.sidebar.view .scrollbar .slider:hover, MarlinViewWindow .sidebar .scrollbar .slider:hover, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:hover { - background-color: #dfe1e4; } + background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:prelight:active, NautilusWindow .sidebar .scrollbar .slider:prelight:active, @@ -3629,7 +3628,7 @@ GtkFileChooserDialog .dialog-action-box { background-color: #F5F6F7; } GtkFileChooserDialog .dialog-vbox > .frame { - color: #A8ADB5; + color: #BAC3CF; border-color: transparent; } GtkFileChooserDialog .action-bar.frame { @@ -3639,7 +3638,7 @@ GtkFileChooserDialog .action-bar.frame { GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd { background-color: transparent; } @@ -3660,15 +3659,15 @@ GeditWindow.background.csd { .maximized .gedit-document-panel { background-color: #3c4049; } .gedit-document-panel .list-row { - color: #A8ADB5; } + color: #BAC3CF; } .gedit-document-panel .list-row { - background-color: rgba(168, 173, 181, 0); - border: solid rgba(168, 173, 181, 0); + background-color: rgba(186, 195, 207, 0); + border: solid rgba(186, 195, 207, 0); border-width: 3px 2px 3px 2px; } .gedit-document-panel .list-row:hover { - border: solid rgba(168, 173, 181, 0.15); + border: solid rgba(186, 195, 207, 0.15); border-width: 3px 2px 3px 2px; - background-color: rgba(168, 173, 181, 0.15); } + background-color: rgba(186, 195, 207, 0.15); } .gedit-document-panel .list-row:active { color: #ffffff; background-color: #5294E2; @@ -3682,22 +3681,22 @@ GeditWindow.background.csd { border: solid #5294E2; border-width: 3px 2px 3px 2px; } .gedit-document-panel .prelight-row .button:active { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { background-color: rgba(60, 64, 73, 0.95); } .maximized GeditWindow.background.csd GeditFileBrowserWidget { background-color: #3c4049; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { - background-color: #d1d4d8; + background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .trough { background-color: rgba(0, 0, 0, 0.2); border: none; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider { - background-color: rgba(209, 212, 216, 0.7); } + background-color: rgba(231, 234, 238, 0.7); } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:hover { - background-color: #d1d4d8; } + background-color: #e7eaee; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:prelight:active { background-color: #5294E2; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:insensitive { @@ -3706,58 +3705,57 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; border-color: rgba(44, 47, 53, 0.95); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view { background-color: transparent; - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander { - color: #A8ADB5; } + color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - color: #A8ADB5; - outline-color: rgba(168, 173, 181, 0.3); - border-color: rgba(168, 173, 181, 0.3); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - color: #5294E2; - outline-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + outline-color: rgba(186, 195, 207, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-color: rgba(0, 0, 0, 0.3); } GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { - color: #A8ADB5; - border-color: rgba(168, 173, 181, 0.3); + color: #BAC3CF; + border-color: rgba(0, 0, 0, 0.4); background-color: transparent; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #5294E2; + color: #BAC3CF; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #5c6169; - border-color: rgba(168, 173, 181, 0.2); - background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + color: #555a62; + border-color: rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; diff --git a/common/gtk-3.0/3.16/sass/_colors.scss b/common/gtk-3.0/3.16/sass/_colors.scss index c32b223..9c51858 100644 --- a/common/gtk-3.0/3.16/sass/_colors.scss +++ b/common/gtk-3.0/3.16/sass/_colors.scss @@ -24,19 +24,6 @@ $success_color: #73d216; $destructive_color: #F04A50; $suggested_color: #4DADD4; -$osd_fg_color: #A8ADB5; -$osd_bg_color: transparentize(#3c4049, 0.05); -$osd_button_bg: darken($osd_bg_color, 3%); - -$osd_insensitive_bg_color: darken($osd_bg_color, 3%); -$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%); -$osd_borders_color: transparentize(black, 0.3); - - -$tooltip_bg: $osd_bg_color; -$tooltip_fg: #edf5fb; -$tooltip_borders_color: transparentize(white, 0.9); - //insensitive state derived colors $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55)); $insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%)); @@ -44,7 +31,6 @@ $insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), $entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); $entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); -$entry_focus_border: $selected_bg_color; $button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); $button_border: $entry_border; @@ -55,8 +41,6 @@ $header_bg: red; @if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343b, 0.03); } @if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343b; } -//$header_bg: if(($darker == 'true' or $variant == 'dark') and $transparency == 'true', transparentize(#2f343b, 0.03), #2f343b); - $header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%)); $header_border: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); @@ -64,15 +48,19 @@ $header_border: if($variant == 'light', darken($header_bg, 7%), darken($header_b $header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%)); $header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg); -$dark_sidebar_bg: if($transparency == 'true' and $variant == 'light', $osd_bg_color, opacify($osd_bg_color, 1)); -@if $variant==dark { $dark_sidebar_bg: if($transparency == 'true', lighten($osd_bg_color, 4%), lighten(opacify($osd_bg_color, 1), 4%)); } - -$dark_sidebar_fg: $osd_fg_color; +$dark_sidebar_bg: if($transparency == 'true', transparentize(#3c4049, 0.05), #3c4049); +$dark_sidebar_fg: #BAC3CF; $dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 10%)); -$panel_bg: darken($osd_bg_color, 10%); -$panel_fg: $dark_sidebar_fg; +$osd_fg_color: $dark_sidebar_fg; +$osd_bg_color: darken($dark_sidebar_bg, 8%); +$osd_insensitive_bg_color: darken($osd_bg_color, 3%); +$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%); +$osd_borders_color: transparentize(black, 0.3); + +$panel_bg: darken($osd_bg_color, 4.7%); +$panel_fg: $osd_fg_color; //WM Buttons diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index d7baa9d..9c0150f 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -441,7 +441,7 @@ $_dot_color: $selected_bg_color; &.image-button { padding: 10px; } - &:hover { @include button(osd-hover); border-color: transparentize($osd_fg_color, 0.7)} + &:hover { @include button(osd-hover); background-color: $osd_bg_color; } &:active, &:checked { @include button(osd-active); } &:insensitive { @include button(osd-insensitive); } } @@ -970,9 +970,9 @@ GtkComboBox { background-color: $bg_color; .osd &, &.osd { padding: 7px; - border: none; - border-radius: 4px; - background-color: $osd_bg_color; + border: 1px solid transparentize(black, 0.4); + border-radius: 3px; + background-color: transparentize($osd_bg_color, 0.1); } } @@ -2291,15 +2291,15 @@ GtkScrolledWindow { .app-notification, .app-notification.frame { - @extend %osd; padding: 10px; - background-color: $osd_bg_color; + color: $dark_sidebar_fg; + background-color: $dark_sidebar_bg; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: darken($osd_bg_color, 10%); - + border-color: darken($dark_sidebar_bg, 10%); + .button { @include button(osd); &.flat { @@ -2570,11 +2570,11 @@ GtkInfoBar { &.background { // background-color needs to be set this way otherwise it gets drawn twice // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details. - background-color: $tooltip_bg; + background-color: $osd_bg_color; background-clip: padding-box; } - color: $tooltip_fg; + color: $osd_fg_color; border-radius: 2px; &.window-frame.csd { diff --git a/common/gtk-3.0/3.16/sass/_drawing.scss b/common/gtk-3.0/3.16/sass/_drawing.scss index 378e5d9..c073126 100644 --- a/common/gtk-3.0/3.16/sass/_drawing.scss +++ b/common/gtk-3.0/3.16/sass/_drawing.scss @@ -87,30 +87,30 @@ @else if $t==osd { // - // normal osd button + // normal osd entry // color: $osd_fg_color; - border-color: transparentize($osd_fg_color, 0.7); + border-color: transparentize(black, 0.6); background-color: transparent; - background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%)); + background-image: linear-gradient(to bottom, transparentize(black, 0.8)); } @else if $t==osd-focus { // - // active osd button + // active osd entry // - color: $selected_bg_color; + color: $osd_fg_color; border-color: $selected_bg_color; - background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%)); + background-image: linear-gradient(to bottom, transparentize(black, 0.8)); } @else if $t==osd-insensitive { // - // insensitive osd button + // insensitive osd entry // color: $osd_insensitive_fg_color; - border-color: transparentize($osd_fg_color, 0.8); - background-image: linear-gradient(to bottom, $osd_insensitive_bg_color); + border-color: transparentize(black, 0.6); + background-image: linear-gradient(to bottom, transparentize(black, 0.9)); } } @@ -237,19 +237,18 @@ // color: $osd_fg_color; outline-color: transparentize($osd_fg_color, 0.7); - border-color: transparentize($osd_fg_color, 0.7); - background-color: transparent; - background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%)); + border-color: transparentize(black, 0.55); + background-color: transparentize(black, 0.7); } @else if $t==osd-hover { // // active osd button // - color: $selected_bg_color; + color: $osd_fg_color; outline-color: transparentize($osd_fg_color, 0.7); border-color: $selected_bg_color; - background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%)); + background-color: transparentize(black, 0.7); } @else if $t==osd-active { @@ -259,7 +258,7 @@ color: $selected_fg_color; outline-color: transparentize($selected_fg_color, 0.7); border-color: $selected_bg_color; - background-image: linear-gradient(to bottom, $selected_bg_color); + background-color: $selected_bg_color; } @else if $t==osd-insensitive { @@ -267,8 +266,8 @@ // insensitive osd button // color: $osd_insensitive_fg_color; - border-color: transparentize($osd_fg_color, 0.8); - background-image: linear-gradient(to bottom, $osd_insensitive_bg_color); + border-color: transparentize(black, 0.55); + background-color: transparentize(black, 0.85); } @else if $t==suggested_destructive { diff --git a/common/gtk-3.0/3.16/sass/_lightdm.scss b/common/gtk-3.0/3.16/sass/_lightdm.scss index 9b14d09..9b2fa76 100644 --- a/common/gtk-3.0/3.16/sass/_lightdm.scss +++ b/common/gtk-3.0/3.16/sass/_lightdm.scss @@ -14,7 +14,7 @@ } .menubar .menuitem:insensitive { - color: darken($panel_fg, 20%); + color: transparentize($panel_fg, 0.5); GtkLabel { color: inherit; } } @@ -34,9 +34,11 @@ /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: transparentize($bg_color, 0.05); + background-color: if($variant == 'light', $bg_color, $base_color); border-top-left-radius: 2px; border-top-right-radius: 2px; + border: solid transparentize(black, 0.9); + border-width: 1px 1px 0 1px; } #content_frame .button { @@ -53,8 +55,11 @@ padding-bottom: 0px; border-style: none; background-color: $osd_bg_color; - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: solid transparentize(black, 0.9); + border-width: 0 1px 1px 1px; + box-shadow: inset 0 1px darken($osd_bg_color, 10%); } #buttonbox_frame .button{ @@ -76,7 +81,7 @@ /* the user's avatar box */ #user_image { padding: 3px; - border-radius: 3px; + border-radius: 2px; } /* the border around the user's avatar box */ @@ -84,54 +89,18 @@ /* the shutdown button */ #shutdown_button.button { - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: $destructive_color; - background-color: $destructive_color; - background-image: none; - background-clip: border-box; + @include button(suggested_destructive, $destructive_color); - &:hover { - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: lighten($destructive_color, 9%); - background-color: lighten($destructive_color, 9%); - background-image: none; - } - &:active, &:checked { - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: darken($destructive_color, 7%); - background-color: darken($destructive_color, 7%); - background-image: none; - } + &:hover { @include button(suggested_destructive, lighten($destructive_color, 10%)); } + &:active, &:checked { @include button(suggested_destructive, darken($destructive_color, 10%)); } } /* the restart button */ #restart_button.button { - $_restart_bg: #51CF74; + @include button(suggested_destructive, $suggested_color); - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: $_restart_bg; - background-color: $_restart_bg; - background-image: none; - background-clip: border-box; - - &:hover { - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: lighten($_restart_bg, 9%); - background-color: lighten($_restart_bg, 9%); - background-image: none; - } - &:active, &:checked { - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - border-color: darken($_restart_bg, 7%); - background-color: darken($_restart_bg, 7%); - background-image: none; - } + &:hover { @include button(suggested_destructive, lighten($suggested_color, 10%)); } + &:active, &:checked { @include button(suggested_destructive, darken($suggested_color, 10%)); } } /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ diff --git a/common/gtk-3.0/3.16/sass/_transparent_widgets.scss b/common/gtk-3.0/3.16/sass/_transparent_widgets.scss index f734c0c..16bbb1e 100644 --- a/common/gtk-3.0/3.16/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.16/sass/_transparent_widgets.scss @@ -36,7 +36,7 @@ MarlinViewWindow { background-color: transparent; color: $dark_sidebar_fg; - &.image { color: transparentize($dark_sidebar_fg, 0.4); } + &.image { color: transparentize($dark_sidebar_fg, 0.3); } &.cell:selected { background-color: $selected_bg_color; From e4c806b3d768fc3c1e048f5354c518d2abdbe876 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 13 Aug 2015 21:21:06 +0200 Subject: [PATCH 03/10] add cinnamon theme --- common/cinnamon/.nvmrc | 1 + common/cinnamon/README | 19 + common/cinnamon/cinnamon.css | 1226 ++++++++++++++ .../common-assets/menu/menu-separator.svg | 60 + .../misc/add-workspace-hover.svg | 117 ++ .../common-assets/misc/add-workspace.svg | 117 ++ common/cinnamon/common-assets/misc/bg.svg | 127 ++ .../common-assets/misc/button-box.svg | 99 ++ .../common-assets/misc/close-active.svg | 100 ++ .../common-assets/misc/close-hover.svg | 100 ++ common/cinnamon/common-assets/misc/close.svg | 100 ++ .../common-assets/misc/corner-ripple-ltr.svg | 125 ++ .../common-assets/misc/corner-ripple-rtl.svg | 75 + .../common-assets/misc/desklet-header.svg | 158 ++ .../cinnamon/common-assets/misc/desklet.svg | 152 ++ common/cinnamon/common-assets/misc/osd.svg | 127 ++ .../common-assets/misc/overview-hover.png | Bin 0 -> 838 bytes .../cinnamon/common-assets/misc/overview.png | Bin 0 -> 680 bytes .../common-assets/misc/trash-icon.svg | 97 ++ .../common-assets/panel/activities-active.svg | 158 ++ .../common-assets/panel/activities.svg | 158 ++ .../common-assets/panel/panel-bottom.svg | 75 + .../common-assets/panel/panel-top.svg | 75 + .../panel/window-list-active-bottom.svg | 142 ++ .../panel/window-list-active-top.svg | 142 ++ .../checkbox/checkbox-checked-focused.svg | 195 +++ .../dark-assets/checkbox/checkbox-checked.svg | 195 +++ .../checkbox/checkbox-unchecked-focused.svg | 141 ++ .../checkbox/checkbox-unchecked.svg | 141 ++ .../cinnamon/dark-assets/menu/menu-hover.svg | 97 ++ common/cinnamon/dark-assets/menu/menu.svg | 127 ++ .../dark-assets/menu/submenu-open.svg | 109 ++ common/cinnamon/dark-assets/menu/submenu.svg | 109 ++ .../misc/calendar-arrow-left-hover.svg | 169 ++ .../dark-assets/misc/calendar-arrow-left.svg | 169 ++ .../misc/calendar-arrow-right-hover.svg | 171 ++ .../dark-assets/misc/calendar-arrow-right.svg | 171 ++ common/cinnamon/dark-assets/misc/message.svg | 76 + common/cinnamon/dark-assets/misc/modal.svg | 143 ++ .../dark-assets/switch/switch-off.svg | 201 +++ .../cinnamon/dark-assets/switch/switch-on.svg | 220 +++ common/cinnamon/gulpfile.js | 18 + .../checkbox/checkbox-checked-focused.svg | 223 +++ .../checkbox/checkbox-checked.svg | 223 +++ .../checkbox/checkbox-unchecked-focused.svg | 141 ++ .../checkbox/checkbox-unchecked.svg | 141 ++ .../cinnamon/light-assets/menu/menu-hover.svg | 97 ++ common/cinnamon/light-assets/menu/menu.svg | 127 ++ .../light-assets/menu/submenu-open.svg | 109 ++ common/cinnamon/light-assets/menu/submenu.svg | 109 ++ .../misc/calendar-arrow-left-hover.svg | 169 ++ .../light-assets/misc/calendar-arrow-left.svg | 169 ++ .../misc/calendar-arrow-right-hover.svg | 171 ++ .../misc/calendar-arrow-right.svg | 171 ++ common/cinnamon/light-assets/misc/message.svg | 76 + common/cinnamon/light-assets/misc/modal.svg | 143 ++ .../light-assets/switch/switch-off.svg | 201 +++ .../light-assets/switch/switch-on.svg | 220 +++ common/cinnamon/package.json | 7 + common/cinnamon/sass/_colors.scss | 90 + common/cinnamon/sass/_common.scss | 1483 +++++++++++++++++ common/cinnamon/sass/_drawing.scss | 157 ++ common/cinnamon/sass/cinnamon.scss | 7 + 63 files changed, 10236 insertions(+) create mode 100644 common/cinnamon/.nvmrc create mode 100644 common/cinnamon/README create mode 100644 common/cinnamon/cinnamon.css create mode 100644 common/cinnamon/common-assets/menu/menu-separator.svg create mode 100644 common/cinnamon/common-assets/misc/add-workspace-hover.svg create mode 100644 common/cinnamon/common-assets/misc/add-workspace.svg create mode 100644 common/cinnamon/common-assets/misc/bg.svg create mode 100644 common/cinnamon/common-assets/misc/button-box.svg create mode 100644 common/cinnamon/common-assets/misc/close-active.svg create mode 100644 common/cinnamon/common-assets/misc/close-hover.svg create mode 100644 common/cinnamon/common-assets/misc/close.svg create mode 100644 common/cinnamon/common-assets/misc/corner-ripple-ltr.svg create mode 100644 common/cinnamon/common-assets/misc/corner-ripple-rtl.svg create mode 100644 common/cinnamon/common-assets/misc/desklet-header.svg create mode 100644 common/cinnamon/common-assets/misc/desklet.svg create mode 100644 common/cinnamon/common-assets/misc/osd.svg create mode 100644 common/cinnamon/common-assets/misc/overview-hover.png create mode 100644 common/cinnamon/common-assets/misc/overview.png create mode 100644 common/cinnamon/common-assets/misc/trash-icon.svg create mode 100644 common/cinnamon/common-assets/panel/activities-active.svg create mode 100644 common/cinnamon/common-assets/panel/activities.svg create mode 100644 common/cinnamon/common-assets/panel/panel-bottom.svg create mode 100644 common/cinnamon/common-assets/panel/panel-top.svg create mode 100644 common/cinnamon/common-assets/panel/window-list-active-bottom.svg create mode 100644 common/cinnamon/common-assets/panel/window-list-active-top.svg create mode 100644 common/cinnamon/dark-assets/checkbox/checkbox-checked-focused.svg create mode 100644 common/cinnamon/dark-assets/checkbox/checkbox-checked.svg create mode 100644 common/cinnamon/dark-assets/checkbox/checkbox-unchecked-focused.svg create mode 100644 common/cinnamon/dark-assets/checkbox/checkbox-unchecked.svg create mode 100644 common/cinnamon/dark-assets/menu/menu-hover.svg create mode 100644 common/cinnamon/dark-assets/menu/menu.svg create mode 100644 common/cinnamon/dark-assets/menu/submenu-open.svg create mode 100644 common/cinnamon/dark-assets/menu/submenu.svg create mode 100644 common/cinnamon/dark-assets/misc/calendar-arrow-left-hover.svg create mode 100644 common/cinnamon/dark-assets/misc/calendar-arrow-left.svg create mode 100644 common/cinnamon/dark-assets/misc/calendar-arrow-right-hover.svg create mode 100644 common/cinnamon/dark-assets/misc/calendar-arrow-right.svg create mode 100644 common/cinnamon/dark-assets/misc/message.svg create mode 100644 common/cinnamon/dark-assets/misc/modal.svg create mode 100644 common/cinnamon/dark-assets/switch/switch-off.svg create mode 100644 common/cinnamon/dark-assets/switch/switch-on.svg create mode 100644 common/cinnamon/gulpfile.js create mode 100644 common/cinnamon/light-assets/checkbox/checkbox-checked-focused.svg create mode 100644 common/cinnamon/light-assets/checkbox/checkbox-checked.svg create mode 100644 common/cinnamon/light-assets/checkbox/checkbox-unchecked-focused.svg create mode 100644 common/cinnamon/light-assets/checkbox/checkbox-unchecked.svg create mode 100644 common/cinnamon/light-assets/menu/menu-hover.svg create mode 100644 common/cinnamon/light-assets/menu/menu.svg create mode 100644 common/cinnamon/light-assets/menu/submenu-open.svg create mode 100644 common/cinnamon/light-assets/menu/submenu.svg create mode 100644 common/cinnamon/light-assets/misc/calendar-arrow-left-hover.svg create mode 100644 common/cinnamon/light-assets/misc/calendar-arrow-left.svg create mode 100644 common/cinnamon/light-assets/misc/calendar-arrow-right-hover.svg create mode 100644 common/cinnamon/light-assets/misc/calendar-arrow-right.svg create mode 100644 common/cinnamon/light-assets/misc/message.svg create mode 100644 common/cinnamon/light-assets/misc/modal.svg create mode 100644 common/cinnamon/light-assets/switch/switch-off.svg create mode 100644 common/cinnamon/light-assets/switch/switch-on.svg create mode 100644 common/cinnamon/package.json create mode 100644 common/cinnamon/sass/_colors.scss create mode 100644 common/cinnamon/sass/_common.scss create mode 100644 common/cinnamon/sass/_drawing.scss create mode 100644 common/cinnamon/sass/cinnamon.scss diff --git a/common/cinnamon/.nvmrc b/common/cinnamon/.nvmrc new file mode 100644 index 0000000..2bf5ad0 --- /dev/null +++ b/common/cinnamon/.nvmrc @@ -0,0 +1 @@ +stable diff --git a/common/cinnamon/README b/common/cinnamon/README new file mode 100644 index 0000000..f040030 --- /dev/null +++ b/common/cinnamon/README @@ -0,0 +1,19 @@ +This theme uses libsass/gulp to process the sass/*.scss. Never edit any of the .css files manually. + +How to edit this theme: + +1. Install `nodejs` and `npm` + +2. Install `gulp` + + sudo npm install --global gulp + +3. Execute the following from the directory containing `gulpfile.js` + + npm install + +4. Edit the sass/*.scss files + +5. Regenerate the .css files by executing from the directory containing `gulpfile.js` + + gulp diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css new file mode 100644 index 0000000..3e3b65b --- /dev/null +++ b/common/cinnamon/cinnamon.css @@ -0,0 +1,1226 @@ +@charset "UTF-8"; +stage { + font-family: Futura Bk bt, sans, Sans-Serif; + font-size: 9pt; + color: #5c616c; } + +.label-shadow { + color: transparent; } + +.popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, .sound-button { + min-height: 20px; + padding: 5px 32px; + transition-duration: 0; + border-radius: 2px; + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #5c616c; + background-color: #fbfbfc; + border: 1px solid #cfd6e6; } + .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus, .sound-button:focus { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #5c616c; + background-color: #fbfbfc; + border: 1px solid #5294E2; } + .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .sound-button:hover { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #5c616c; + background-color: #fbfbfc; + border: 1px solid #5294E2; } + .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .sound-button:hover:focus { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #5294E2; + background-color: #fbfbfc; + border: 1px solid #5294E2; } + .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active, .sound-button:active, .popup-menu #notification .notification-button:active:focus, .popup-menu #notification .notification-icon-button:active:focus, .sound-button:active:focus { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #ffffff; + background-color: #5294E2; + border: 1px solid #5294E2; } + .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive, .sound-button:insensitive { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: rgba(92, 97, 108, 0.55); + border: 1px solid rgba(207, 214, 230, 0.55); + background-color: rgba(251, 251, 252, 0.55); } + +.notification-button, .notification-icon-button, .modal-dialog-button-box .modal-dialog-button { + min-height: 20px; + padding: 5px 32px; + transition-duration: 0; + border-radius: 2px; + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + border: 1px solid rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } + .notification-button:hover, .notification-icon-button:hover, .modal-dialog-button-box .modal-dialog-button:hover { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + border: 1px solid #5294E2; + background-color: rgba(0, 0, 0, 0.3); } + .notification-button:focus, .notification-icon-button:focus, .modal-dialog-button-box .modal-dialog-button:focus { + color: #5294E2; } + .notification-button:active, .notification-icon-button:active, .modal-dialog-button-box .modal-dialog-button:active { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #ffffff; + border: 1px solid #5294E2; + background-color: #5294E2; } + .notification-button:insensitive, .notification-icon-button:insensitive, .modal-dialog-button-box .modal-dialog-button:insensitive { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #555a62; + border: 1px solid rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } + +.popup-menu #notification StEntry, #menu-search-entry { + padding: 7px; + caret-size: 1px; + selection-background-color: #5294E2; + selected-color: #ffffff; + transition-duration: 300ms; + border-radius: 20px; + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #5c616c; + background-color: #ffffff; + border: 1px solid #cfd6e6; } + .popup-menu #notification StEntry:focus, #menu-search-entry:focus, .popup-menu #notification StEntry:hover, #menu-search-entry:hover { + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #5c616c; + background-color: #ffffff; + border: 1px solid #5294E2; } + .popup-menu #notification StEntry:insensitive, #menu-search-entry:insensitive { + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: rgba(92, 97, 108, 0.55); + background-color: #fbfbfb; + border-color: 1px solid #e0e4ee; } + .popup-menu #notification StEntry StIcon.capslock-warning, #menu-search-entry StIcon.capslock-warning { + icon-size: 16px; + warning-color: #F27835; + padding: 0 4px; } + +.notification StEntry { + padding: 7px; + caret-size: 1px; + caret-color: #BAC3CF; + selection-background-color: #5294E2; + selected-color: #ffffff; + transition-duration: 300ms; + border-radius: 20px; + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + background-color: rgba(0, 0, 0, 0.2); + border: 1px solid rgba(0, 0, 0, 0.4); } + .notification StEntry:focus { + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + background-color: rgba(0, 0, 0, 0.2); + border: 1px solid #5294E2; } + .notification StEntry:insensitive { + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #555a62; + background-color: rgba(0, 0, 0, 0.1); + border-color: 1px solid rgba(0, 0, 0, 0.4); } + +StScrollView.vfade { + -st-vfade-offset: 0px; } + +StScrollView.hfade { + -st-hfade-offset: 0px; } + +StScrollBar { + padding: 8px; } + StScrollView StScrollBar { + min-width: 5px; + min-height: 5px; } + StScrollBar StBin#trough { + background-color: rgba(255, 255, 255, 0.1); + border-radius: 8px; } + StScrollBar StButton#vhandle, StScrollBar StButton#hhandle { + border-radius: 4px; + background-color: #b8babf; + border: 0px solid; + margin: 0px; } + StScrollBar StButton#vhandle:hover, StScrollBar StButton#hhandle:hover { + background-color: #c7c9cd; } + StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { + background-color: #5294E2; } + +.popup-slider-menu-item { + -slider-height: 4px; + -slider-background-color: #cfd6e6; + -slider-border-color: transparent; + -slider-active-background-color: #5294E2; + -slider-active-border-color: transparent; + -slider-border-width: 0; + -slider-handle-radius: 4px; + height: 18px; + min-width: 15em; + border: 0 solid transparent; + border-right-width: 1px; + border-left-width: 5px; + color: transparent; } + +.check-box CinnamonGenericContainer { + spacing: .2em; + min-height: 30px; + padding-top: 2px; } + +.check-box StLabel { + font-weight: normal; } + +.check-box StBin { + width: 16px; + height: 16px; + background-image: url("light-assets/checkbox/checkbox-unchecked.svg"); } + +.check-box:focus StBin { + background-image: url("light-assets/checkbox/checkbox-unchecked-focused.svg"); } + +.check-box:checked StBin { + background-image: url("light-assets/checkbox/checkbox-checked.svg"); } + +.check-box:focus:checked StBin { + background-image: url("light-assets/checkbox/checkbox-checked-focused.svg"); } + +.radiobutton CinnamonGenericContainer { + spacing: .2em; + height: 26px; + padding-top: 2px; } + +.radiobutton StLabel { + padding-top: 4px; + font-size: 0.9em; + box-shadow: none; } + +.radiobutton StBin { + width: 16px; + height: 16px; + background-image: url("light-assets/checkbox/checkbox-unchecked.svg"); } + +.radiobutton:focus StBin { + background-image: url("light-assets/checkbox/checkbox-unchecked-focused.svg"); } + +.radiobutton:checked StBin { + background-image: url("light-assets/checkbox/checkbox-checked.svg"); } + +.radiobutton:focus:checked StBin { + background-image: url("light-assets/checkbox/checkbox-checked-focused.svg"); } + +.toggle-switch { + width: 50px; + height: 20px; + background-size: contain; } + .toggle-switch-us, .toggle-switch-intl { + background-image: url("light-assets/switch/switch-off.svg"); } + .toggle-switch-us:checked, .toggle-switch-intl:checked { + background-image: url("light-assets/switch/switch-on.svg"); } + +.cinnamon-link { + color: #2679db; + text-decoration: underline; } + .cinnamon-link:hover { + color: #5294e2; } + +#Tooltip { + border-radius: l3px; + padding: 5px 12px; + background-color: rgba(42, 44, 51, 0.95); + color: #BAC3CF; + font-size: 1em; + font-weight: normal; + text-align: center; } + +.popup-menu { + color: white; + min-width: 200px; + color: #5c616c; + border-image: url("light-assets/menu/menu.svg") 9 9 9 9; } + .popup-menu .popup-sub-menu { + background-gradient-direction: none; + box-shadow: none; + border-image: url("light-assets/menu/submenu.svg") 9 9 9 9; } + .popup-menu .popup-sub-menu .popup-menu-item:ltr { + padding-right: 0em; } + .popup-menu .popup-sub-menu .popup-menu-item:rtl { + padding-left: 0em; } + .popup-menu .popup-sub-menu StScrollBar { + padding: 4px; } + .popup-menu .popup-sub-menu StScrollBar StBin#trough, .popup-menu .popup-sub-menu StScrollBar StBin#vhandle { + border-width: 0; } + .popup-menu .popup-sub-menu-menu-item:open { + background: none; + box-shadow: none; + border-image: url("light-assets/menu/submenu-open.svg") 9 9 9 9; } + .popup-menu .popup-menu-content { + padding: 1em 0em 1em 0em; } + .popup-menu .popup-menu-item { + padding: 0.4em 1.75em; + spacing: 1em; } + .popup-menu .popup-menu-item:active { + color: #5c616c; + background-color: transparent; + border-image: url("light-assets/menu/menu-hover.svg") 9 9 1 1; } + .popup-menu .popup-menu-item:insensitive { + color: rgba(92, 97, 108, 0.5); + background: none; } + .popup-menu .popup-inactive-menu-item { + color: #5c616c; } + .popup-menu .popup-inactive-menu-item:insensitive { + color: rgba(92, 97, 108, 0.55); } + .popup-menu-icon { + icon-size: 16px; } + +.popup-menu-boxpointer { + -arrow-border-radius: 3px; + -arrow-background-color: transparent; + -arrow-border-width: 1px; + -arrow-border-color: transparent; + -arrow-base: 0; + -arrow-rise: 0; } + +/*Don't know what this does*/ +.popup-combo-menu { + background-color: rgba(0, 0, 0, 0.4); + padding: 1em 0em; + color: red; + border: 1px solid rgba(0, 0, 0, 0.6); + border-radius: 3px; } + +.popup-combobox-item { + spacing: 1em; } + +.popup-separator-menu-item { + height: 2px; + margin: 10px 0px; + background-color: transparent; + border: none; + border-image: url("common-assets/menu-separator.svg") 1 1 1 1; } + +.popup-alternating-menu-item:alternate { + font-weight: normal; } + +.popup-device-menu-item { + spacing: .5em; } + +.popup-subtitle-menu-item { + font-weight: normal; } + +.nm-menu-item-icons { + spacing: .5em; } + +#panel { + font-weight: bold; + height: 2.1em; + min-height: 27px; } + #panelLeft { + spacing: 4px; } + #panelLeft:dnd { + background-gradient-direction: vertical; + background-gradient-start: rgba(255, 0, 0, 0.05); + background-gradient-end: rgba(255, 0, 0, 0.2); } + #panelLeft:ltr · { + padding-right: 4px; } + #panelLeft:rtl · { + padding-left: 4px; } + #panelRight:dnd { + background-gradient-direction: vertical; + background-gradient-start: rgba(0, 0, 255, 0.05); + background-gradient-end: rgba(0, 0, 255, 0.2); } + #panelRight:ltr · { + padding-left: 4px; + spacing: 0px; } + #panelRight:rtl · { + padding-right: 4px; + spacing: 0px; } + #panelCenter { + spacing: 4px; } + #panelCenter:dnd { + background-gradient-direction: vertical; + background-gradient-start: rgba(0, 255, 0, 0.05); + background-gradient-end: rgba(0, 255, 0, 0.2); } + +.panel-top, .panel-bottom { + color: #ffffff; + font-size: 1em; + padding: 0px; } + +.panel-top { + border-image: url("common-assets/panel/panel-top.svg") 1 1 1 1; } + +.panel-bottom { + border-image: url("common-assets/panel/panel-bottom.svg") 1 1 1 1; } + +.panel-status-button { + border-widht: 0; + -natural-hpadding: 3px; + -minimum-hpadding: 3px; + font-weight: bold; + color: white; + height: 22px; } + +.panel-button { + -natural-hpadding: 6px; + -minimum-hpadding: 2px; + font-weight: bold; + color: green; + transition-duration: 100; } + +.system-status-icon { + icon-size: 16px; + padding: 0 1px; } + +#overview { + spacing: 12px; } + +.window-caption { + background-color: rgba(42, 44, 51, 0.95); + border: 1px solid rgba(42, 44, 51, 0.95); + color: #BAC3CF; + spacing: 25px; + border-radius: 2px; + font-size: 9pt; + padding: 5px 8px; + -cinnamon-caption-spacing: 4px; } + .window-caption#selected { + background-color: #5294E2; + color: #ffffff; + border: 1px solid #5294E2; + spacing: 25px; } + +.expo-workspaces-name-entry, +.expo-workspaces-name-entry#selected { + spacing: 25px; + border-radius: 2px; + font-size: 9pt; + padding: 5px 8px; + -cinnamon-caption-spacing: 4px; + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + background-color: rgba(0, 0, 0, 0.2); + border: 1px solid rgba(0, 0, 0, 0.4); } + .expo-workspaces-name-entry:focus, + .expo-workspaces-name-entry#selected:focus { + border: 1px solid #5294E2; + background-color: #5294E2; + color: #ffffff; + font-style: italic; + transition-duration: 300; + selection-background-color: #ffffff; + selected-color: #5294E2; } + +.expo-workspace-thumbnail-frame { + border: 4px solid rgba(255, 255, 255, 0); + background-color: rgba(255, 255, 255, 0); + border-radius: 2px; } + .expo-workspace-thumbnail-frame#active { + border: 4px solid #5294E2; + background-color: black; + border-radius: 2px; } + +.expo-background { + background-color: #2a2c33; } + +.workspace-thumbnails { + spacing: 14px; } + .workspace-thumbnails-background, .workspace-thumbnails-background:rtl { + padding: 8px; } + +.workspace-add-button { + background-image: url("common-assets/misc/add-workspace.svg"); + height: 200px; + width: 35px; + transition-duration: 200; } + .workspace-add-button:hover { + background-image: url("common-assets/misc/add-workspace-hover.svg"); + transition-duration: 200; } + +.workspace-overview-background-shade { + background-color: rgba(0, 0, 0, 0.5); } + +.workspace-close-button, +.window-close { + background-image: url("common-assets/misc/close.svg"); + background-size: 26px; + height: 26px; + width: 26px; + -cinnamon-close-overlap: 10px; } + .workspace-close-button:hover, + .window-close:hover { + background-image: url("common-assets/misc/close-hover.svg"); + background-size: 26px; + height: 26px; + width: 26px; } + .workspace-close-button:active, + .window-close:active { + background-image: url("common-assets/misc/close-active.svg"); + background-size: 26px; + height: 26px; + width: 26px; } + +.window-close-area { + background-image: url("common-assets/misc/trash-icon.svg"); + height: 120px; + width: 400px; } + +.about-content { + width: 550px; + height: 250px; + spacing: 8px; + padding-bottom: 10px; } + +.about-title { + font-size: 2em; + font-weight: bold; } + +.about-uuid { + font-size: 10px; + color: #888; } + +.about-icon { + padding-right: 20px; + padding-bottom: 14px; } + +.about-scrollBox { + border: 1px solid #dbdfe3; + border-radius: 2px; + background-color: #ffffff; + padding: 4px; + padding-right: 0; + border-radius: 0; } + .about-scrollBox-innerBox { + padding: 1.2em; + spacing: 1.2em; } + +.about-description { + padding-top: 4px; + padding-bottom: 16px; } + +.about-version { + padding-left: 7px; + font-size: 10px; + color: #888; } + +.calendar { + padding: 0.4em 1.75em; + spacing-rows: 0px; + spacing-columns: 0px; } + +.calendar-month-label { + color: #5c616c; + font-weight: bold; + padding: 8px 0; } + +.calendar-change-month-back, +.calendar-change-month-forward { + width: 16px; + height: 16px; } + +.calendar-change-month-back { + background-image: url("light-assets/misc/calendar-arrow-left.svg"); } + .calendar-change-month-back:focus, .calendar-change-month-back:hover { + background-image: url("light-assets/misc/calendar-arrow-left-hover.svg"); } + .calendar-change-month-back:active { + background-image: url("light-assets/misc/calendar-arrow-left.svg"); } + .calendar-change-month-back:rtl { + background-image: url("light-assets/misc/calendar-arrow-right.svg"); } + .calendar-change-month-back:rtl:focus, .calendar-change-month-back:rtl:hover { + background-image: url("light-assets/misc/calendar-arrow-right-hover.svg"); } + .calendar-change-month-back:rtl:active { + background-image: url("light-assets/misc/calendar-arrow-right.svg"); } + +.calendar-change-month-forward { + background-image: url("light-assets/misc/calendar-arrow-right.svg"); } + .calendar-change-month-forward:focus, .calendar-change-month-forward:hover { + background-image: url("light-assets/misc/calendar-arrow-right-hover.svg"); } + .calendar-change-month-forward:active { + background-image: url("light-assets/misc/calendar-arrow-right.svg"); } + .calendar-change-month-forward:rtl { + background-image: url("light-assets/misc/calendar-arrow-left.svg"); } + .calendar-change-month-forward:rtl:focus, .calendar-change-month-forward:rtl:hover { + background-image: url("light-assets/misc/calendar-arrow-left-hover.svg"); } + .calendar-change-month-forward:rtl:active { + background-image: url("light-assets/misc/calendar-arrow-left.svg"); } + +.datemenu-date-label { + padding: 0.4em 1.75em; + font-weight: bold; + text-align: center; + color: #5c616c; + border-radius: 2px; } + +.calendar-day-base { + font-size: 80%; + text-align: center; + width: 25px; + height: 25px; + padding: 0.1em; + margin: 2px; + border-radius: 12.5px; } + +.calendar-day-heading { + color: rgba(92, 97, 108, 0.85); + margin-top: 1em; + font-size: 70%; } + +.calendar-day { + border-width: 0; + color: rgba(92, 97, 108, 0.8); } + +.calendar-day-top { + border-top-width: 0; } + +.calendar-day-left { + border-left-width: 0; } + +.calendar-nonwork-day { + color: #5c616c; + background-color: transparent; + font-weight: bold; } + +.calendar-today, +.calendar-today:active, +.calendar-today:focus, +.calendar-today:hover { + font-weight: bold; + color: #ffffff; + background-color: #5294E2; + border-width: 0; } + +.calendar-other-month-day { + color: rgba(92, 97, 108, 0.3); + opacity: 1; } + +#notification { + border-radius: 3px; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + padding: 13px; + spacing-rows: 10px; + spacing-columns: 10px; + margin-from-right-edge-of-screen: 20px; + width: 34em; + color: #BAC3CF; } + .popup-menu #notification { + color: #5c616c; + border-image: url("light-assets/misc/message.svg") 9 9 9 9; } + #notification.multi-line-notification { + padding-bottom: 13px; + color: #BAC3CF; } + #notification-scrollview { + max-height: 10em; } + #notification-scrollview > .top-shadow, #notification-scrollview > .bottom-shadow { + height: 1em; } + #notification-scrollview:ltr > StScrollBar { + padding-left: 6px; } + #notification-scrollview:rtl > StScrollBar { + padding-right: 6px; } + #notification-body { + spacing: 5px; } + #notification-actions { + spacing: 10px; } + +.notification-with-image { + min-height: 159px; + color: #BAC3CF; } + +.notification-icon-button > StIcon { + icon-size: 36px; } + +#altTabPopup { + padding: 8px; + spacing: 16px; } + +.switcher-list { + color: #BAC3CF; + background: none; + border: none; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + border-radius: 3px; + padding: 20px; } + .switcher-list-item-container { + spacing: 8px; } + .switcher-list .item-box { + padding: 8px; + border-radius: 2px; } + .switcher-list .item-box:outlined { + padding: 8px; + border: 1px solid #5294E2; } + .switcher-list .item-box:selected { + color: #ffffff; + background-color: #5294E2; + border: 1px solid #5294E2; } + .switcher-list .thumbnail { + width: 256px; } + .switcher-list .thumbnail-box { + padding: 2px; + spacing: 4px; } + .switcher-list .separator { + width: 1px; + background: rgba(255, 255, 255, 0.2); } + +.switcher-arrow { + border-color: transparent; + color: #BAC3CF; } + .switcher-arrow:highlighted { + border-color: transparent; + color: #ffffff; } + +.thumbnail-scroll-gradient-left { + background-color: transparent; + border-radius: 24px; + border-radius-topright: 0px; + border-radius-bottomright: 0px; + width: 60px; } + +.thumbnail-scroll-gradient-right { + background-color: transparent; + border-radius: 24px; + border-radius-topleft: 0px; + border-radius-bottomleft: 0px; + width: 60px; } + +.ripple-box { + width: 52px; + height: 52px; + background-image: url("common-assets/misc/corner-ripple-ltr.svg"); + background-size: contain; } + .ripple-box:rtl { + background-image: url("common-assets/misc/corner-ripple-rtl.svg"); } + +.lightbox { + background-color: rgba(0, 0, 0, 0.4); } + +.flashspot { + background-color: white; } + +.modal-dialog { + color: #5c616c; + background-color: rgba(245, 246, 247, 0); + border: none; + border-image: url("light-assets/misc/modal.svg") 9 9 9 67; + padding: 0 5px 6px 5px; } + .modal-dialog > StBoxLayout:first-child { + padding: 20px 10px 10px 10px; } + .modal-dialog-button-box { + spacing: 0; + margin: 0px; + padding: 14px 10px; + background: none; + border: none; + border-image: url("common-assets/misc/button-box.svg") 9 9 9 9; } + .modal-dialog-button-box .modal-dialog-button { + padding-top: 0; + padding-bottom: 0; + height: 30px; } + +.run-dialog { + padding: 0px 15px 10px 15px; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; } + .run-dialog > * { + padding: 0; } + .run-dialog-label { + font-size: 0; + font-weight: bold; + color: #BAC3CF; + padding-bottom: 0; } + .run-dialog-error-label { + color: #FC4138; } + .run-dialog-error-box { + padding-top: 15px; + spacing: 5px; } + .run-dialog-completion-box { + padding-left: 15px; + font-size: 10px; } + .run-dialog-entry { + width: 21em; + padding: 7px; + border-radius: 20px; + caret-color: #BAC3CF; + selected-color: #ffffff; + selection-background-color: #5294E2; + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + background-color: rgba(0, 0, 0, 0.2); + border: 1px solid rgba(0, 0, 0, 0.4); } + .run-dialog-entry:focus { + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + background-color: rgba(0, 0, 0, 0.2); + border: 1px solid #5294E2; } + .run-dialog .modal-dialog-button-box { + border: none; + box-shadow: none; + background: none; + background-gradient-direction: none; } + +/* CinnamonMountOperation Dialogs */ +.cinnamon-mount-operation-icon { + icon-size: 48px; } + +.mount-password-reask { + color: #F27835; } + +.show-processes-dialog, +.mount-question-dialog { + spacing: 24px; } + .show-processes-dialog-subject, + .mount-question-dialog-subject { + padding-top: 10px; + padding-left: 17px; + padding-bottom: 6px; } + .show-processes-dialog-subject:rtl, + .mount-question-dialog-subject:rtl { + padding-left: 0px; + padding-right: 17px; } + .show-processes-dialog-description, + .mount-question-dialog-description { + padding-left: 17px; + width: 28em; } + .show-processes-dialog-description:rtl, + .mount-question-dialog-description:rtl { + padding-right: 17px; } + +.show-processes-dialog-app-list { + max-height: 200px; + padding-top: 24px; + padding-left: 49px; + padding-right: 32px; } + .show-processes-dialog-app-list:rtl { + padding-right: 49px; + padding-left: 32px; } + .show-processes-dialog-app-list-item { + color: #ccc; } + .show-processes-dialog-app-list-item:hover { + color: white; } + .show-processes-dialog-app-list-item:ltr { + padding-right: 1em; } + .show-processes-dialog-app-list-item:rtl { + padding-left: 1em; } + .show-processes-dialog-app-list-item-icon:ltr { + padding-right: 17px; } + .show-processes-dialog-app-list-item-icon:rtl { + padding-left: 17px; } + .show-processes-dialog-app-list-item-name { + font-size: 1.1em; } + +.magnifier-zoom-region { + border: 2px solid maroon; } + .magnifier-zoom-region .full-screen { + border-width: 0px; } + +#keyboard { + background-color: rgba(42, 44, 51, 0.95); + border-width: 0; + border-top-width: 1px; + border-color: rgba(0, 0, 0, 0.4); } + +.keyboard-layout { + spacing: 10px; + padding: 10px; } + +.keyboard-row { + spacing: 15px; } + +.keyboard-key { + min-height: 2em; + min-width: 2em; + font-size: 14pt; + font-weight: bold; + border-radius: 3px; + box-shadow: none; + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + border: 1px solid rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.3); } + .keyboard-key:hover { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #BAC3CF; + border: 1px solid #5294E2; + background-color: rgba(0, 0, 0, 0.3); } + .keyboard-key:active, .keyboard-key:checked { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #ffffff; + border: 1px solid #5294E2; + background-color: #5294E2; } + .keyboard-key:grayed { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #555a62; + border: 1px solid rgba(0, 0, 0, 0.45); + background-color: rgba(0, 0, 0, 0.15); } + +.keyboard-subkeys { + color: #BAC3CF; + padding: 5px; + -arrow-border-radius: 2px; + -arrow-background-color: rgba(42, 44, 51, 0.95); + -arrow-border-width: 1px; + -arrow-border-color: rgba(0, 0, 0, 0.4); + -arrow-base: 20px; + -arrow-rise: 10px; + -boxpointer-gap: 5px; } + +.menu-favorites-box { + margin: auto; + padding: 10px; + transition-duration: 300; + background-color: #F5F6F7; + border: 1px solid #dbdfe3; } + +.menu-favorites-button { + padding: 10px; + border: 1px solid transparent; } + .menu-favorites-button:hover { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #5c616c; + background-color: #fbfbfc; + border: 1px solid #5294E2; } + +.menu-places-box { + margin: auto; + padding: 10px; + border: 0px solid red; } + +.menu-places-button { + padding: 10px; } + +.menu-categories-box { + padding: 10px 30px 10px 30px; } + +.menu-applications-inner-box, +.menu-applications-outer-box { + padding: 10px 10px 0 10px; } + +.menu-application-button { + padding: 7px; + border: 1px solid transparent; } + .menu-application-button:highlighted { + font-weight: bold; } + .menu-application-button-selected { + padding: 7px; + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #5c616c; + background-color: #fbfbfc; + border: 1px solid #5294E2; } + .menu-application-button-selected:highlighted { + font-weight: bold; } + .menu-application-button-label:ltr { + padding-left: 5px; } + .menu-application-button-label:rtl { + padding-right: 5px; } + +.menu-category-button { + padding: 7px; + border: 1px solid transparent; } + .menu-category-button-selected { + padding: 7px; + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #5c616c; + background-color: #fbfbfc; + border: 1px solid #5294E2; } + .menu-category-button-hover { + background-color: red; + border-radius: 2px; } + .menu-category-button-greyed { + padding: 7px; + color: rgba(92, 97, 108, 0.55); + border: 1px solid transparent; } + .menu-category-button-label:ltr { + padding-left: 5px; } + .menu-category-button-label:rtl { + padding-right: 5px; } + +.menu-selected-app-box { + padding-right: 30px; + padding-left: 28px; + text-align: right; + height: 30px; } + .menu-selected-app-box:rtl { + padding-top: 10px; + height: 30px; } + +.menu-selected-app-title { + font-weight: bold; } + +.menu-selected-app-description { + max-width: 150px; } + +.menu-search-box:ltr { + padding-left: 30px; } + +.menu-search-box-rtl { + padding-right: 30px; } + +#menu-search-entry { + width: 250px; + height: 15px; + font-weight: normal; + caret-color: #5c616c; } + +.menu-search-entry-icon { + icon-size: 1em; + color: #5c616c; } + +/* Context menu (at the moment only for favorites) */ +.info-osd { + text-align: center; + font-weight: bold; + spacing: 1em; + padding: 16px; + color: #ffffff; + border-image: url("common-assets/misc/osd.svg") 9 9 9 9; } + +.osd-window { + text-align: center; + font-weight: bold; + spacing: 1em; + padding: 20px; + margin: 32px; + min-width: 64px; + min-height: 64px; + color: #ffffff; + background: none; + border: none; + border-radius: 5px; + border-image: url("common-assets/misc/osd.svg") 9 9 9 9; } + .osd-window .osd-monitor-label { + font-size: 3em; } + .osd-window .level { + padding: 0; + height: 4px; + background-color: rgba(0, 0, 0, 0.5); + border-radius: 2px; + color: #5294E2; } + +.window-list-box { + spacing: 6px; + padding-left: 10px; } + .panel-bottom .window-list-box { + padding-top: 1px; } + .panel-top .window-list-box { + padding-bottom: 1px; } + +.window-list-item-label { + font-weight: bold; + width: 15em; + min-width: 5px; } + +.window-list-item-box { + font-weight: bold; + background-image: none; + padding-left: 8px; + padding-right: 8px; + transition-duration: 100; + color: rgba(255, 255, 255, 0.6); } + .window-list-item-box:hover { + color: #ffffff; } + .window-list-item-box:active, + .window-list-item-box:checked, + .window-list-item-box:focus { + color: #ffffff; } + .panel-bottom .window-list-item-box:active, + .panel-bottom .window-list-item-box:checked, + .panel-bottom .window-list-item-box:focus { + border-image: url("common-assets/panel/window-list-active-bottom.svg") 3 3 1 3; } + .panel-top .window-list-item-box:active, + .panel-top .window-list-item-box:checked, + .panel-top .window-list-item-box:focus { + border-image: url("common-assets/panel/window-list-active-top.svg") 3 3 3 1; } + +.window-list-item-demands-attention { + background-gradient-start: #F27835; + background-gradient-end: #F27835; } + +.sound-button { + width: 22px; + height: 13px; + padding: 8px; } + .sound-button-container { + padding-right: 3px; + padding-left: 3px; } + .sound-button StIcon { + icon-size: 1.4em; } + +.sound-track-infos { + padding: 5px; } + +.sound-track-info { + padding-top: 2px; + padding-bottom: 2px; } + .sound-track-info StIcon { + icon-size: 16px; } + .sound-track-info StLabel { + padding-left: 5px; + padding-right: 5px; } + +.sound-track-box { + padding-left: 15px; + padding-right: 15px; + max-width: 220px; } + +.sound-seek-box { + padding-left: 15px; } + .sound-seek-box StLabel { + padding-top: 2px; } + .sound-seek-box StIcon { + icon-size: 16px; } + +.sound-seek-slider { + width: 140px; } + +.sound-volume-menu-item { + padding: 0.4em 1.75em; } + .sound-volume-menu-item StIcon { + icon-size: 1.14em; + padding-left: 8px; + padding-right: 8px; } + +.sound-playback-control { + padding: 5px 10px 10px 10px; } + +#workspaceSwitcher { + spacing: 0px; + padding: 3px; } + +.workspace-button { + width: 20px; + height: 10px; + color: #ffffff; + padding: 3px; + padding-top: 4px; + transition-duration: 300; } + .workspace-button:outlined, .workspace-button:outlined:hover { + color: #5294E2; } + .workspace-button:hover { + color: rgba(82, 148, 226, 0.5); } + +#panel-launchers-box { + padding-left: 7px; } + +.panel-launcher { + margin: 1px; + padding: 1px; + transition-duration: 200; } + .panel-launcher:hover { + background-gradient-direction: none; + border: 0px solid #5294E2; } + .panel-bottom .panel-launcher:hover { + border-bottom-width: 1px; } + .panel-top .panel-launcher:hover { + border-top-width: 1px; } + +#overview-corner { + background-image: url("common-assets/misc/overview.png"); } + #overview-corner:hover { + background-image: url("common-assets/misc/overview-hover.png"); } + +.applet-separator { + padding: 1px 4px; } + +.applet-separator-line { + width: 1px; + background: rgba(255, 255, 255, 0.12); } + +.applet-box { + padding-left: 3px; + padding-right: 3px; + color: #ffffff; + text-shadow: none; + transition-duration: 100; } + .applet-box:hover { + color: #ffffff; + background-color: #5294E2; } + +.applet-label { + font-weight: bold; + color: #ffffff; } + .applet-label:hover, .applet-box:hover > .applet-label { + color: #ffffff; + text-shadow: none; } + +.applet-icon { + color: #ffffff; + icon-size: 22px; } + .applet-icon:hover, .applet-box:hover > .applet-icon { + color: #ffffff; + text-shadow: none; } + +.user-icon { + width: 32px; + height: 32px; + background-color: transparent; + border: none; + border-radius: 0; } + +.user-label { + color: #5c616c; + font-size: 1em; + font-weight: bold; + margin: 0px; } + +.desklet { + color: #BAC3CF; } + .desklet-with-borders { + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + color: #BAC3CF; + padding: 12px; + padding-bottom: 16px; } + .desklet-with-borders-and-header { + border-image: url("common-assets/misc/desklet.svg") 9 9 9 9; + color: #BAC3CF; + border-radius: 0; + border-radius-topleft: 0; + border-radius-topright: 0; + padding: 12px; + padding-bottom: 17px; } + .desklet-header { + border-image: url("common-assets/misc/desklet-header.svg") 9 9 9 9; + color: #BAC3CF; + font-size: 1em; + padding: 12px; + padding-bottom: 6px; } + .desklet-drag-placeholder { + border: 2px solid #5294E2; + background-color: rgba(82, 148, 226, 0.3); } + +.photoframe-box { + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + color: #BAC3CF; + padding: 12px; + padding-bottom: 16px; } + +/*FIXME*/ +.workspace-osd { + /*color: red;*/ + text-shadow: black 5px 5px 5px; + font-weight: bold; + font-size: 48pt; } + +.notification-applet-padding { + padding: 0.5em 1em; } + +.notification-applet-container { + max-height: 100px; } + +.tile-preview, .tile-preview.snap, +.tile-hud, .tile-hud.snap { + background-color: rgba(82, 148, 226, 0.3); + border: 1px solid #5294E2; } + +.xkcd-box { + padding: 6px; + border: 0px; + background-color: transparent; + border-radius: 0px; } diff --git a/common/cinnamon/common-assets/menu/menu-separator.svg b/common/cinnamon/common-assets/menu/menu-separator.svg new file mode 100644 index 0000000..4962ebc --- /dev/null +++ b/common/cinnamon/common-assets/menu/menu-separator.svg @@ -0,0 +1,60 @@ + + + + + + + + + + image/svg+xml + + + + + + + diff --git a/common/cinnamon/common-assets/misc/add-workspace-hover.svg b/common/cinnamon/common-assets/misc/add-workspace-hover.svg new file mode 100644 index 0000000..0cb3f8a --- /dev/null +++ b/common/cinnamon/common-assets/misc/add-workspace-hover.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/common/cinnamon/common-assets/misc/add-workspace.svg b/common/cinnamon/common-assets/misc/add-workspace.svg new file mode 100644 index 0000000..d7ce9d5 --- /dev/null +++ b/common/cinnamon/common-assets/misc/add-workspace.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/common/cinnamon/common-assets/misc/bg.svg b/common/cinnamon/common-assets/misc/bg.svg new file mode 100644 index 0000000..cf27958 --- /dev/null +++ b/common/cinnamon/common-assets/misc/bg.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/common-assets/misc/button-box.svg b/common/cinnamon/common-assets/misc/button-box.svg new file mode 100644 index 0000000..7435084 --- /dev/null +++ b/common/cinnamon/common-assets/misc/button-box.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/cinnamon/common-assets/misc/close-active.svg b/common/cinnamon/common-assets/misc/close-active.svg new file mode 100644 index 0000000..95822bf --- /dev/null +++ b/common/cinnamon/common-assets/misc/close-active.svg @@ -0,0 +1,100 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/common/cinnamon/common-assets/misc/close-hover.svg b/common/cinnamon/common-assets/misc/close-hover.svg new file mode 100644 index 0000000..7b52140 --- /dev/null +++ b/common/cinnamon/common-assets/misc/close-hover.svg @@ -0,0 +1,100 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/common/cinnamon/common-assets/misc/close.svg b/common/cinnamon/common-assets/misc/close.svg new file mode 100644 index 0000000..e221a33 --- /dev/null +++ b/common/cinnamon/common-assets/misc/close.svg @@ -0,0 +1,100 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/common/cinnamon/common-assets/misc/corner-ripple-ltr.svg b/common/cinnamon/common-assets/misc/corner-ripple-ltr.svg new file mode 100644 index 0000000..357a544 --- /dev/null +++ b/common/cinnamon/common-assets/misc/corner-ripple-ltr.svg @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/common/cinnamon/common-assets/misc/corner-ripple-rtl.svg b/common/cinnamon/common-assets/misc/corner-ripple-rtl.svg new file mode 100644 index 0000000..57176d2 --- /dev/null +++ b/common/cinnamon/common-assets/misc/corner-ripple-rtl.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/common/cinnamon/common-assets/misc/desklet-header.svg b/common/cinnamon/common-assets/misc/desklet-header.svg new file mode 100644 index 0000000..fd6b6df --- /dev/null +++ b/common/cinnamon/common-assets/misc/desklet-header.svg @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/common-assets/misc/desklet.svg b/common/cinnamon/common-assets/misc/desklet.svg new file mode 100644 index 0000000..8445c61 --- /dev/null +++ b/common/cinnamon/common-assets/misc/desklet.svg @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/common-assets/misc/osd.svg b/common/cinnamon/common-assets/misc/osd.svg new file mode 100644 index 0000000..e7a4202 --- /dev/null +++ b/common/cinnamon/common-assets/misc/osd.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/common-assets/misc/overview-hover.png b/common/cinnamon/common-assets/misc/overview-hover.png new file mode 100644 index 0000000000000000000000000000000000000000..75673f9cf4d11cc891275cbcb5fc775db9585540 GIT binary patch literal 838 zcmV-M1G)T(P)kdg0009GNkl1!KD9DQ@_rPbw?9N7*sw#Z576(BYZ3DEzb{X_e)6zI27Qi4@NLTggv_=u%gc6IKq z_MDkkn?VhNLVmQbWvk!4Q-E9+tqwIZ;jQ&2E4P!K4{ zVmm2%q@W83^_SfE%JoPU#PVW+Td|Lms^%XH9UnTZV>$b6d z{;iU34gsM(fa~AKN6w(yeBwPF_MaV`T-4G#6|dp!-S{$2pZ|Q=%Vnpz|5@{Ca6S00 zlz1sJXa`i!JTylYZ!b%K?7q9$^qax-syC|M=I)D^N5_rH#`N;-Pu(o__C}S^1P6r% z*C$O!_Ow)PU-d_WouD0qS|zP`TY-r>$~^YT2l0me>;5hrW~9P=&pB+Y+{Wqsx>1SGJUMB~@W z>Dr(%@xn4ps(4lo8$o@ZkfAjy#g-&i?2R`@oyh|q*}}szNcyIcR;ZMdUWH*PF*&Ss zZN4?PvVi6mvE~L-wRk<)2wQXH5CwhZHWD!KbIZ5JreuJVm-AZYihvH8&lBRn&8q26 zs_Am|Ixp&b5n5Dy@FGCRX3>$w45I$si?j*_{L_oH6w%#Px`rnIxA=%Z0mD;*r^|!p Q1ONa407*qoM6N<$f{;O?8~^|S literal 0 HcmV?d00001 diff --git a/common/cinnamon/common-assets/misc/overview.png b/common/cinnamon/common-assets/misc/overview.png new file mode 100644 index 0000000000000000000000000000000000000000..9eb4f87f4e8e2b95cb3ae488e84da3d63d1786ed GIT binary patch literal 680 zcmV;Z0$2TsP)kdg00002VoOIv0RM-N z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U%BC88MnF!IrGCBwm9)u_fl)|8*yQeM^6m$^r64|vV z3`vkcNr{9G7J`vMnZim6VY%*Zx;s0&JI-`zYgVOmhkZ`p_Z^=1dEe)GKPaJu{{h0T zyNHO0fQ^NPjqv*gY<94){zV`lb$k2Uf~Q@9+-l<8hxyJ#jr5`=-0o`A3*%NZ)IZ+*HH*RyO0Q4Yaj-SHFD97pssQ;?B{Jj#yThZ--;`ZmBH3X{6TcLhClVGN)8+2eH}DXOOW7= z=5IsRtH-?@rJgzt_jMTK$ziIHi--1?KrL_BSR06vB*7NO!=x54(svg~5+g=@AiA+u z-hf(6AUmjJ5N!<7=zw_Kt@@1A;!n0oVPoSFZ9sMuEm8n%M*X3|nt~&Dnib!6?3%C8 z^I(lXv>9cO?*&+xbF+%p)Ajrqz7v(xr%ra}QXfBG2v63X^WhzB>giInxmnC&7X(K$ zWevfR^DSrcnfwN_`+#Y_oVY)KD|Dz<_PYGudY9+@%%!pAb+$40&w&uPC)cXueyyw; z`Rn4-iR*Jq2{{o~Dh{f_`1;h;)z>R=bn;Fcg`$DF(eU9x!p07j6_}Y)rCbu@F&kA!CyxOMZ8Z_FEHjHVKl}m(9?n#zS$LZO O0000 + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/common/cinnamon/common-assets/panel/activities-active.svg b/common/cinnamon/common-assets/panel/activities-active.svg new file mode 100644 index 0000000..6986f5c --- /dev/null +++ b/common/cinnamon/common-assets/panel/activities-active.svg @@ -0,0 +1,158 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/cinnamon/common-assets/panel/activities.svg b/common/cinnamon/common-assets/panel/activities.svg new file mode 100644 index 0000000..b4a4b0d --- /dev/null +++ b/common/cinnamon/common-assets/panel/activities.svg @@ -0,0 +1,158 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/cinnamon/common-assets/panel/panel-bottom.svg b/common/cinnamon/common-assets/panel/panel-bottom.svg new file mode 100644 index 0000000..2e83f1d --- /dev/null +++ b/common/cinnamon/common-assets/panel/panel-bottom.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/cinnamon/common-assets/panel/panel-top.svg b/common/cinnamon/common-assets/panel/panel-top.svg new file mode 100644 index 0000000..106ffac --- /dev/null +++ b/common/cinnamon/common-assets/panel/panel-top.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/cinnamon/common-assets/panel/window-list-active-bottom.svg b/common/cinnamon/common-assets/panel/window-list-active-bottom.svg new file mode 100644 index 0000000..ce7d5d7 --- /dev/null +++ b/common/cinnamon/common-assets/panel/window-list-active-bottom.svg @@ -0,0 +1,142 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/common/cinnamon/common-assets/panel/window-list-active-top.svg b/common/cinnamon/common-assets/panel/window-list-active-top.svg new file mode 100644 index 0000000..d2b8f15 --- /dev/null +++ b/common/cinnamon/common-assets/panel/window-list-active-top.svg @@ -0,0 +1,142 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/common/cinnamon/dark-assets/checkbox/checkbox-checked-focused.svg b/common/cinnamon/dark-assets/checkbox/checkbox-checked-focused.svg new file mode 100644 index 0000000..d1b59ee --- /dev/null +++ b/common/cinnamon/dark-assets/checkbox/checkbox-checked-focused.svg @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/dark-assets/checkbox/checkbox-checked.svg b/common/cinnamon/dark-assets/checkbox/checkbox-checked.svg new file mode 100644 index 0000000..fee35ec --- /dev/null +++ b/common/cinnamon/dark-assets/checkbox/checkbox-checked.svg @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/dark-assets/checkbox/checkbox-unchecked-focused.svg b/common/cinnamon/dark-assets/checkbox/checkbox-unchecked-focused.svg new file mode 100644 index 0000000..513b1ad --- /dev/null +++ b/common/cinnamon/dark-assets/checkbox/checkbox-unchecked-focused.svg @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/dark-assets/checkbox/checkbox-unchecked.svg b/common/cinnamon/dark-assets/checkbox/checkbox-unchecked.svg new file mode 100644 index 0000000..1a34771 --- /dev/null +++ b/common/cinnamon/dark-assets/checkbox/checkbox-unchecked.svg @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/dark-assets/menu/menu-hover.svg b/common/cinnamon/dark-assets/menu/menu-hover.svg new file mode 100644 index 0000000..a023a8e --- /dev/null +++ b/common/cinnamon/dark-assets/menu/menu-hover.svg @@ -0,0 +1,97 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/common/cinnamon/dark-assets/menu/menu.svg b/common/cinnamon/dark-assets/menu/menu.svg new file mode 100644 index 0000000..d6a9fea --- /dev/null +++ b/common/cinnamon/dark-assets/menu/menu.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/dark-assets/menu/submenu-open.svg b/common/cinnamon/dark-assets/menu/submenu-open.svg new file mode 100644 index 0000000..bd817b0 --- /dev/null +++ b/common/cinnamon/dark-assets/menu/submenu-open.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/common/cinnamon/dark-assets/menu/submenu.svg b/common/cinnamon/dark-assets/menu/submenu.svg new file mode 100644 index 0000000..ebab963 --- /dev/null +++ b/common/cinnamon/dark-assets/menu/submenu.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/common/cinnamon/dark-assets/misc/calendar-arrow-left-hover.svg b/common/cinnamon/dark-assets/misc/calendar-arrow-left-hover.svg new file mode 100644 index 0000000..7f292f8 --- /dev/null +++ b/common/cinnamon/dark-assets/misc/calendar-arrow-left-hover.svg @@ -0,0 +1,169 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/common/cinnamon/dark-assets/misc/calendar-arrow-left.svg b/common/cinnamon/dark-assets/misc/calendar-arrow-left.svg new file mode 100644 index 0000000..5602eff --- /dev/null +++ b/common/cinnamon/dark-assets/misc/calendar-arrow-left.svg @@ -0,0 +1,169 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/common/cinnamon/dark-assets/misc/calendar-arrow-right-hover.svg b/common/cinnamon/dark-assets/misc/calendar-arrow-right-hover.svg new file mode 100644 index 0000000..beadead --- /dev/null +++ b/common/cinnamon/dark-assets/misc/calendar-arrow-right-hover.svg @@ -0,0 +1,171 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/common/cinnamon/dark-assets/misc/calendar-arrow-right.svg b/common/cinnamon/dark-assets/misc/calendar-arrow-right.svg new file mode 100644 index 0000000..734b53b --- /dev/null +++ b/common/cinnamon/dark-assets/misc/calendar-arrow-right.svg @@ -0,0 +1,171 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/common/cinnamon/dark-assets/misc/message.svg b/common/cinnamon/dark-assets/misc/message.svg new file mode 100644 index 0000000..2fb2d4f --- /dev/null +++ b/common/cinnamon/dark-assets/misc/message.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/cinnamon/dark-assets/misc/modal.svg b/common/cinnamon/dark-assets/misc/modal.svg new file mode 100644 index 0000000..4f5a61b --- /dev/null +++ b/common/cinnamon/dark-assets/misc/modal.svg @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/dark-assets/switch/switch-off.svg b/common/cinnamon/dark-assets/switch/switch-off.svg new file mode 100644 index 0000000..bfd52bd --- /dev/null +++ b/common/cinnamon/dark-assets/switch/switch-off.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/dark-assets/switch/switch-on.svg b/common/cinnamon/dark-assets/switch/switch-on.svg new file mode 100644 index 0000000..a2dd168 --- /dev/null +++ b/common/cinnamon/dark-assets/switch/switch-on.svg @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/gulpfile.js b/common/cinnamon/gulpfile.js new file mode 100644 index 0000000..230ac9d --- /dev/null +++ b/common/cinnamon/gulpfile.js @@ -0,0 +1,18 @@ +var gulp = require("gulp"); +var sass = require("gulp-sass"); +var filter = require('gulp-filter'); + +gulp.task('sass', function () { + return gulp.src('sass/*.scss') + .pipe(sass({ + outputStyle: 'nested', + precision: 5, + onError: function (err) { + notify().write(err); + } + })) + .pipe(gulp.dest('.')) +}); + + +gulp.task('default', ['sass']); diff --git a/common/cinnamon/light-assets/checkbox/checkbox-checked-focused.svg b/common/cinnamon/light-assets/checkbox/checkbox-checked-focused.svg new file mode 100644 index 0000000..983e7f8 --- /dev/null +++ b/common/cinnamon/light-assets/checkbox/checkbox-checked-focused.svg @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/light-assets/checkbox/checkbox-checked.svg b/common/cinnamon/light-assets/checkbox/checkbox-checked.svg new file mode 100644 index 0000000..e8da8e6 --- /dev/null +++ b/common/cinnamon/light-assets/checkbox/checkbox-checked.svg @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/light-assets/checkbox/checkbox-unchecked-focused.svg b/common/cinnamon/light-assets/checkbox/checkbox-unchecked-focused.svg new file mode 100644 index 0000000..6c2f719 --- /dev/null +++ b/common/cinnamon/light-assets/checkbox/checkbox-unchecked-focused.svg @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/light-assets/checkbox/checkbox-unchecked.svg b/common/cinnamon/light-assets/checkbox/checkbox-unchecked.svg new file mode 100644 index 0000000..d50e0e2 --- /dev/null +++ b/common/cinnamon/light-assets/checkbox/checkbox-unchecked.svg @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/light-assets/menu/menu-hover.svg b/common/cinnamon/light-assets/menu/menu-hover.svg new file mode 100644 index 0000000..938245a --- /dev/null +++ b/common/cinnamon/light-assets/menu/menu-hover.svg @@ -0,0 +1,97 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/common/cinnamon/light-assets/menu/menu.svg b/common/cinnamon/light-assets/menu/menu.svg new file mode 100644 index 0000000..5ae7466 --- /dev/null +++ b/common/cinnamon/light-assets/menu/menu.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/light-assets/menu/submenu-open.svg b/common/cinnamon/light-assets/menu/submenu-open.svg new file mode 100644 index 0000000..8062443 --- /dev/null +++ b/common/cinnamon/light-assets/menu/submenu-open.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/common/cinnamon/light-assets/menu/submenu.svg b/common/cinnamon/light-assets/menu/submenu.svg new file mode 100644 index 0000000..766c82e --- /dev/null +++ b/common/cinnamon/light-assets/menu/submenu.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/common/cinnamon/light-assets/misc/calendar-arrow-left-hover.svg b/common/cinnamon/light-assets/misc/calendar-arrow-left-hover.svg new file mode 100644 index 0000000..7f292f8 --- /dev/null +++ b/common/cinnamon/light-assets/misc/calendar-arrow-left-hover.svg @@ -0,0 +1,169 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/common/cinnamon/light-assets/misc/calendar-arrow-left.svg b/common/cinnamon/light-assets/misc/calendar-arrow-left.svg new file mode 100644 index 0000000..5602eff --- /dev/null +++ b/common/cinnamon/light-assets/misc/calendar-arrow-left.svg @@ -0,0 +1,169 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/common/cinnamon/light-assets/misc/calendar-arrow-right-hover.svg b/common/cinnamon/light-assets/misc/calendar-arrow-right-hover.svg new file mode 100644 index 0000000..beadead --- /dev/null +++ b/common/cinnamon/light-assets/misc/calendar-arrow-right-hover.svg @@ -0,0 +1,171 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/common/cinnamon/light-assets/misc/calendar-arrow-right.svg b/common/cinnamon/light-assets/misc/calendar-arrow-right.svg new file mode 100644 index 0000000..734b53b --- /dev/null +++ b/common/cinnamon/light-assets/misc/calendar-arrow-right.svg @@ -0,0 +1,171 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/common/cinnamon/light-assets/misc/message.svg b/common/cinnamon/light-assets/misc/message.svg new file mode 100644 index 0000000..a1f8615 --- /dev/null +++ b/common/cinnamon/light-assets/misc/message.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/common/cinnamon/light-assets/misc/modal.svg b/common/cinnamon/light-assets/misc/modal.svg new file mode 100644 index 0000000..b61f537 --- /dev/null +++ b/common/cinnamon/light-assets/misc/modal.svg @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/light-assets/switch/switch-off.svg b/common/cinnamon/light-assets/switch/switch-off.svg new file mode 100644 index 0000000..96749e2 --- /dev/null +++ b/common/cinnamon/light-assets/switch/switch-off.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/light-assets/switch/switch-on.svg b/common/cinnamon/light-assets/switch/switch-on.svg new file mode 100644 index 0000000..0203bbb --- /dev/null +++ b/common/cinnamon/light-assets/switch/switch-on.svg @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/package.json b/common/cinnamon/package.json new file mode 100644 index 0000000..b08961b --- /dev/null +++ b/common/cinnamon/package.json @@ -0,0 +1,7 @@ +{ + "devDependencies": { + "gulp": "~3.9.0", + "gulp-filter": "~2.0.2", + "gulp-sass": "~2.0.4" + } +} diff --git a/common/cinnamon/sass/_colors.scss b/common/cinnamon/sass/_colors.scss new file mode 100644 index 0000000..9c51858 --- /dev/null +++ b/common/cinnamon/sass/_colors.scss @@ -0,0 +1,90 @@ +// When color definition differs for dark and light variant, +// it gets @if ed depending on $variant + + +$base_color: if($variant =='light', #ffffff, #383C45); +$text_color: if($variant == 'light', #5c616c, #D3DAE3); +$bg_color: if($variant =='light', #F5F6F7, #444852); +$fg_color: if($variant =='light', #5c616c, #D3DAE3); + +$selected_fg_color: #ffffff; +$selected_bg_color: #5294E2; +$selected_borders_color: darken($selected_bg_color, 20%); +$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,10%)); + +$link_color: if($variant == 'light', darken($selected_bg_color,10%), + lighten($selected_bg_color,20%)); +$link_visited_color: if($variant == 'light', darken($selected_bg_color,20%), + lighten($selected_bg_color,10%)); + +$selection_mode_bg: if($transparency == 'true', transparentize($selected_bg_color, 0.05), $selected_bg_color); +$warning_color: #F27835; +$error_color: #FC4138; +$success_color: #73d216; +$destructive_color: #F04A50; +$suggested_color: #4DADD4; + +//insensitive state derived colors +$insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55)); +$insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%)); + + +$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); +$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); + +$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); +$button_border: $entry_border; + +$header_bg: red; +@if $transparency=='true' and $variant=='light' { $header_bg: transparentize(#e7e8eb, 0.05); } +@if $transparency=='false' and $variant=='light' { $header_bg: #e7e8eb; } +@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343b, 0.03); } +@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343b; } + +$header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%)); + +$header_border: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); + +$header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%)); +$header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg); + +$dark_sidebar_bg: if($transparency == 'true', transparentize(#3c4049, 0.05), #3c4049); +$dark_sidebar_fg: #BAC3CF; +$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 10%)); + +$osd_fg_color: $dark_sidebar_fg; +$osd_bg_color: darken($dark_sidebar_bg, 8%); + +$osd_insensitive_bg_color: darken($osd_bg_color, 3%); +$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%); +$osd_borders_color: transparentize(black, 0.3); + +$panel_bg: darken($osd_bg_color, 4.7%); +$panel_fg: $osd_fg_color; + +//WM Buttons + +// Close +$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f37076, #e45e65); +$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f79da1, #f48085); +$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #ef4048, #e6262f); + +$wm_icon_close_bg: $selected_fg_color; +$wm_icon_close_hover_bg: $selected_fg_color; +$wm_icon_close_active_bg: $selected_fg_color; + +// Minimize, Maximize +$wm_button_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32); +$wm_button_unfocused_bg: if($variant == 'light' and $darker == 'false', #f6f7f8, #2a3035); +$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32); +$wm_button_active_bg: $selected_bg_color; + +$wm_button_border: if($variant == 'light' and $darker == 'false', #d8dae0, #191C21); +$wm_button_unfocused_border: if($variant == 'light' and $darker == 'false', #dddee2, #1F2328); +$wm_button_hover_border: $selected_bg_color; +$wm_button_active_border: $selected_bg_color; + +$wm_icon_bg: if($variant == 'light' and $darker == 'false', #8d93a4, #939ca8); +$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #b8bcc7, #686f78); +$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #70788d, #afb8c5); +$wm_icon_active_bg: $selected_fg_color; diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss new file mode 100644 index 0000000..6f3d5ad --- /dev/null +++ b/common/cinnamon/sass/_common.scss @@ -0,0 +1,1483 @@ +$asset_path: if($variant == 'dark', dark-assets, light-assets); + +// +// Globals +// +$font-size: 9; +$font-family: Futura Bk bt, sans, Sans-Serif; +$_bubble_bg_color: opacify($osd_bg_color,0.25); +$_bubble_fg_color: $osd_fg_color; +$_bubble_borders_color: transparentize($osd_fg_color,0.8); + +stage { + font-family: $font-family; + @include fontsize($font-size); + color: $fg_color; +} + +.label-shadow { + color: rgba(0, 0, 0, 0); +} + +%reset_style { + background-color: transparent !important; + background-gradient-direction: none !important; + border: none !important; + border-radius: 0 !important; +} + +// +// Buttons +// +%button { + min-height: 20px; + padding: 5px 32px; + transition-duration: 0; + border-radius: 2px; + + @include button(normal); + + &:focus { @include button(focus); } + &:hover { @include button(hover); } + &:hover:focus { @include button(focus-hover); } + &:active, &:active:focus { @include button(active); } + &:insensitive { @include button(insensitive); } +} + +%osd_button { + min-height: 20px; + padding: 5px 32px; + transition-duration: 0; + border-radius: 2px; + + @include button(osd); + + &:hover { @include button(osd-hover); } + &:focus { color: $selected_bg_color; } + &:active { @include button(osd-active); } + &:insensitive { @include button(osd-insensitive); } +} + +// +// Entries +// +%entry { + padding: 7px; + caret-size: 1px; + selection-background-color: $selected_bg_color; + selected-color: $selected_fg_color; + transition-duration: 300ms; + border-radius: 20px; + + @include entry(normal); + + &:focus, &:hover { @include entry(focus); } + &:insensitive { @include entry(insensitive); } + + StIcon.capslock-warning { + icon-size: 16px; + warning-color: $warning_color; + padding: 0 4px; + } +} + +%osd_entry { + padding: 7px; + caret-size: 1px; + caret-color: $osd_fg_color; + selection-background-color: $selected_bg_color; + selected-color: $selected_fg_color; + transition-duration: 300ms; + border-radius: 20px; + + @include entry(osd); + + &:focus { @include entry(osd-focus); } + &:insensitive { @include entry(osd-insensitive); } +} + +// +// Scrollbars +// +StScrollView { + &.vfade { -st-vfade-offset: 0px; } + &.hfade { -st-hfade-offset: 0px; } +} + +StScrollBar { + + padding: 8px; + + StScrollView & { + min-width: 5px; + min-height: 5px; + } + + StBin#trough { + background-color: transparentize($base_color, 0.9); + border-radius: 8px; + } + + StButton#vhandle, StButton#hhandle { + border-radius: 4px; + background-color: mix($fg_color, $bg_color, 40%); + border: 0px solid; + margin: 0px; + + &:hover { background-color: mix($fg_color, $bg_color, 30%); } + + &:active { background-color: $selected_bg_color; } + } +} + +// +// Slider +// +.popup-slider-menu-item { + -slider-height: 4px; + -slider-background-color: $button_border; //background of the trough + -slider-border-color: transparentize(black, 1); //trough border color + -slider-active-background-color: $selected_bg_color; //active trough fill + -slider-active-border-color: transparentize(black, 1); //active trough border + -slider-border-width: 0; + -slider-handle-radius: 4px; + height: 18px; + min-width: 15em; + border: 0 solid transparent; + border-right-width: 1px; + border-left-width: 5px; + color: transparent; +} + +// +// Check Boxes +// +.check-box { + + CinnamonGenericContainer { + spacing: .2em; + min-height: 30px; + padding-top: 2px; + } + + StLabel { font-weight: normal; } + + StBin { + width: 16px; + height: 16px; + background-image: url("#{$asset_path}/checkbox/checkbox-unchecked.svg"); + } + + &:focus StBin { background-image: url("#{$asset_path}/checkbox/checkbox-unchecked-focused.svg"); } + + &:checked StBin { background-image: url("#{$asset_path}/checkbox/checkbox-checked.svg"); } + + &:focus:checked StBin { background-image: url("#{$asset_path}/checkbox/checkbox-checked-focused.svg"); } +} + +// +// Radio Buttons +// +.radiobutton { + + CinnamonGenericContainer { + spacing: .2em; + height: 26px; + padding-top: 2px; + } + + StLabel { + padding-top: 4px; + font-size: 0.9em; + box-shadow: none; + } + + StBin { + width: 16px; + height: 16px; + background-image: url("#{$asset_path}/checkbox/checkbox-unchecked.svg"); + } + + &:focus StBin { background-image: url("#{$asset_path}/checkbox/checkbox-unchecked-focused.svg"); } + + &:checked StBin { background-image: url("#{$asset_path}/checkbox/checkbox-checked.svg"); } + + &:focus:checked StBin { background-image: url("#{$asset_path}/checkbox/checkbox-checked-focused.svg"); } +} + +// +// Switches +// +.toggle-switch { + width: 50px; + height: 20px; + background-size: contain; + + &-us, &-intl { + background-image: url("#{$asset_path}/switch/switch-off.svg"); + + &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } + } +} + +// +// Links +// +.cinnamon-link { + color: $link_color; + text-decoration: underline; + + &:hover { color: lighten($link_color,10%); } +} + +// +// Tooltip +// +#Tooltip { + border-radius: l3px; + padding: 5px 12px; + background-color: $osd_bg_color; + color: $osd_fg_color; + font-size: 1em; + font-weight: normal; + text-align: center; +} + +// +// Popvers/Menus +// +.popup-menu { + color: white; + min-width: 200px; + color: $fg_color; + border-image: url("#{$asset_path}/menu/menu.svg") 9 9 9 9; + + .popup-sub-menu { + background-gradient-direction: none; + box-shadow: none; + border-image: url("#{$asset_path}/menu/submenu.svg") 9 9 9 9; + + .popup-menu-item:ltr { padding-right: 0em; } + .popup-menu-item:rtl { padding-left: 0em; } + + StScrollBar { + padding: 4px; + StBin#trough, StBin#vhandle { border-width: 0; } + } + + &-menu-item:open { + background: none; + box-shadow: none; + border-image: url("#{$asset_path}/menu/submenu-open.svg") 9 9 9 9; + } + } + + .popup-menu-content { padding: 1em 0em 1em 0em; } + .popup-menu-item { + padding: .4em 1.75em; + spacing: 1em; + + &:active { + color: $fg_color; + background-color: transparent; + border-image: url("#{$asset_path}/menu/menu-hover.svg") 9 9 1 1; + } + &:insensitive { + color: transparentize($fg_color, 0.5); + background: none; + } + } + + .popup-inactive-menu-item { //all icons and other graphical elements + color: $fg_color; + + &:insensitive { color: $insensitive_fg_color; } + } + + &-icon { icon-size: 16px; } +} + +.popup-menu-boxpointer { + -arrow-border-radius: 3px; + -arrow-background-color: rgba(0,0,0,0.0); + -arrow-border-width: 1px; + -arrow-border-color: rgba(0,0,0,0.0); + -arrow-base: 0; + -arrow-rise: 0; +} + +/*Don't know what this does*/ +.popup-combo-menu { + background-color: rgba(0,0,0,0.4); + padding: 1em 0em; + color: red; + border: 1px solid rgba(0,0,0,0.6); + border-radius: 3px; +} +.popup-image-menu-item {} + +.popup-combobox-item { spacing: 1em; } + +.popup-separator-menu-item { + height: 2px; //not really the whole box + margin: 10px 0px; + background-color: transparent; + border: none; + border-image: url("common-assets/menu-separator.svg") 1 1 1 1; +} + +.popup-alternating-menu-item:alternate { + font-weight: normal; +} + +.popup-device-menu-item { spacing: .5em; } + +.popup-subtitle-menu-item { font-weight: normal; } + +.nm-menu-item-icons { spacing: .5em; } + +// +// Panel +// +#panel { + font-weight: bold; + height: 2.1em; + min-height: 27px; + + &Left { + spacing: 4px; + + &:dnd { + background-gradient-direction: vertical; + background-gradient-start: rgba(255,0,0,0.05); + background-gradient-end: rgba(255,0,0,0.2); + } + &:ltr ·{ padding-right: 4px; } + &:rtl ·{ padding-left: 4px; } + } + + &Right { + + &:dnd { + background-gradient-direction: vertical; + background-gradient-start: rgba(0,0,255,0.05); + background-gradient-end: rgba(0,0,255,0.2); + } + &:ltr ·{ padding-left: 4px; spacing: 0px; } + &:rtl ·{ padding-right: 4px; spacing: 0px; } + } + + &Center { + spacing: 4px; + + &:dnd { + background-gradient-direction: vertical; + background-gradient-start: rgba(0,255,0,0.05); + background-gradient-end: rgba(0,255,0,0.2); + } + } +} + +.panel { + + &-top, &-bottom { + color: $selected_fg_color; + font-size: 1em; + padding: 0px; + } + + &-top { border-image: url('common-assets/panel/panel-top.svg') 1 1 1 1; } + &-bottom { border-image: url('common-assets/panel/panel-bottom.svg') 1 1 1 1; } + + &-status-button { + border-widht: 0; + -natural-hpadding: 3px; + -minimum-hpadding: 3px; + font-weight: bold; + color: white; + height: 22px; + + &:hover {} + } + + &-button { + -natural-hpadding: 6px; + -minimum-hpadding: 2px; + font-weight: bold; + color: green; + transition-duration: 100; + + &:hover {} + } +} + +.system-status-icon { + icon-size: 16px; + padding: 0 1px; +} + +// +// Overview +// +#overview { spacing: 12px; } + +.window-caption { + background-color: $osd_bg_color; + border: 1px solid $osd_bg_color; + color: $osd_fg_color; + spacing: 25px; + border-radius: 2px; + font-size: 9pt; + padding: 5px 8px; + -cinnamon-caption-spacing: 4px; + + &#selected { + background-color: $selected_bg_color; + color: $selected_fg_color; + border: 1px solid $selected_bg_color; + spacing: 25px; + } +} + +.expo-workspaces-name-entry, +.expo-workspaces-name-entry#selected { + spacing: 25px; + border-radius: 2px; + font-size: 9pt; + padding: 5px 8px; + -cinnamon-caption-spacing: 4px; + @include entry(osd); + + &:focus { + border: 1px solid $selected_bg_color; + background-color: $selected_bg_color; + color: $selected_fg_color; + font-style: italic; + transition-duration: 300; + selection-background-color: $selected_fg_color; + selected-color: $selected_bg_color; + } +} + +.expo-workspace-thumbnail-frame { + border: 4px solid rgba(255,255,255,0.0); + background-color: rgba(255,255,255,0.0); + border-radius: 2px; + + &#active { + border: 4px solid $selected_bg_color; + background-color: black; + border-radius: 2px; + } +} + +.expo-background { + background-color: opacify($osd_bg_color, 1); +} + +.workspace { + //&-controls { visible-height: 32px; } + + &-thumbnails { + spacing: 14px; + + &-background, &-background:rtl { padding: 8px; } + } + + &-add-button { + background-image: url("common-assets/misc/add-workspace.svg"); + height: 200px; + width: 35px; + transition-duration: 200; + + &:hover { + background-image: url("common-assets/misc/add-workspace-hover.svg"); + transition-duration: 200; + } + } + &-overview-background-shade { background-color: rgba(0,0,0,0.5); } +} + +.workspace-close-button, +.window-close { + background-image: url("common-assets/misc/close.svg"); + background-size: 26px; + height: 26px; + width: 26px; + -cinnamon-close-overlap: 10px; + + &:hover { + background-image: url("common-assets/misc/close-hover.svg"); + background-size: 26px; + height: 26px; + width: 26px; + } + &:active { + background-image: url("common-assets/misc/close-active.svg"); + background-size: 26px; + height: 26px; + width: 26px; + } +} + +//.workspace-thumbnail-indicator { +// outline: 2px solid red; +// border: 1px solid green; +//} +// +//.window-close:rtl { +// -st-background-image-shadow: 2px 2px 6px rgba(0,0,0,0.5); +//} + +.window-close-area { + background-image: url("common-assets/misc/trash-icon.svg"); + height: 120px; + width: 400px; +} + +// +// About Dialog (applet.js and desklet.js) +// +.about { + &-content { + width: 550px; + height: 250px; + spacing: 8px; + padding-bottom: 10px; + } + &-title { + font-size: 2em; + font-weight: bold; + } + &-uuid { + font-size: 10px; + color: #888; + } + &-icon { + padding-right: 20px; + padding-bottom: 14px; + } + &-scrollBox { + border: 1px solid $borders_color; + border-radius: 2px; + background-color: $base_color; + padding: 4px; + padding-right: 0; + border-radius: 0; + + &-innerBox { + padding: 1.2em; + spacing: 1.2em; + } + } + &-description { + padding-top: 4px; + padding-bottom: 16px; + } + &-version { + padding-left: 7px; + font-size: 10px; + color: #888; + } +} + + +// +// Calendar +// +.calendar { + padding: .4em 1.75em; + spacing-rows: 0px; + spacing-columns: 0px; +} + +.calendar-month-label { + color: $fg_color; + font-weight: bold; + padding: 8px 0; +} + +.calendar-change-month-back, +.calendar-change-month-forward { + width: 16px; + height: 16px; +} + +//arrow back +.calendar-change-month-back { + background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); + + &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-left-hover.svg"); } + + &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); } + + &:rtl { + background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); + + &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-right-hover.svg"); } + + &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); } + } +} + +//arrow forward +.calendar-change-month-forward { + background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); + + &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-right-hover.svg"); } + + &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); } + + &:rtl { + background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); + + &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-left-hover.svg"); } + + &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); } + } +} + +.datemenu-date-label { + padding: .4em 1.75em; + font-weight: bold; + text-align: center; + color: $fg_color; + border-radius: 2px; +} + +.calendar-day-base { + font-size: 80%; + text-align: center; + width: 25px; + height: 25px; + padding: 0.1em; + margin: 2px; + border-radius: 12.5px; +} + +.calendar-day-heading { + color: transparentize($fg_color, 0.15); + margin-top: 1em; + font-size: 70%; +} + +.calendar-day { + border-width: 0; + color: transparentize($fg_color, 0.2); +} + +.calendar-day-top { + border-top-width: 0; +} + +.calendar-day-left { + border-left-width: 0; +} + +.calendar-nonwork-day { + color: $fg_color; + background-color: transparent; + font-weight: bold; +} + +.calendar-today, +.calendar-today:active, +.calendar-today:focus, +.calendar-today:hover { + font-weight: bold; + color: $selected_fg_color; + background-color: $selected_bg_color; + border-width: 0; +} + +.calendar-other-month-day { + color: transparentize($fg_color, 0.7); + opacity: 1; +} + +// +// Notifications +// +#notification { + border-radius: 3px; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + padding: 13px; + spacing-rows: 10px; + spacing-columns: 10px; + margin-from-right-edge-of-screen: 20px; + width: 34em; + color: $osd_fg_color; + + .popup-menu & { + color: $fg_color; + border-image: url("#{$asset_path}/misc/message.svg") 9 9 9 9; + + .notification-button, .notification-icon-button { @extend %button; } + + StEntry { @extend %entry; } + } + + &.multi-line-notification { + padding-bottom: 13px; + color: $osd_fg_color; + } + + &-scrollview { + max-height: 10em; + + > .top-shadow, > .bottom-shadow { height: 1em; } + + &:ltr > StScrollBar { padding-left: 6px; } + &:rtl > StScrollBar { padding-right: 6px; } + } + + &-body { spacing: 5px; } + &-actions { spacing: 10px; } +} + +.notification { + + &-with-image { + min-height: 159px; + color: $osd_fg_color; + } + + &-button, &-icon-button { @extend %osd_button; } + + &-icon-button > StIcon { icon-size: 36px; } + + StEntry { @extend %osd_entry; } +} + +// +// Alt Tab +/// +#altTabPopup { + padding: 8px; + spacing: 16px; +} + +.switcher-list { + color: $osd_fg_color; + background: none; + border: none; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + border-radius: 3px; + padding: 20px; + + &-item-container { spacing: 8px; } + + .item-box { + padding: 8px; + border-radius: 2px; + + &:outlined { + padding: 8px; + border: 1px solid $selected_bg_color; + } + + &:selected { + color: $selected_fg_color; + background-color: $selected_bg_color; + border: 1px solid $selected_bg_color; + } + } + + .thumbnail { width: 256px; } + + .thumbnail-box { + padding: 2px; + spacing: 4px; + } + .separator { + width: 1px; + background: rgba(255,255,255,0.2); + } +} + +.switcher-arrow { + border-color: rgba(0,0,0,0); + color: $osd_fg_color; + + &:highlighted { + border-color: rgba(0,0,0,0); + color: $selected_fg_color; + } +} + +//.switcher-preview-backdrop { background-color: rgba(25,25,25,0.95); } + +.thumbnail-scroll-gradient-left { + background-color: rgba(0, 0, 0, 0); + border-radius: 24px; + border-radius-topright: 0px; + border-radius-bottomright: 0px; + width: 60px; +} + +.thumbnail-scroll-gradient-right { + background-color: rgba(0, 0, 0, 0); + border-radius: 24px; + border-radius-topleft: 0px; + border-radius-bottomleft: 0px; + width: 60px; +} + +// +//Activities Ripples +// +.ripple-box { + width: 52px; + height: 52px; + background-image: url("common-assets/misc/corner-ripple-ltr.svg"); + background-size: contain; + + &:rtl { background-image: url("common-assets/misc/corner-ripple-rtl.svg"); } +} + +// +// Modal dialogs +// +.lightbox { background-color: rgba(0, 0, 0, 0.4); } +.flashspot { background-color: white; } + +.modal-dialog { + color: $fg_color; + background-color: transparentize($bg_color, 1); + border: none; + border-image: url("#{$asset_path}/misc/modal.svg") 9 9 9 67; + padding: 0 5px 6px 5px; + + > StBoxLayout:first-child { + padding: 20px 10px 10px 10px; + } + + &-button-box { + spacing: 0; + margin: 0px; + padding: 14px 10px; + background: none; + border: none; + border-image: url("common-assets/misc/button-box.svg") 9 9 9 9; + + .modal-dialog-button { + padding-top: 0; + padding-bottom: 0; + height: 30px; + + @extend %osd_button; + } + } +} + +// +// Run dialog +// +.run-dialog { + padding: 0px 15px 10px 15px; + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + + > * { padding: 0; } + + &-label { + font-size: 0; + font-weight: bold; + color: $osd_fg_color; + padding-bottom: 0; + } + + &-error-label { color: $error_color; } + + &-error-box { + padding-top: 15px; + spacing: 5px; + } + &-completion-box { + padding-left: 15px; + font-size: 10px; + } + &-entry { + width: 21em; + padding: 7px; + border-radius: 20px; + caret-color: $osd_fg_color; + selected-color: $selected_fg_color; + selection-background-color: $selected_bg_color; + + @include entry(osd); + + &:focus { @include entry(osd-focus); } + } + .modal-dialog-button-box { + border: none; + box-shadow: none; + background: none; + background-gradient-direction: none; + } +} + +/* CinnamonMountOperation Dialogs */ +.cinnamon-mount-operation-icon { + icon-size: 48px; +} + +.mount-password-reask { + color: $warning_color; +} + +.show-processes-dialog, +.mount-question-dialog { + spacing: 24px; + + &-subject { + padding-top: 10px; + padding-left: 17px; + padding-bottom: 6px; + + &:rtl { + padding-left: 0px; + padding-right: 17px; + } + } + &-description { + padding-left: 17px; + width: 28em; + + &:rtl { padding-right: 17px; } + } +} + +.show-processes-dialog-app-list { + max-height: 200px; + padding-top: 24px; + padding-left: 49px; + padding-right: 32px; + + &:rtl { + padding-right: 49px; + padding-left: 32px; + } + + &-item { + color: #ccc; + + &:hover { color: white } + + &:ltr { padding-right: 1em; } + &:rtl { padding-left: 1em; } + + &-icon:ltr { padding-right: 17px; } + &-icon:rtl { padding-left: 17px; } + + &-name { font-size: 1.1em; } + } +} + +// +// Magnifier +// +.magnifier-zoom-region { + border: 2px solid rgba(128, 0, 0, 1); + + .full-screen { border-width: 0px; } +} + +// +// On-Screen Keyboard +// +#keyboard { + background-color: $osd_bg_color; + border-width: 0; + border-top-width: 1px; + border-color: transparentize(black, 0.6); +} + +.keyboard-layout { + spacing: 10px; + padding: 10px; +} + +.keyboard-row { + spacing: 15px; +} + +.keyboard-key { + min-height: 2em; + min-width: 2em; + font-size: 14pt; + font-weight: bold; + border-radius: 3px; + box-shadow: none; + + @include button(osd); + + &:hover { @include button(osd-hover); } + &:active, &:checked { @include button(osd-active); } + + &:grayed { @include button(osd-insensitive); } +} + +.keyboard-subkeys { //long press on a key popup + color: $osd_fg_color; + padding: 5px; + -arrow-border-radius: 2px; + -arrow-background-color: $osd_bg_color; + -arrow-border-width: 1px; + -arrow-border-color: transparentize(black, 0.6);; + -arrow-base: 20px; + -arrow-rise: 10px; + -boxpointer-gap: 5px; +} + +// +// Cinnamon Specific Section +// + +// +// Menu (menu.js) +// +.menu { + &-favorites-box { + margin: auto; + padding: 10px; + transition-duration: 300; + background-color: $bg_color; + border: 1px solid $borders_color; + } + + &-favorites-button { + padding: 10px; + border: 1px solid rgba(0,0,0,0); + + &:hover { @include button(hover); } + } + + &-places { + + &-box { + margin: auto; + padding: 10px; + border: 0px solid red; + } + + &-button { padding: 10px; } + } + + &-categories-box { padding: 10px 30px 10px 30px; } + + &-applications-inner-box, + &-applications-outer-box { padding: 10px 10px 0 10px; } + + &-application-button { + padding: 7px; + border: 1px solid rgba(0,0,0,0); + + // This style is used in menu application buttons for applications which were newly installed + &:highlighted { font-weight: bold; } + + &-selected { + padding: 7px; + @include button(hover); + + &:highlighted { font-weight: bold; } + } + + &-label:ltr { padding-left: 5px; } + &-label:rtl { padding-right: 5px; } + } + + &-category-button { + padding: 7px; + border: 1px solid rgba(0,0,0,0); + + &-selected { + padding: 7px; + @include button(hover); + } + &-hover { + background-color: red; + border-radius: 2px; + } + &-greyed { + padding: 7px; + color: $insensitive_fg_color; + border: 1px solid rgba(0,0,0,0); + } + + &-label:ltr { padding-left: 5px; } + &-label:rtl { padding-right: 5px; } + } + + // Name and description of the currently hovered item in the menu + // This appears on the bottom right hand corner of the menu + &-selected-app-box { + padding-right: 30px; + padding-left: 28px; + text-align: right; + height: 30px; + + &:rtl { + padding-top: 10px; + height: 30px; + } + } + + &-selected-app-title { font-weight: bold; } + + &-selected-app-description { max-width: 150px; } + + &-search-box:ltr { padding-left: 30px; } + &-search-box-rtl { padding-right: 30px; } +} + +#menu-search-entry { + width: 250px; + height: 15px; + font-weight: normal; + caret-color: $fg_color; + + @extend %entry; +} + +.menu-search-entry-icon { + icon-size: 1em; + color: $fg_color; +} + +/* Context menu (at the moment only for favorites) */ +.menu-context-menu { +} + +// +// OSD +// +.info-osd { + text-align: center; + font-weight: bold; + spacing: 1em; + padding: 16px; + color: $selected_fg_color; + border-image: url("common-assets/misc/osd.svg") 9 9 9 9; +} + +.osd-window { + text-align: center; + font-weight: bold; + spacing: 1em; + padding: 20px; + margin: 32px; + min-width: 64px; + min-height: 64px; + + color: $selected_fg_color; + background: none; + border: none; + border-radius: 5px; + border-image: url("common-assets/misc/osd.svg") 9 9 9 9; + +.osd-monitor-label { font-size: 3em; } + + .level { + padding: 0; + height: 4px; + background-color: transparentize(black, 0.5); + border-radius: 2px; + color: $selected_bg_color; + } +} + +// +// Window list (windowList.js) +// +.window-list { + + &-box { + spacing: 6px; + padding-left: 10px; + + .panel-bottom & { padding-top: 1px; } + .panel-top & { padding-bottom: 1px; } + } + + &-item-label { + font-weight: bold; + width: 15em; + min-width: 5px; + } + + &-item-box { + font-weight: bold; + background-image: none; + padding-left: 8px; + padding-right: 8px; + transition-duration: 100; + color: transparentize($selected_fg_color, 0.4); + + &:hover {color: $selected_fg_color;} + + &:active, + &:checked, + &:focus { + color: $selected_fg_color; + + .panel-bottom & { border-image: url("common-assets/panel/window-list-active-bottom.svg") 3 3 1 3; } + + .panel-top & { border-image: url("common-assets/panel/window-list-active-top.svg") 3 3 3 1; } + } + } + + &-item-demands-attention { + background-gradient-start: $warning_color; + background-gradient-end: $warning_color; + } +} + +/// +// Sound Applet (status/volume.js) +// +.sound-button { + width: 22px; + height: 13px; + padding: 8px; + + @extend %button; + + &-container { + padding-right: 3px; + padding-left: 3px; + } + StIcon { icon-size: 1.4em; } +} + +.sound-track { + &-infos { padding: 5px; } + &-info { + padding-top: 2px; + padding-bottom: 2px; + + StIcon { icon-size: 16px; } + + StLabel { + padding-left: 5px; + padding-right: 5px; + } + } + &-box { + padding-left: 15px; + padding-right: 15px; + max-width: 220px; + } +} + +.sound-seek-box { + padding-left: 15px; + + StLabel { padding-top: 2px; } + StIcon { icon-size: 16px; } +} + +.sound-seek-slider { width: 140px; } + +.sound-volume-menu-item { + padding: .4em 1.75em; + + StIcon { + icon-size: 1.14em; + padding-left: 8px; + padding-right: 8px; + } +} + +.sound-playback-control { padding: 5px 10px 10px 10px; } + +// +// Workspace Switcher applet (workspaceSwitcher.js) +// +#workspaceSwitcher { + spacing: 0px; + padding: 3px; +} + +.workspace-button { + width: 20px; + height: 10px; + color: $selected_fg_color; + padding: 3px; + padding-top: 4px; + transition-duration: 300; + + &:outlined, &:outlined:hover { color: $selected_bg_color; } + &:hover { color: transparentize($selected_bg_color, 0.5) } +} + +// +// Panel Launchers Applet (panelLaunchers.js) +// +#panel-launchers-box { + padding-left: 7px; +} + +.panel-launcher { + margin: 1px; + padding: 1px; + transition-duration: 200; + + &:hover { + background-gradient-direction: none; + border: 0px solid $selected_bg_color; + + .panel-bottom & { border-bottom-width: 1px; } + .panel-top & { border-top-width: 1px; } + } +} + +// +// Overview corner +// +#overview-corner { + background-image: url("common-assets/misc/overview.png"); + + &:hover { background-image: url("common-assets/misc/overview-hover.png"); } +} + +// +// Applets (applet.js) +// +.applet { + &-separator { padding: 1px 4px; } + + &-separator-line { + width: 1px; + background: rgba(255,255,255, 0.12); + } + + &-box { + padding-left: 3px; + padding-right: 3px; + color: $selected_fg_color; + text-shadow: none; + transition-duration: 100; + + &:hover { + color: $selected_fg_color; + background-color: $selected_bg_color; + } + } + + &-label { + font-weight: bold; + color: $selected_fg_color; + + &:hover, .applet-box:hover > & { + color: $selected_fg_color; + text-shadow: none; + } + } + + &-icon { + color: $selected_fg_color; + icon-size: 22px; + + &:hover, .applet-box:hover > & { + color: $selected_fg_color; + text-shadow: none; + } + } + +} + +// +// User Applet +// +.user-icon { + width: 32px; + height: 32px; + background-color: transparent; + border: none; + border-radius: 0; +} + +.user-label { + color: $fg_color; + font-size: 1em; + font-weight: bold; + margin: 0px; +} + +// +// Desklets (desklet.js) +// +.desklet { + color: $osd_fg_color; + + &-with-borders { + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + color: $osd_fg_color; + padding: 12px; + padding-bottom: 16px; + } + &-with-borders-and-header { + border-image: url("common-assets/misc/desklet.svg") 9 9 9 9; + color: $osd_fg_color; + border-radius: 0; + border-radius-topleft: 0; + border-radius-topright: 0; + padding: 12px; + padding-bottom: 17px; + } + &-header { + border-image: url("common-assets/misc/desklet-header.svg") 9 9 9 9; + color: $osd_fg_color; + font-size: 1em; + padding: 12px; + padding-bottom: 6px; + } + &-drag-placeholder { + border: 2px solid $selected_bg_color; + background-color: transparentize($selected_bg_color, 0.7); + } +} + +.photoframe-box { + border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + color: $osd_fg_color; + padding: 12px; + padding-bottom: 16px; +} + +// +// Workspace OSD +// +/*FIXME*/ +.workspace-osd { + /*color: red;*/ + text-shadow: black 5px 5px 5px; + font-weight: bold; + font-size: 48pt; +} + +// +// Notification Applet +// +.notification-applet-padding { padding: .5em 1em; } + +.notification-applet-container { max-height: 100px; } + +// +// Tile Preview +// +.tile-preview, .tile-preview.snap, +.tile-hud, .tile-hud.snap { + background-color: transparentize($selected_bg_color, 0.7); + border: 1px solid $selected_bg_color; +} + +// +// Xkcd Desklet +// +.xkcd-box { + padding: 6px; + border: 0px; + background-color: rgba(0,0,0,0); + border-radius: 0px; +} diff --git a/common/cinnamon/sass/_drawing.scss b/common/cinnamon/sass/_drawing.scss new file mode 100644 index 0000000..03b9f15 --- /dev/null +++ b/common/cinnamon/sass/_drawing.scss @@ -0,0 +1,157 @@ +// Drawing mixins + +// generic drawing of more complex things + +// provide font size in rem, with px fallback +@mixin fontsize($size: 24, $base: 16) { + font-size: round($size) + pt; + //font-size: ($size / $base) * 1rem; +} + +// Entries + +@mixin entry($t, $dark:false) { +// +// Entries drawing function +// + //@extend %reset_style; + box-shadow: inset 0 0 transparentize($base_color, 1); + + @if $t==normal { + color: $text_color; + background-color: $entry_bg; + border: 1px solid $entry_border; + } + + @if $t==focus { + color: $fg_color; + background-color: $entry_bg; + border: 1px solid $selected_bg_color; + } + + @if $t==insensitive { + color: $insensitive_fg_color; + background-color: mix($entry_bg, $bg_color, 55%); + border-color: 1px solid mix($entry_border, $bg_color, 55%); + } + + @if $t==osd { + color: $osd_fg_color; + background-color: transparentize(black, 0.8); + border: 1px solid transparentize(black, 0.6); + } + + @if $t==osd-focus { + color: $osd_fg_color; + background-color: transparentize(black, 0.8); + border: 1px solid $selected_bg_color; + } + + @if $t==osd-insensitive { + color: $osd_insensitive_fg_color; + background-color: transparentize(black, 0.9); + border-color: 1px solid transparentize(black, 0.6); + } +} + +// Buttons + +@mixin button($t) { +// +// Button drawing function +// + //@extend %reset_style; + + text-shadow: 0 1px transparentize($base_color, 1); + box-shadow: inset 0 0 transparentize($base_color, 1); + + @if $t==normal { + // + // normal button + // + color: $fg_color; + background-color: $button_bg; + border: 1px solid $button_border; + } + + @else if $t==focus { + // + // focused button + // + color: $fg_color; + background-color: $button_bg; + border: 1px solid $selected_bg_color; + } + + @else if $t==focus-hover { + // + // focused button + // + color: $selected_bg_color; + background-color: $button_bg; + border: 1px solid $selected_bg_color; + } + + @else if $t==hover { + // + // hovered button + // + color: $fg_color; + background-color: $button_bg; + border: 1px solid $selected_bg_color; + } + + @else if $t==active { + // + // pushed button + // + color: $selected_fg_color; + background-color: $selected_bg_color; + border: 1px solid $selected_bg_color; + } + + @else if $t==insensitive { + // + // insensitive button + // + color: $insensitive_fg_color; + border: 1px solid transparentize($button_border, 0.45); + background-color: transparentize($button_bg, 0.45); + } + + @else if $t==osd { + // + // normal osd button + // + color: $osd_fg_color; + border: 1px solid transparentize(black, 0.55); + background-color: transparentize(black, 0.7); + } + + @else if $t==osd-hover { + // + // active osd button + // + color: $osd_fg_color; + border: 1px solid $selected_bg_color; + background-color: transparentize(black, 0.7); + } + + @else if $t==osd-active { + // + // active osd button + // + color: $selected_fg_color; + border: 1px solid $selected_bg_color; + background-color: $selected_bg_color; + } + + @else if $t==osd-insensitive { + // + // insensitive osd button + // + color: $osd_insensitive_fg_color; + border: 1px solid transparentize(black, 0.55); + background-color: transparentize(black, 0.85); + } +} diff --git a/common/cinnamon/sass/cinnamon.scss b/common/cinnamon/sass/cinnamon.scss new file mode 100644 index 0000000..674f742 --- /dev/null +++ b/common/cinnamon/sass/cinnamon.scss @@ -0,0 +1,7 @@ +$variant: 'light'; +$transparency: 'true'; +$darker: 'false'; + +@import "_colors"; //use gtk colors +@import "_drawing"; +@import "_common"; From 359a8d8c2c0551655cf8ce72d0562d9c2c0e401e Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 14 Aug 2015 00:05:57 +0200 Subject: [PATCH 04/10] update build system --- common/Makefile.am | 19 ++++++++++++++----- common/gnome-shell/3.16/gnome-shell.css | 14 +------------- common/gnome-shell/3.16/sass/_common.scss | 18 ++---------------- configure.ac | 1 + 4 files changed, 18 insertions(+), 34 deletions(-) diff --git a/common/Makefile.am b/common/Makefile.am index 154d634..19b2c8a 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -24,15 +24,23 @@ if ENABLE_DARK endif # ENABLE_DARK +if ENABLE_CINNAMON + $(MKDIR_P) $(ithemedir)/cinnamon + + cd $(srcdir)/cinnamon && cp -r --no-preserve=mode,ownership \ + common-assets \ + light-assets \ + cinnamon.css \ + $(ithemedir)/cinnamon +endif # ENABLE_GNOME_SHELL + + if ENABLE_GNOME_SHELL $(MKDIR_P) $(ithemedir)/gnome-shell cd $(srcdir)/gnome-shell/$(GNOME_VERSION) && cp -r --no-preserve=mode,ownership \ - checkbox \ - dash \ - menu \ - misc \ - switch \ + common-assets \ + light-assets \ gnome-shell.css \ $(ithemedir)/gnome-shell endif # ENABLE_GNOME_SHELL @@ -245,6 +253,7 @@ uninstall-local: dist-hook: cp -r \ + cinnamon \ gnome-shell \ gtk-2.0 \ gtk-3.0 \ diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index 17db047..70ab7da 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -961,7 +961,7 @@ StScrollBar { height: 26px; width: 26px; } .window-close:active { - background-image: url("misc/close-active.svg"); + background-image: url("common-assets/misc/close-active.svg"); background-size: 26px; height: 26px; width: 26px; } @@ -1939,15 +1939,3 @@ StEntry.chat-response { border: 1px solid grey; border-radius: 2px; padding: 6px; } - -/*tweaks*/ -.panel-button:active, -.panel-button:overview, -.panel-button:focus, -.panel-button:hover, -#appMenu, -#panel { - text-shadow: 0px 0px white; } - -stage { - font-weight: bold; } diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index 4f72cbe..2b8dddb 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -609,7 +609,7 @@ StScrollBar { background: none; border: none; border-radius: 5px; - border-image: url("common-assets/misc/osd.svg") 9 9 9 9; + border-image: url("common-assets/misc/osd.svg") 9 9 9 9; .osd-monitor-label { font-size: 3em; } @@ -1214,7 +1214,7 @@ StScrollBar { } &:active { - background-image: url("misc/close-active.svg"); + background-image: url("common-assets/misc/close-active.svg"); background-size: 26px; height: 26px; width: 26px; @@ -2256,17 +2256,3 @@ $legacy_icon_size: 24px; border-radius: 2px; padding: 6px; } - -/*tweaks*/ -.panel-button:active, -.panel-button:overview, -.panel-button:focus, -.panel-button:hover, -#appMenu, - #panel { - text-shadow: 0px 0px white; -} - -stage { - font-weight: bold; -} diff --git a/configure.ac b/configure.ac index ef6ef88..a6f3917 100644 --- a/configure.ac +++ b/configure.ac @@ -15,6 +15,7 @@ AC_PROG_MKDIR_P ARC_ENABLE([LIGHT], [light], [Arc Light], [disable]) ARC_ENABLE([DARKER], [darker], [Arc Darker], [disable]) ARC_ENABLE([DARK], [dark], [Arc Dark], [disable]) +ARC_ENABLE([CINNAMON], [cinnamon], [Cinnamon], [disable]) ARC_ENABLE([GNOME_SHELL], [gnome-shell], [GNOME Shell], [disable]) ARC_ENABLE([GTK2], [gtk2], [GTK2], [disable]) ARC_ENABLE([GTK3], [gtk3], [GTK3], [disable]) From 79231567b3a66c7d4174188ba21fa19736c78518 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 14 Aug 2015 00:10:33 +0200 Subject: [PATCH 05/10] fix inactive chromium frame --- common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc | 2 +- common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc index 4f9d83f..43ecf15 100644 --- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc +++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc @@ -186,7 +186,7 @@ style "toolbar_entry" { style "chrome-gtk-frame" { ChromeGtkFrame::frame-color = "#2f343b" - ChromeGtkFrame::inactive-frame-color = "#2f343b" + ChromeGtkFrame::inactive-frame-color = "#32383F" ChromeGtkFrame::frame-gradient-size = 0 ChromeGtkFrame::frame-gradient-color = shade(0.5, @bg_color) diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc index 25fb4dd..96df39c 100644 --- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc +++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc @@ -131,7 +131,7 @@ style "toolbar_entry" { style "chrome-gtk-frame" { ChromeGtkFrame::frame-color = "#e7e8eb" - ChromeGtkFrame::inactive-frame-color = "#e7e8eb" + ChromeGtkFrame::inactive-frame-color = "#EFF0F2" ChromeGtkFrame::frame-gradient-size = 0 ChromeGtkFrame::frame-gradient-color = shade(0.5, @bg_color) From fe924d140ae8a1c576979731613e064c2feb75cf Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 14 Aug 2015 00:24:01 +0200 Subject: [PATCH 06/10] update xfce-notify colors --- common/xfce-notify-4.0/gtkrc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/xfce-notify-4.0/gtkrc b/common/xfce-notify-4.0/gtkrc index 5958d45..05ed853 100644 --- a/common/xfce-notify-4.0/gtkrc +++ b/common/xfce-notify-4.0/gtkrc @@ -14,8 +14,8 @@ style "notify-button" { bg[PRELIGHT] = "#5C6070" bg[ACTIVE] = @selected_bg_color - fg[NORMAL] = "#A8ADB5" - fg[PRELIGHT] = "#A8ADB5" + fg[NORMAL] = "#BAC3CF" + fg[PRELIGHT] = "#BAC3CF" fg[ACTIVE] = @selected_fg_color engine "murrine" { @@ -29,9 +29,9 @@ style "notify-button" { style "notify-text" { GtkWidget::link-color = @link_color - fg[NORMAL] = "#C0C5CF" - fg[PRELIGHT] = "#C0C5CF" - fg[ACTIVE] = "#C0C5CF" + fg[NORMAL] = "#BAC3CF" + fg[PRELIGHT] = "#BAC3CF" + fg[ACTIVE] = "#BAC3CF" engine "murrine" { textstyle = 0 From 64705797d9692d0cb6e2ecb84fe7a1a949c592ea Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 14 Aug 2015 00:26:50 +0200 Subject: [PATCH 07/10] tweak checked popover menuitems --- common/gtk-3.0/3.14/gtk-contained-dark.css | 4 +++- common/gtk-3.0/3.14/gtk-contained-darker.css | 4 +++- common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 4 +++- common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 4 +++- common/gtk-3.0/3.14/gtk-contained-solid.css | 4 +++- common/gtk-3.0/3.14/gtk-contained.css | 4 +++- common/gtk-3.0/3.14/sass/_common.scss | 3 ++- common/gtk-3.0/3.16/gtk-contained-dark.css | 4 +++- common/gtk-3.0/3.16/gtk-contained-darker.css | 4 +++- common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 4 +++- common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 4 +++- common/gtk-3.0/3.16/gtk-contained-solid.css | 4 +++- common/gtk-3.0/3.16/gtk-contained.css | 4 +++- common/gtk-3.0/3.16/sass/_common.scss | 3 ++- 14 files changed, 40 insertions(+), 14 deletions(-) diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css index 1855f44..eb0bf39 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -672,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #4b4f59; } + .menuitem.button.flat:checked { + color: #D3DAE3; } /********* * Links * @@ -2509,7 +2511,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css index aea037c..6527a56 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -672,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -2510,7 +2512,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css index ee7935c..178b3af 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css @@ -672,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #4b4f59; } + .menuitem.button.flat:checked { + color: #D3DAE3; } /********* * Links * @@ -2509,7 +2511,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css index 9635c04..5ce2657 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css @@ -672,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -2510,7 +2512,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css index 3d506be..a804228 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -672,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -2509,7 +2511,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index c01f5d5..89e41ca 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -672,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -2509,7 +2511,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index 49eb41f..d9e56c9 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -736,9 +736,10 @@ $_dot_color: $selected_bg_color; border-radius: 2px; &:hover { background-color: mix($fg_color,$bg_color,5%); } - &:selected, &:checked, &:active { + &:active, &:selected { @extend %selected_items; } + &:checked { color: $fg_color; } } /********* diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index 9c16d81..4819a39 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -672,6 +672,8 @@ GtkTextView { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #4b4f59; } + .menuitem.button.flat:checked { + color: #D3DAE3; } /********* * Links * @@ -2433,7 +2435,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, -.label:selected:hover, .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css index 2056939..84a241a 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -672,6 +672,8 @@ GtkTextView { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -2434,7 +2436,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, -.label:selected:hover, .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css index 7629519..7a4ae0c 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css @@ -672,6 +672,8 @@ GtkTextView { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #4b4f59; } + .menuitem.button.flat:checked { + color: #D3DAE3; } /********* * Links * @@ -2433,7 +2435,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, -.label:selected:hover, .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css index a77297f..f0578bb 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css @@ -672,6 +672,8 @@ GtkTextView { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -2434,7 +2436,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, -.label:selected:hover, .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css index b62274a..75064e1 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -672,6 +672,8 @@ GtkTextView { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -2433,7 +2435,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, -.label:selected:hover, .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 750924f..4cea811 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -672,6 +672,8 @@ GtkTextView { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -2433,7 +2435,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, -.label:selected:hover, .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 9c0150f..68d56d8 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -736,9 +736,10 @@ $_dot_color: $selected_bg_color; border-radius: 2px; &:hover { background-color: mix($fg_color,$bg_color,5%); } - &:selected, &:checked, &:active { + &:active, &:selected { @extend %selected_items; } + &:checked { color: $fg_color; } } /********* From 74c329df5346290c0ce9e5d3bcdf781ad7604788 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 14 Aug 2015 14:04:05 +0200 Subject: [PATCH 08/10] some gnome-shell 3.14 fixes --- common/gnome-shell/3.14/gnome-shell.css | 7 +++++-- common/gnome-shell/3.14/sass/_common.scss | 11 ++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/common/gnome-shell/3.14/gnome-shell.css b/common/gnome-shell/3.14/gnome-shell.css index 5814fdf..9d3df68 100644 --- a/common/gnome-shell/3.14/gnome-shell.css +++ b/common/gnome-shell/3.14/gnome-shell.css @@ -242,7 +242,7 @@ StScrollBar { .modal-dialog > StBoxLayout:first-child { padding: 20px 10px 10px 10px; } .modal-dialog-button-box { - spacing: 0; + spacing: 10px; margin: 0px; padding: 14px 10px; background: none; @@ -863,7 +863,7 @@ StScrollBar { .calendar-today:hover { font-weight: bold; color: #ffffff; - background-color: #5294E2; + background: #5294E2, url("misc/null.svg"); border-width: 0; } .calendar-day-with-events { @@ -1455,6 +1455,9 @@ StScrollBar { color: #BAC3CF; padding-top: 12px; padding-bottom: 12px; } + .summary-boxpointer #summary-right-click-menu .popup-menu-item:active { + color: #ffffff; + background-color: #5294E2; } .summary-boxpointer-stack-scrollview { max-height: 18em; padding-top: 8px; diff --git a/common/gnome-shell/3.14/sass/_common.scss b/common/gnome-shell/3.14/sass/_common.scss index 93fcd61..9697050 100644 --- a/common/gnome-shell/3.14/sass/_common.scss +++ b/common/gnome-shell/3.14/sass/_common.scss @@ -240,7 +240,7 @@ StScrollBar { } &-button-box { - spacing: 0; + spacing: 10px; margin: 0px; padding: 14px 10px; background: none; @@ -256,7 +256,7 @@ StScrollBar { } } - .run-dialog-entry { width: 21em; } + .run-dialog-entry { width: 21em;} .run-dialog-error-box { padding-top: 5px; spacing: 5px; @@ -1094,7 +1094,7 @@ StScrollBar { .calendar-today:hover { font-weight: bold; color: $selected_fg_color; - background-color: $selected_bg_color; + background: $selected_bg_color, url("misc/null.svg"); border-width: 0; } @@ -1830,6 +1830,11 @@ StScrollBar { color: $osd_fg_color; padding-top: 12px; padding-bottom: 12px; + + .popup-menu-item:active { + color: $selected_fg_color; + background-color: $selected_bg_color; + } } &-stack-scrollview { From f76a202fb84e57a7af9e24fa04be8d0f590612fd Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 16 Aug 2015 19:42:29 +0200 Subject: [PATCH 09/10] gnome-shell: fix tab switcher padding --- common/gnome-shell/3.16/gnome-shell.css | 2 +- common/gnome-shell/3.16/sass/_common.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index 70ab7da..be123aa 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -516,7 +516,7 @@ StScrollBar { padding: 8px; border-radius: 2px; } .switcher-list .item-box:outlined { - padding: 6px; + padding: 8px; border: 1px solid #5294E2; } .switcher-list .item-box:selected { color: #ffffff; diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index 2b8dddb..a6a2136 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -653,7 +653,7 @@ StScrollBar { border-radius: 2px; &:outlined { - padding: 6px; + padding: 8px; border: 1px solid $selected_bg_color; } From 8caf355a45d60020ee7336594b336c2861d2f932 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 16 Aug 2015 19:44:12 +0200 Subject: [PATCH 10/10] gnome-shell: fix submenu font-weight --- common/gnome-shell/3.16/gnome-shell.css | 1 + common/gnome-shell/3.16/sass/_common.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index be123aa..0333c49 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -420,6 +420,7 @@ StScrollBar { .popup-menu .popup-menu-item:rtl { padding: 0.4em 0em 0.4em 3em; } .popup-menu .popup-menu-item:checked { + font-weight: normal; background: none; box-shadow: none; border-image: url("light-assets/menu/submenu-open.svg") 9 9 9 9; } diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index a6a2136..76880e8 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -523,6 +523,7 @@ StScrollBar { &:rtl { padding: .4em 0em .4em 3em; } &:checked { + font-weight: normal; background: none; box-shadow: none; border-image: url("#{$asset_path}/menu/submenu-open.svg") 9 9 9 9;