From 150d6f3267383e8ac499885baa46f4fc76310696 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 31 Aug 2015 01:59:13 +0200 Subject: fix wrong image path --- 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 eecc3a4..807f663 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -469,7 +469,7 @@ StScrollBar { margin: 10px 0px; background-color: transparent; border: none; - border-image: url("common-assets/menu-separator.svg") 1 1 1 1; } + border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } .background-menu { -boxpointer-gap: 4px; diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index 2578ae7..0d8c3a1 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -587,7 +587,7 @@ StScrollBar { margin: 10px 0px; background-color: transparent; border: none; - border-image: url("common-assets/menu-separator.svg") 1 1 1 1; + border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } // Background menu -- cgit v1.2.3 From b500afd71ced94c224a06d019bddfcd27e92c3e9 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 31 Aug 2015 02:24:43 +0200 Subject: fix black border in transmission window --- 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/_applications.scss | 8 ++++++++ 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/_applications.scss | 8 ++++++++ 14 files changed, 64 insertions(+) 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 33af2ea..407aa6a 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -2933,6 +2933,10 @@ TotemGrilo.vertical GdMainView.frame { SynapseGuiViewDefault *:selected { background-color: #5294E2; } +.tr-workarea .undershoot, +.tr-workarea .overshoot { + border-color: transparent; } + .gnome-panel-menu-bar, PanelApplet > GtkMenuBar.menubar, PanelToplevel, 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 907ac95..d866c73 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -2934,6 +2934,10 @@ TotemGrilo.vertical GdMainView.frame { SynapseGuiViewDefault *:selected { background-color: #5294E2; } +.tr-workarea .undershoot, +.tr-workarea .overshoot { + border-color: transparent; } + .gnome-panel-menu-bar, PanelApplet > GtkMenuBar.menubar, PanelToplevel, 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 17ad721..5126e07 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 @@ -2933,6 +2933,10 @@ TotemGrilo.vertical GdMainView.frame { SynapseGuiViewDefault *:selected { background-color: #5294E2; } +.tr-workarea .undershoot, +.tr-workarea .overshoot { + border-color: transparent; } + .gnome-panel-menu-bar, PanelApplet > GtkMenuBar.menubar, PanelToplevel, 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 e257d0d..567353b 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 @@ -2934,6 +2934,10 @@ TotemGrilo.vertical GdMainView.frame { SynapseGuiViewDefault *:selected { background-color: #5294E2; } +.tr-workarea .undershoot, +.tr-workarea .overshoot { + border-color: transparent; } + .gnome-panel-menu-bar, PanelApplet > GtkMenuBar.menubar, PanelToplevel, 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 544f5b7..bdd5612 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -2933,6 +2933,10 @@ TotemGrilo.vertical GdMainView.frame { SynapseGuiViewDefault *:selected { background-color: #5294E2; } +.tr-workarea .undershoot, +.tr-workarea .overshoot { + border-color: transparent; } + .gnome-panel-menu-bar, PanelApplet > GtkMenuBar.menubar, PanelToplevel, diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 44ad237..2b2d3cc 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -2933,6 +2933,10 @@ TotemGrilo.vertical GdMainView.frame { SynapseGuiViewDefault *:selected { background-color: #5294E2; } +.tr-workarea .undershoot, +.tr-workarea .overshoot { + border-color: transparent; } + .gnome-panel-menu-bar, PanelApplet > GtkMenuBar.menubar, PanelToplevel, diff --git a/common/gtk-3.0/3.14/sass/_applications.scss b/common/gtk-3.0/3.14/sass/_applications.scss index cbf5da2..54833f7 100644 --- a/common/gtk-3.0/3.14/sass/_applications.scss +++ b/common/gtk-3.0/3.14/sass/_applications.scss @@ -400,6 +400,14 @@ TotemGrilo.vertical GdMainView.frame { // SynapseGuiViewDefault *:selected { background-color: $selected_bg_color; } +// +// Transmission +// +.tr-workarea .undershoot, +.tr-workarea .overshoot { + border-color: transparent; // Remove black border on over- and undershoot +} + // // Fallback Mode/Budgie Panel // 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 5198944..d738b0f 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -2899,6 +2899,10 @@ TotemGrilo.vertical GdMainView.frame { SynapseGuiViewDefault *:selected { background-color: #5294E2; } +.tr-workarea .undershoot, +.tr-workarea .overshoot { + border-color: transparent; } + .gnome-panel-menu-bar, PanelApplet > GtkMenuBar.menubar, PanelToplevel, 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 bf9231f..794cbdc 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -2900,6 +2900,10 @@ TotemGrilo.vertical GdMainView.frame { SynapseGuiViewDefault *:selected { background-color: #5294E2; } +.tr-workarea .undershoot, +.tr-workarea .overshoot { + border-color: transparent; } + .gnome-panel-menu-bar, PanelApplet > GtkMenuBar.menubar, PanelToplevel, 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 8a16555..b0ab6a2 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 @@ -2899,6 +2899,10 @@ TotemGrilo.vertical GdMainView.frame { SynapseGuiViewDefault *:selected { background-color: #5294E2; } +.tr-workarea .undershoot, +.tr-workarea .overshoot { + border-color: transparent; } + .gnome-panel-menu-bar, PanelApplet > GtkMenuBar.menubar, PanelToplevel, 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 9691287..23095fb 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 @@ -2900,6 +2900,10 @@ TotemGrilo.vertical GdMainView.frame { SynapseGuiViewDefault *:selected { background-color: #5294E2; } +.tr-workarea .undershoot, +.tr-workarea .overshoot { + border-color: transparent; } + .gnome-panel-menu-bar, PanelApplet > GtkMenuBar.menubar, PanelToplevel, 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 3ec8a8c..180d88a 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -2899,6 +2899,10 @@ TotemGrilo.vertical GdMainView.frame { SynapseGuiViewDefault *:selected { background-color: #5294E2; } +.tr-workarea .undershoot, +.tr-workarea .overshoot { + border-color: transparent; } + .gnome-panel-menu-bar, PanelApplet > GtkMenuBar.menubar, PanelToplevel, diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index d960ac8..1b23841 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -2899,6 +2899,10 @@ TotemGrilo.vertical GdMainView.frame { SynapseGuiViewDefault *:selected { background-color: #5294E2; } +.tr-workarea .undershoot, +.tr-workarea .overshoot { + border-color: transparent; } + .gnome-panel-menu-bar, PanelApplet > GtkMenuBar.menubar, PanelToplevel, diff --git a/common/gtk-3.0/3.16/sass/_applications.scss b/common/gtk-3.0/3.16/sass/_applications.scss index 63eda9c..7dc0323 100644 --- a/common/gtk-3.0/3.16/sass/_applications.scss +++ b/common/gtk-3.0/3.16/sass/_applications.scss @@ -448,6 +448,14 @@ TotemGrilo.vertical GdMainView.frame { // SynapseGuiViewDefault *:selected { background-color: $selected_bg_color; } +// +// Transmission +// +.tr-workarea .undershoot, +.tr-workarea .overshoot { + border-color: transparent; // Remove black border on over- and undershoot +} + // // Fallback Mode/Budgie Panel // -- cgit v1.2.3 From 3f636a76f69a00c481c83f7b842feab04b566358 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 3 Sep 2015 14:50:33 +0200 Subject: nemo sidebar fixes --- common/gtk-3.0/3.14/gtk-contained-dark.css | 87 ++++------------------ common/gtk-3.0/3.14/gtk-contained-darker.css | 87 ++++------------------ common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 87 ++++------------------ common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 87 ++++------------------ common/gtk-3.0/3.14/gtk-contained-solid.css | 87 ++++------------------ common/gtk-3.0/3.14/gtk-contained.css | 87 ++++------------------ common/gtk-3.0/3.14/sass/_transparent_widgets.scss | 4 +- 7 files changed, 91 insertions(+), 435 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 407aa6a..fa8cdc9 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -3534,195 +3534,138 @@ MarlinViewWindow.csd.background, MarlinViewWindow .source-list, MarlinViewWindow .source-list.view, MarlinViewWindow .source-list.view:prelight { background-color: transparent; } -GtkFileChooserDialog GtkBox.sidebar, -NautilusWindow GtkBox.sidebar, -NemoWindow GtkBox.sidebar, -MarlinViewWindow GtkBox.sidebar { - background-color: transparent; } - GtkFileChooserDialog .sidebar, GtkFileChooserDialog MarlinPlacesSidebar, -GtkFileChooserDialog NemoPlacesSidebar, NautilusWindow .sidebar, NautilusWindow MarlinPlacesSidebar, -NautilusWindow NemoPlacesSidebar, NemoWindow .sidebar, NemoWindow MarlinPlacesSidebar, -NemoWindow NemoPlacesSidebar, -MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindow NemoPlacesSidebar { +MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar { background-color: rgba(60, 64, 73, 0.95); } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row, - GtkFileChooserDialog NemoPlacesSidebar .view, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row, NautilusWindow .sidebar .view, NautilusWindow .sidebar .source-list.sidebar row, NautilusWindow MarlinPlacesSidebar .view, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row, - NautilusWindow NemoPlacesSidebar .view, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row, NemoWindow .sidebar .view, NemoWindow .sidebar .source-list.sidebar row, NemoWindow MarlinPlacesSidebar .view, NemoWindow MarlinPlacesSidebar .source-list.sidebar row, - NemoWindow NemoPlacesSidebar .view, - 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 { + MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row { background-color: transparent; color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.image, - GtkFileChooserDialog NemoPlacesSidebar .view.image, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.image, NautilusWindow .sidebar .view.image, NautilusWindow .sidebar .source-list.sidebar row.image, NautilusWindow MarlinPlacesSidebar .view.image, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.image, - NautilusWindow NemoPlacesSidebar .view.image, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row.image, NemoWindow .sidebar .view.image, NemoWindow .sidebar .source-list.sidebar row.image, NemoWindow MarlinPlacesSidebar .view.image, NemoWindow MarlinPlacesSidebar .source-list.sidebar row.image, - 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 { + MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image { 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, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - GtkFileChooserDialog NemoPlacesSidebar .view.cell:selected, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.cell:selected, NautilusWindow .sidebar .view.cell:selected, NautilusWindow .sidebar .source-list.sidebar row.cell:selected, NautilusWindow MarlinPlacesSidebar .view.cell:selected, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - NautilusWindow NemoPlacesSidebar .view.cell:selected, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected, NemoWindow .sidebar .view.cell:selected, NemoWindow .sidebar .source-list.sidebar row.cell:selected, NemoWindow MarlinPlacesSidebar .view.cell:selected, NemoWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - NemoWindow NemoPlacesSidebar .view.cell:selected, - NemoWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected, - MarlinViewWindow .sidebar .view.cell:selected, MarlinViewWindow .sidebar .source-list.sidebar row.cell:selected, MarlinViewWindow MarlinPlacesSidebar .view.cell:selected, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, MarlinViewWindow NemoPlacesSidebar .view.cell:selected, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected { + MarlinViewWindow .sidebar .view.cell:selected, MarlinViewWindow .sidebar .source-list.sidebar row.cell:selected, MarlinViewWindow MarlinPlacesSidebar .view.cell:selected, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected { background-color: #5294E2; color: #ffffff; } GtkFileChooserDialog .sidebar.frame, GtkFileChooserDialog MarlinPlacesSidebar.frame, - GtkFileChooserDialog NemoPlacesSidebar.frame, NautilusWindow .sidebar.frame, NautilusWindow MarlinPlacesSidebar.frame, - NautilusWindow NemoPlacesSidebar.frame, NemoWindow .sidebar.frame, NemoWindow MarlinPlacesSidebar.frame, - NemoWindow NemoPlacesSidebar.frame, - MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { + MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame { color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, GtkFileChooserDialog MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator, GtkFileChooserDialog NemoPlacesSidebar .separator, - GtkFileChooserDialog NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar GtkFileChooserDialog NemoPlacesSidebar .view.separator, NautilusWindow .sidebar .separator, + GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator, NautilusWindow .sidebar .separator, NautilusWindow GtkPlacesSidebar.sidebar .view.separator, NautilusWindow MarlinPlacesSidebar .separator, NautilusWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NautilusWindow MarlinPlacesSidebar .view.separator, NautilusWindow NemoPlacesSidebar .separator, - NautilusWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NautilusWindow NemoPlacesSidebar .view.separator, NemoWindow .sidebar .separator, + GtkPlacesSidebar.sidebar NautilusWindow MarlinPlacesSidebar .view.separator, NemoWindow .sidebar .separator, NemoWindow GtkPlacesSidebar.sidebar .view.separator, NemoWindow MarlinPlacesSidebar .separator, NemoWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NemoWindow MarlinPlacesSidebar .view.separator, NemoWindow NemoPlacesSidebar .separator, - NemoWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NemoWindow NemoPlacesSidebar .view.separator, MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow MarlinPlacesSidebar .separator, MarlinViewWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator, MarlinViewWindow NemoPlacesSidebar .separator, MarlinViewWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow NemoPlacesSidebar .view.separator { + GtkPlacesSidebar.sidebar NemoWindow MarlinPlacesSidebar .view.separator, MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow MarlinPlacesSidebar .separator, MarlinViewWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator { color: transparent; } GtkFileChooserDialog .sidebar .scrollbar.trough, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.trough, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.trough, NautilusWindow .sidebar .scrollbar.trough, NautilusWindow MarlinPlacesSidebar .scrollbar.trough, - NautilusWindow NemoPlacesSidebar .scrollbar.trough, NemoWindow .sidebar .scrollbar.trough, NemoWindow MarlinPlacesSidebar .scrollbar.trough, - NemoWindow NemoPlacesSidebar .scrollbar.trough, - MarlinViewWindow .sidebar .scrollbar.trough, MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough, MarlinViewWindow NemoPlacesSidebar .scrollbar.trough { + MarlinViewWindow .sidebar .scrollbar.trough, MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough { background-color: transparent; border-color: transparent; } GtkFileChooserDialog .sidebar .scrollbar.slider, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider, NautilusWindow .sidebar .scrollbar.slider, NautilusWindow MarlinPlacesSidebar .scrollbar.slider, - NautilusWindow NemoPlacesSidebar .scrollbar.slider, NemoWindow .sidebar .scrollbar.slider, NemoWindow MarlinPlacesSidebar .scrollbar.slider, - NemoWindow NemoPlacesSidebar .scrollbar.slider, - MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { + MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, NautilusWindow .sidebar .scrollbar.slider:hover, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:hover, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:hover, NemoWindow .sidebar .scrollbar.slider:hover, 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 { + MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover { background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, NautilusWindow .sidebar .scrollbar.slider:prelight:active, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:prelight:active, NemoWindow .sidebar .scrollbar.slider:prelight:active, NemoWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, - NemoWindow NemoPlacesSidebar .scrollbar.slider:prelight:active, - MarlinViewWindow .sidebar .scrollbar.slider:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:prelight:active { + MarlinViewWindow .sidebar .scrollbar.slider:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active { background-color: #5294E2; } GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune, NautilusWindow .sidebar .scrollbar.slider.fine-tune, NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, - NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune, NemoWindow .sidebar .scrollbar.slider.fine-tune, NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, - NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune, - MarlinViewWindow .sidebar .scrollbar.slider.fine-tune, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune { + MarlinViewWindow .sidebar .scrollbar.slider.fine-tune, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune { border-width: 4px; } GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, NautilusWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, NemoWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - MarlinViewWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active { + MarlinViewWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active { background-color: #5294E2; } GtkFileChooserDialog .sidebar .scrollbar.slider:insensitive, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:insensitive, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:insensitive, NautilusWindow .sidebar .scrollbar.slider:insensitive, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:insensitive, NemoWindow .sidebar .scrollbar.slider:insensitive, NemoWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, - NemoWindow NemoPlacesSidebar .scrollbar.slider:insensitive, - MarlinViewWindow .sidebar .scrollbar.slider:insensitive, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:insensitive { + MarlinViewWindow .sidebar .scrollbar.slider:insensitive, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive { background-color: transparent; } GtkFileChooserDialog.maximized .sidebar, 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 d866c73..e9bd3d1 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -3525,195 +3525,138 @@ MarlinViewWindow.csd.background, MarlinViewWindow .source-list, MarlinViewWindow .source-list.view, MarlinViewWindow .source-list.view:prelight { background-color: transparent; } -GtkFileChooserDialog GtkBox.sidebar, -NautilusWindow GtkBox.sidebar, -NemoWindow GtkBox.sidebar, -MarlinViewWindow GtkBox.sidebar { - background-color: transparent; } - GtkFileChooserDialog .sidebar, GtkFileChooserDialog MarlinPlacesSidebar, -GtkFileChooserDialog NemoPlacesSidebar, NautilusWindow .sidebar, NautilusWindow MarlinPlacesSidebar, -NautilusWindow NemoPlacesSidebar, NemoWindow .sidebar, NemoWindow MarlinPlacesSidebar, -NemoWindow NemoPlacesSidebar, -MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindow NemoPlacesSidebar { +MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar { background-color: rgba(60, 64, 73, 0.95); } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row, - GtkFileChooserDialog NemoPlacesSidebar .view, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row, NautilusWindow .sidebar .view, NautilusWindow .sidebar .source-list.sidebar row, NautilusWindow MarlinPlacesSidebar .view, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row, - NautilusWindow NemoPlacesSidebar .view, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row, NemoWindow .sidebar .view, NemoWindow .sidebar .source-list.sidebar row, NemoWindow MarlinPlacesSidebar .view, NemoWindow MarlinPlacesSidebar .source-list.sidebar row, - NemoWindow NemoPlacesSidebar .view, - 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 { + MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row { background-color: transparent; color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.image, - GtkFileChooserDialog NemoPlacesSidebar .view.image, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.image, NautilusWindow .sidebar .view.image, NautilusWindow .sidebar .source-list.sidebar row.image, NautilusWindow MarlinPlacesSidebar .view.image, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.image, - NautilusWindow NemoPlacesSidebar .view.image, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row.image, NemoWindow .sidebar .view.image, NemoWindow .sidebar .source-list.sidebar row.image, NemoWindow MarlinPlacesSidebar .view.image, NemoWindow MarlinPlacesSidebar .source-list.sidebar row.image, - 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 { + MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image { 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, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - GtkFileChooserDialog NemoPlacesSidebar .view.cell:selected, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.cell:selected, NautilusWindow .sidebar .view.cell:selected, NautilusWindow .sidebar .source-list.sidebar row.cell:selected, NautilusWindow MarlinPlacesSidebar .view.cell:selected, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - NautilusWindow NemoPlacesSidebar .view.cell:selected, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected, NemoWindow .sidebar .view.cell:selected, NemoWindow .sidebar .source-list.sidebar row.cell:selected, NemoWindow MarlinPlacesSidebar .view.cell:selected, NemoWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - NemoWindow NemoPlacesSidebar .view.cell:selected, - NemoWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected, - MarlinViewWindow .sidebar .view.cell:selected, MarlinViewWindow .sidebar .source-list.sidebar row.cell:selected, MarlinViewWindow MarlinPlacesSidebar .view.cell:selected, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, MarlinViewWindow NemoPlacesSidebar .view.cell:selected, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected { + MarlinViewWindow .sidebar .view.cell:selected, MarlinViewWindow .sidebar .source-list.sidebar row.cell:selected, MarlinViewWindow MarlinPlacesSidebar .view.cell:selected, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected { background-color: #5294E2; color: #ffffff; } GtkFileChooserDialog .sidebar.frame, GtkFileChooserDialog MarlinPlacesSidebar.frame, - GtkFileChooserDialog NemoPlacesSidebar.frame, NautilusWindow .sidebar.frame, NautilusWindow MarlinPlacesSidebar.frame, - NautilusWindow NemoPlacesSidebar.frame, NemoWindow .sidebar.frame, NemoWindow MarlinPlacesSidebar.frame, - NemoWindow NemoPlacesSidebar.frame, - MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { + MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame { color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, GtkFileChooserDialog MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator, GtkFileChooserDialog NemoPlacesSidebar .separator, - GtkFileChooserDialog NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar GtkFileChooserDialog NemoPlacesSidebar .view.separator, NautilusWindow .sidebar .separator, + GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator, NautilusWindow .sidebar .separator, NautilusWindow GtkPlacesSidebar.sidebar .view.separator, NautilusWindow MarlinPlacesSidebar .separator, NautilusWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NautilusWindow MarlinPlacesSidebar .view.separator, NautilusWindow NemoPlacesSidebar .separator, - NautilusWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NautilusWindow NemoPlacesSidebar .view.separator, NemoWindow .sidebar .separator, + GtkPlacesSidebar.sidebar NautilusWindow MarlinPlacesSidebar .view.separator, NemoWindow .sidebar .separator, NemoWindow GtkPlacesSidebar.sidebar .view.separator, NemoWindow MarlinPlacesSidebar .separator, NemoWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NemoWindow MarlinPlacesSidebar .view.separator, NemoWindow NemoPlacesSidebar .separator, - NemoWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NemoWindow NemoPlacesSidebar .view.separator, MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow MarlinPlacesSidebar .separator, MarlinViewWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator, MarlinViewWindow NemoPlacesSidebar .separator, MarlinViewWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow NemoPlacesSidebar .view.separator { + GtkPlacesSidebar.sidebar NemoWindow MarlinPlacesSidebar .view.separator, MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow MarlinPlacesSidebar .separator, MarlinViewWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator { color: transparent; } GtkFileChooserDialog .sidebar .scrollbar.trough, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.trough, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.trough, NautilusWindow .sidebar .scrollbar.trough, NautilusWindow MarlinPlacesSidebar .scrollbar.trough, - NautilusWindow NemoPlacesSidebar .scrollbar.trough, NemoWindow .sidebar .scrollbar.trough, NemoWindow MarlinPlacesSidebar .scrollbar.trough, - NemoWindow NemoPlacesSidebar .scrollbar.trough, - MarlinViewWindow .sidebar .scrollbar.trough, MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough, MarlinViewWindow NemoPlacesSidebar .scrollbar.trough { + MarlinViewWindow .sidebar .scrollbar.trough, MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough { background-color: transparent; border-color: transparent; } GtkFileChooserDialog .sidebar .scrollbar.slider, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider, NautilusWindow .sidebar .scrollbar.slider, NautilusWindow MarlinPlacesSidebar .scrollbar.slider, - NautilusWindow NemoPlacesSidebar .scrollbar.slider, NemoWindow .sidebar .scrollbar.slider, NemoWindow MarlinPlacesSidebar .scrollbar.slider, - NemoWindow NemoPlacesSidebar .scrollbar.slider, - MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { + MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, NautilusWindow .sidebar .scrollbar.slider:hover, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:hover, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:hover, NemoWindow .sidebar .scrollbar.slider:hover, 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 { + MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover { background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, NautilusWindow .sidebar .scrollbar.slider:prelight:active, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:prelight:active, NemoWindow .sidebar .scrollbar.slider:prelight:active, NemoWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, - NemoWindow NemoPlacesSidebar .scrollbar.slider:prelight:active, - MarlinViewWindow .sidebar .scrollbar.slider:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:prelight:active { + MarlinViewWindow .sidebar .scrollbar.slider:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active { background-color: #5294E2; } GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune, NautilusWindow .sidebar .scrollbar.slider.fine-tune, NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, - NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune, NemoWindow .sidebar .scrollbar.slider.fine-tune, NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, - NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune, - MarlinViewWindow .sidebar .scrollbar.slider.fine-tune, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune { + MarlinViewWindow .sidebar .scrollbar.slider.fine-tune, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune { border-width: 4px; } GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, NautilusWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, NemoWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - MarlinViewWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active { + MarlinViewWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active { background-color: #5294E2; } GtkFileChooserDialog .sidebar .scrollbar.slider:insensitive, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:insensitive, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:insensitive, NautilusWindow .sidebar .scrollbar.slider:insensitive, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:insensitive, NemoWindow .sidebar .scrollbar.slider:insensitive, NemoWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, - NemoWindow NemoPlacesSidebar .scrollbar.slider:insensitive, - MarlinViewWindow .sidebar .scrollbar.slider:insensitive, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:insensitive { + MarlinViewWindow .sidebar .scrollbar.slider:insensitive, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive { background-color: transparent; } GtkFileChooserDialog.maximized .sidebar, 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 5126e07..1fff08c 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 @@ -3534,195 +3534,138 @@ MarlinViewWindow.csd.background, MarlinViewWindow .source-list, MarlinViewWindow .source-list.view, MarlinViewWindow .source-list.view:prelight { background-color: transparent; } -GtkFileChooserDialog GtkBox.sidebar, -NautilusWindow GtkBox.sidebar, -NemoWindow GtkBox.sidebar, -MarlinViewWindow GtkBox.sidebar { - background-color: transparent; } - GtkFileChooserDialog .sidebar, GtkFileChooserDialog MarlinPlacesSidebar, -GtkFileChooserDialog NemoPlacesSidebar, NautilusWindow .sidebar, NautilusWindow MarlinPlacesSidebar, -NautilusWindow NemoPlacesSidebar, NemoWindow .sidebar, NemoWindow MarlinPlacesSidebar, -NemoWindow NemoPlacesSidebar, -MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindow NemoPlacesSidebar { +MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar { background-color: #3c4049; } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row, - GtkFileChooserDialog NemoPlacesSidebar .view, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row, NautilusWindow .sidebar .view, NautilusWindow .sidebar .source-list.sidebar row, NautilusWindow MarlinPlacesSidebar .view, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row, - NautilusWindow NemoPlacesSidebar .view, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row, NemoWindow .sidebar .view, NemoWindow .sidebar .source-list.sidebar row, NemoWindow MarlinPlacesSidebar .view, NemoWindow MarlinPlacesSidebar .source-list.sidebar row, - NemoWindow NemoPlacesSidebar .view, - 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 { + MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row { background-color: transparent; color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.image, - GtkFileChooserDialog NemoPlacesSidebar .view.image, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.image, NautilusWindow .sidebar .view.image, NautilusWindow .sidebar .source-list.sidebar row.image, NautilusWindow MarlinPlacesSidebar .view.image, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.image, - NautilusWindow NemoPlacesSidebar .view.image, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row.image, NemoWindow .sidebar .view.image, NemoWindow .sidebar .source-list.sidebar row.image, NemoWindow MarlinPlacesSidebar .view.image, NemoWindow MarlinPlacesSidebar .source-list.sidebar row.image, - 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 { + MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image { 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, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - GtkFileChooserDialog NemoPlacesSidebar .view.cell:selected, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.cell:selected, NautilusWindow .sidebar .view.cell:selected, NautilusWindow .sidebar .source-list.sidebar row.cell:selected, NautilusWindow MarlinPlacesSidebar .view.cell:selected, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - NautilusWindow NemoPlacesSidebar .view.cell:selected, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected, NemoWindow .sidebar .view.cell:selected, NemoWindow .sidebar .source-list.sidebar row.cell:selected, NemoWindow MarlinPlacesSidebar .view.cell:selected, NemoWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - NemoWindow NemoPlacesSidebar .view.cell:selected, - NemoWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected, - MarlinViewWindow .sidebar .view.cell:selected, MarlinViewWindow .sidebar .source-list.sidebar row.cell:selected, MarlinViewWindow MarlinPlacesSidebar .view.cell:selected, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, MarlinViewWindow NemoPlacesSidebar .view.cell:selected, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected { + MarlinViewWindow .sidebar .view.cell:selected, MarlinViewWindow .sidebar .source-list.sidebar row.cell:selected, MarlinViewWindow MarlinPlacesSidebar .view.cell:selected, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected { background-color: #5294E2; color: #ffffff; } GtkFileChooserDialog .sidebar.frame, GtkFileChooserDialog MarlinPlacesSidebar.frame, - GtkFileChooserDialog NemoPlacesSidebar.frame, NautilusWindow .sidebar.frame, NautilusWindow MarlinPlacesSidebar.frame, - NautilusWindow NemoPlacesSidebar.frame, NemoWindow .sidebar.frame, NemoWindow MarlinPlacesSidebar.frame, - NemoWindow NemoPlacesSidebar.frame, - MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { + MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame { color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, GtkFileChooserDialog MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator, GtkFileChooserDialog NemoPlacesSidebar .separator, - GtkFileChooserDialog NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar GtkFileChooserDialog NemoPlacesSidebar .view.separator, NautilusWindow .sidebar .separator, + GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator, NautilusWindow .sidebar .separator, NautilusWindow GtkPlacesSidebar.sidebar .view.separator, NautilusWindow MarlinPlacesSidebar .separator, NautilusWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NautilusWindow MarlinPlacesSidebar .view.separator, NautilusWindow NemoPlacesSidebar .separator, - NautilusWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NautilusWindow NemoPlacesSidebar .view.separator, NemoWindow .sidebar .separator, + GtkPlacesSidebar.sidebar NautilusWindow MarlinPlacesSidebar .view.separator, NemoWindow .sidebar .separator, NemoWindow GtkPlacesSidebar.sidebar .view.separator, NemoWindow MarlinPlacesSidebar .separator, NemoWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NemoWindow MarlinPlacesSidebar .view.separator, NemoWindow NemoPlacesSidebar .separator, - NemoWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NemoWindow NemoPlacesSidebar .view.separator, MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow MarlinPlacesSidebar .separator, MarlinViewWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator, MarlinViewWindow NemoPlacesSidebar .separator, MarlinViewWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow NemoPlacesSidebar .view.separator { + GtkPlacesSidebar.sidebar NemoWindow MarlinPlacesSidebar .view.separator, MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow MarlinPlacesSidebar .separator, MarlinViewWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator { color: transparent; } GtkFileChooserDialog .sidebar .scrollbar.trough, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.trough, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.trough, NautilusWindow .sidebar .scrollbar.trough, NautilusWindow MarlinPlacesSidebar .scrollbar.trough, - NautilusWindow NemoPlacesSidebar .scrollbar.trough, NemoWindow .sidebar .scrollbar.trough, NemoWindow MarlinPlacesSidebar .scrollbar.trough, - NemoWindow NemoPlacesSidebar .scrollbar.trough, - MarlinViewWindow .sidebar .scrollbar.trough, MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough, MarlinViewWindow NemoPlacesSidebar .scrollbar.trough { + MarlinViewWindow .sidebar .scrollbar.trough, MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough { background-color: transparent; border-color: transparent; } GtkFileChooserDialog .sidebar .scrollbar.slider, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider, NautilusWindow .sidebar .scrollbar.slider, NautilusWindow MarlinPlacesSidebar .scrollbar.slider, - NautilusWindow NemoPlacesSidebar .scrollbar.slider, NemoWindow .sidebar .scrollbar.slider, NemoWindow MarlinPlacesSidebar .scrollbar.slider, - NemoWindow NemoPlacesSidebar .scrollbar.slider, - MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { + MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, NautilusWindow .sidebar .scrollbar.slider:hover, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:hover, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:hover, NemoWindow .sidebar .scrollbar.slider:hover, 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 { + MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover { background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, NautilusWindow .sidebar .scrollbar.slider:prelight:active, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:prelight:active, NemoWindow .sidebar .scrollbar.slider:prelight:active, NemoWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, - NemoWindow NemoPlacesSidebar .scrollbar.slider:prelight:active, - MarlinViewWindow .sidebar .scrollbar.slider:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:prelight:active { + MarlinViewWindow .sidebar .scrollbar.slider:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active { background-color: #5294E2; } GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune, NautilusWindow .sidebar .scrollbar.slider.fine-tune, NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, - NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune, NemoWindow .sidebar .scrollbar.slider.fine-tune, NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, - NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune, - MarlinViewWindow .sidebar .scrollbar.slider.fine-tune, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune { + MarlinViewWindow .sidebar .scrollbar.slider.fine-tune, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune { border-width: 4px; } GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, NautilusWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, NemoWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - MarlinViewWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active { + MarlinViewWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active { background-color: #5294E2; } GtkFileChooserDialog .sidebar .scrollbar.slider:insensitive, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:insensitive, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:insensitive, NautilusWindow .sidebar .scrollbar.slider:insensitive, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:insensitive, NemoWindow .sidebar .scrollbar.slider:insensitive, NemoWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, - NemoWindow NemoPlacesSidebar .scrollbar.slider:insensitive, - MarlinViewWindow .sidebar .scrollbar.slider:insensitive, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:insensitive { + MarlinViewWindow .sidebar .scrollbar.slider:insensitive, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive { background-color: transparent; } GtkFileChooserDialog.maximized .sidebar, 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 567353b..b098f21 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 @@ -3525,195 +3525,138 @@ MarlinViewWindow.csd.background, MarlinViewWindow .source-list, MarlinViewWindow .source-list.view, MarlinViewWindow .source-list.view:prelight { background-color: transparent; } -GtkFileChooserDialog GtkBox.sidebar, -NautilusWindow GtkBox.sidebar, -NemoWindow GtkBox.sidebar, -MarlinViewWindow GtkBox.sidebar { - background-color: transparent; } - GtkFileChooserDialog .sidebar, GtkFileChooserDialog MarlinPlacesSidebar, -GtkFileChooserDialog NemoPlacesSidebar, NautilusWindow .sidebar, NautilusWindow MarlinPlacesSidebar, -NautilusWindow NemoPlacesSidebar, NemoWindow .sidebar, NemoWindow MarlinPlacesSidebar, -NemoWindow NemoPlacesSidebar, -MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindow NemoPlacesSidebar { +MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar { background-color: #3c4049; } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row, - GtkFileChooserDialog NemoPlacesSidebar .view, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row, NautilusWindow .sidebar .view, NautilusWindow .sidebar .source-list.sidebar row, NautilusWindow MarlinPlacesSidebar .view, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row, - NautilusWindow NemoPlacesSidebar .view, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row, NemoWindow .sidebar .view, NemoWindow .sidebar .source-list.sidebar row, NemoWindow MarlinPlacesSidebar .view, NemoWindow MarlinPlacesSidebar .source-list.sidebar row, - NemoWindow NemoPlacesSidebar .view, - 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 { + MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row { background-color: transparent; color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.image, - GtkFileChooserDialog NemoPlacesSidebar .view.image, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.image, NautilusWindow .sidebar .view.image, NautilusWindow .sidebar .source-list.sidebar row.image, NautilusWindow MarlinPlacesSidebar .view.image, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.image, - NautilusWindow NemoPlacesSidebar .view.image, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row.image, NemoWindow .sidebar .view.image, NemoWindow .sidebar .source-list.sidebar row.image, NemoWindow MarlinPlacesSidebar .view.image, NemoWindow MarlinPlacesSidebar .source-list.sidebar row.image, - 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 { + MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image { 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, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - GtkFileChooserDialog NemoPlacesSidebar .view.cell:selected, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.cell:selected, NautilusWindow .sidebar .view.cell:selected, NautilusWindow .sidebar .source-list.sidebar row.cell:selected, NautilusWindow MarlinPlacesSidebar .view.cell:selected, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - NautilusWindow NemoPlacesSidebar .view.cell:selected, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected, NemoWindow .sidebar .view.cell:selected, NemoWindow .sidebar .source-list.sidebar row.cell:selected, NemoWindow MarlinPlacesSidebar .view.cell:selected, NemoWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - NemoWindow NemoPlacesSidebar .view.cell:selected, - NemoWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected, - MarlinViewWindow .sidebar .view.cell:selected, MarlinViewWindow .sidebar .source-list.sidebar row.cell:selected, MarlinViewWindow MarlinPlacesSidebar .view.cell:selected, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, MarlinViewWindow NemoPlacesSidebar .view.cell:selected, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected { + MarlinViewWindow .sidebar .view.cell:selected, MarlinViewWindow .sidebar .source-list.sidebar row.cell:selected, MarlinViewWindow MarlinPlacesSidebar .view.cell:selected, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected { background-color: #5294E2; color: #ffffff; } GtkFileChooserDialog .sidebar.frame, GtkFileChooserDialog MarlinPlacesSidebar.frame, - GtkFileChooserDialog NemoPlacesSidebar.frame, NautilusWindow .sidebar.frame, NautilusWindow MarlinPlacesSidebar.frame, - NautilusWindow NemoPlacesSidebar.frame, NemoWindow .sidebar.frame, NemoWindow MarlinPlacesSidebar.frame, - NemoWindow NemoPlacesSidebar.frame, - MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { + MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame { color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, GtkFileChooserDialog MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator, GtkFileChooserDialog NemoPlacesSidebar .separator, - GtkFileChooserDialog NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar GtkFileChooserDialog NemoPlacesSidebar .view.separator, NautilusWindow .sidebar .separator, + GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator, NautilusWindow .sidebar .separator, NautilusWindow GtkPlacesSidebar.sidebar .view.separator, NautilusWindow MarlinPlacesSidebar .separator, NautilusWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NautilusWindow MarlinPlacesSidebar .view.separator, NautilusWindow NemoPlacesSidebar .separator, - NautilusWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NautilusWindow NemoPlacesSidebar .view.separator, NemoWindow .sidebar .separator, + GtkPlacesSidebar.sidebar NautilusWindow MarlinPlacesSidebar .view.separator, NemoWindow .sidebar .separator, NemoWindow GtkPlacesSidebar.sidebar .view.separator, NemoWindow MarlinPlacesSidebar .separator, NemoWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NemoWindow MarlinPlacesSidebar .view.separator, NemoWindow NemoPlacesSidebar .separator, - NemoWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NemoWindow NemoPlacesSidebar .view.separator, MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow MarlinPlacesSidebar .separator, MarlinViewWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator, MarlinViewWindow NemoPlacesSidebar .separator, MarlinViewWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow NemoPlacesSidebar .view.separator { + GtkPlacesSidebar.sidebar NemoWindow MarlinPlacesSidebar .view.separator, MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow MarlinPlacesSidebar .separator, MarlinViewWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator { color: transparent; } GtkFileChooserDialog .sidebar .scrollbar.trough, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.trough, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.trough, NautilusWindow .sidebar .scrollbar.trough, NautilusWindow MarlinPlacesSidebar .scrollbar.trough, - NautilusWindow NemoPlacesSidebar .scrollbar.trough, NemoWindow .sidebar .scrollbar.trough, NemoWindow MarlinPlacesSidebar .scrollbar.trough, - NemoWindow NemoPlacesSidebar .scrollbar.trough, - MarlinViewWindow .sidebar .scrollbar.trough, MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough, MarlinViewWindow NemoPlacesSidebar .scrollbar.trough { + MarlinViewWindow .sidebar .scrollbar.trough, MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough { background-color: transparent; border-color: transparent; } GtkFileChooserDialog .sidebar .scrollbar.slider, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider, NautilusWindow .sidebar .scrollbar.slider, NautilusWindow MarlinPlacesSidebar .scrollbar.slider, - NautilusWindow NemoPlacesSidebar .scrollbar.slider, NemoWindow .sidebar .scrollbar.slider, NemoWindow MarlinPlacesSidebar .scrollbar.slider, - NemoWindow NemoPlacesSidebar .scrollbar.slider, - MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { + MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, NautilusWindow .sidebar .scrollbar.slider:hover, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:hover, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:hover, NemoWindow .sidebar .scrollbar.slider:hover, 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 { + MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover { background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, NautilusWindow .sidebar .scrollbar.slider:prelight:active, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:prelight:active, NemoWindow .sidebar .scrollbar.slider:prelight:active, NemoWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, - NemoWindow NemoPlacesSidebar .scrollbar.slider:prelight:active, - MarlinViewWindow .sidebar .scrollbar.slider:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:prelight:active { + MarlinViewWindow .sidebar .scrollbar.slider:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active { background-color: #5294E2; } GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune, NautilusWindow .sidebar .scrollbar.slider.fine-tune, NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, - NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune, NemoWindow .sidebar .scrollbar.slider.fine-tune, NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, - NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune, - MarlinViewWindow .sidebar .scrollbar.slider.fine-tune, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune { + MarlinViewWindow .sidebar .scrollbar.slider.fine-tune, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune { border-width: 4px; } GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, NautilusWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, NemoWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - MarlinViewWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active { + MarlinViewWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active { background-color: #5294E2; } GtkFileChooserDialog .sidebar .scrollbar.slider:insensitive, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:insensitive, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:insensitive, NautilusWindow .sidebar .scrollbar.slider:insensitive, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:insensitive, NemoWindow .sidebar .scrollbar.slider:insensitive, NemoWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, - NemoWindow NemoPlacesSidebar .scrollbar.slider:insensitive, - MarlinViewWindow .sidebar .scrollbar.slider:insensitive, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:insensitive { + MarlinViewWindow .sidebar .scrollbar.slider:insensitive, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive { background-color: transparent; } GtkFileChooserDialog.maximized .sidebar, 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 bdd5612..61c273f 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -3524,195 +3524,138 @@ MarlinViewWindow.csd.background, MarlinViewWindow .source-list, MarlinViewWindow .source-list.view, MarlinViewWindow .source-list.view:prelight { background-color: transparent; } -GtkFileChooserDialog GtkBox.sidebar, -NautilusWindow GtkBox.sidebar, -NemoWindow GtkBox.sidebar, -MarlinViewWindow GtkBox.sidebar { - background-color: transparent; } - GtkFileChooserDialog .sidebar, GtkFileChooserDialog MarlinPlacesSidebar, -GtkFileChooserDialog NemoPlacesSidebar, NautilusWindow .sidebar, NautilusWindow MarlinPlacesSidebar, -NautilusWindow NemoPlacesSidebar, NemoWindow .sidebar, NemoWindow MarlinPlacesSidebar, -NemoWindow NemoPlacesSidebar, -MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindow NemoPlacesSidebar { +MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar { background-color: #3c4049; } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row, - GtkFileChooserDialog NemoPlacesSidebar .view, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row, NautilusWindow .sidebar .view, NautilusWindow .sidebar .source-list.sidebar row, NautilusWindow MarlinPlacesSidebar .view, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row, - NautilusWindow NemoPlacesSidebar .view, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row, NemoWindow .sidebar .view, NemoWindow .sidebar .source-list.sidebar row, NemoWindow MarlinPlacesSidebar .view, NemoWindow MarlinPlacesSidebar .source-list.sidebar row, - NemoWindow NemoPlacesSidebar .view, - 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 { + MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row { background-color: transparent; color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.image, - GtkFileChooserDialog NemoPlacesSidebar .view.image, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.image, NautilusWindow .sidebar .view.image, NautilusWindow .sidebar .source-list.sidebar row.image, NautilusWindow MarlinPlacesSidebar .view.image, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.image, - NautilusWindow NemoPlacesSidebar .view.image, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row.image, NemoWindow .sidebar .view.image, NemoWindow .sidebar .source-list.sidebar row.image, NemoWindow MarlinPlacesSidebar .view.image, NemoWindow MarlinPlacesSidebar .source-list.sidebar row.image, - 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 { + MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image { 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, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - GtkFileChooserDialog NemoPlacesSidebar .view.cell:selected, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.cell:selected, NautilusWindow .sidebar .view.cell:selected, NautilusWindow .sidebar .source-list.sidebar row.cell:selected, NautilusWindow MarlinPlacesSidebar .view.cell:selected, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - NautilusWindow NemoPlacesSidebar .view.cell:selected, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected, NemoWindow .sidebar .view.cell:selected, NemoWindow .sidebar .source-list.sidebar row.cell:selected, NemoWindow MarlinPlacesSidebar .view.cell:selected, NemoWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - NemoWindow NemoPlacesSidebar .view.cell:selected, - NemoWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected, - MarlinViewWindow .sidebar .view.cell:selected, MarlinViewWindow .sidebar .source-list.sidebar row.cell:selected, MarlinViewWindow MarlinPlacesSidebar .view.cell:selected, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, MarlinViewWindow NemoPlacesSidebar .view.cell:selected, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected { + MarlinViewWindow .sidebar .view.cell:selected, MarlinViewWindow .sidebar .source-list.sidebar row.cell:selected, MarlinViewWindow MarlinPlacesSidebar .view.cell:selected, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected { background-color: #5294E2; color: #ffffff; } GtkFileChooserDialog .sidebar.frame, GtkFileChooserDialog MarlinPlacesSidebar.frame, - GtkFileChooserDialog NemoPlacesSidebar.frame, NautilusWindow .sidebar.frame, NautilusWindow MarlinPlacesSidebar.frame, - NautilusWindow NemoPlacesSidebar.frame, NemoWindow .sidebar.frame, NemoWindow MarlinPlacesSidebar.frame, - NemoWindow NemoPlacesSidebar.frame, - MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { + MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame { color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, GtkFileChooserDialog MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator, GtkFileChooserDialog NemoPlacesSidebar .separator, - GtkFileChooserDialog NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar GtkFileChooserDialog NemoPlacesSidebar .view.separator, NautilusWindow .sidebar .separator, + GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator, NautilusWindow .sidebar .separator, NautilusWindow GtkPlacesSidebar.sidebar .view.separator, NautilusWindow MarlinPlacesSidebar .separator, NautilusWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NautilusWindow MarlinPlacesSidebar .view.separator, NautilusWindow NemoPlacesSidebar .separator, - NautilusWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NautilusWindow NemoPlacesSidebar .view.separator, NemoWindow .sidebar .separator, + GtkPlacesSidebar.sidebar NautilusWindow MarlinPlacesSidebar .view.separator, NemoWindow .sidebar .separator, NemoWindow GtkPlacesSidebar.sidebar .view.separator, NemoWindow MarlinPlacesSidebar .separator, NemoWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NemoWindow MarlinPlacesSidebar .view.separator, NemoWindow NemoPlacesSidebar .separator, - NemoWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NemoWindow NemoPlacesSidebar .view.separator, MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow MarlinPlacesSidebar .separator, MarlinViewWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator, MarlinViewWindow NemoPlacesSidebar .separator, MarlinViewWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow NemoPlacesSidebar .view.separator { + GtkPlacesSidebar.sidebar NemoWindow MarlinPlacesSidebar .view.separator, MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow MarlinPlacesSidebar .separator, MarlinViewWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator { color: transparent; } GtkFileChooserDialog .sidebar .scrollbar.trough, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.trough, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.trough, NautilusWindow .sidebar .scrollbar.trough, NautilusWindow MarlinPlacesSidebar .scrollbar.trough, - NautilusWindow NemoPlacesSidebar .scrollbar.trough, NemoWindow .sidebar .scrollbar.trough, NemoWindow MarlinPlacesSidebar .scrollbar.trough, - NemoWindow NemoPlacesSidebar .scrollbar.trough, - MarlinViewWindow .sidebar .scrollbar.trough, MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough, MarlinViewWindow NemoPlacesSidebar .scrollbar.trough { + MarlinViewWindow .sidebar .scrollbar.trough, MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough { background-color: transparent; border-color: transparent; } GtkFileChooserDialog .sidebar .scrollbar.slider, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider, NautilusWindow .sidebar .scrollbar.slider, NautilusWindow MarlinPlacesSidebar .scrollbar.slider, - NautilusWindow NemoPlacesSidebar .scrollbar.slider, NemoWindow .sidebar .scrollbar.slider, NemoWindow MarlinPlacesSidebar .scrollbar.slider, - NemoWindow NemoPlacesSidebar .scrollbar.slider, - MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { + MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, NautilusWindow .sidebar .scrollbar.slider:hover, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:hover, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:hover, NemoWindow .sidebar .scrollbar.slider:hover, 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 { + MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover { background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, NautilusWindow .sidebar .scrollbar.slider:prelight:active, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:prelight:active, NemoWindow .sidebar .scrollbar.slider:prelight:active, NemoWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, - NemoWindow NemoPlacesSidebar .scrollbar.slider:prelight:active, - MarlinViewWindow .sidebar .scrollbar.slider:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:prelight:active { + MarlinViewWindow .sidebar .scrollbar.slider:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active { background-color: #5294E2; } GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune, NautilusWindow .sidebar .scrollbar.slider.fine-tune, NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, - NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune, NemoWindow .sidebar .scrollbar.slider.fine-tune, NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, - NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune, - MarlinViewWindow .sidebar .scrollbar.slider.fine-tune, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune { + MarlinViewWindow .sidebar .scrollbar.slider.fine-tune, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune { border-width: 4px; } GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, NautilusWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, NemoWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - MarlinViewWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active { + MarlinViewWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active { background-color: #5294E2; } GtkFileChooserDialog .sidebar .scrollbar.slider:insensitive, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:insensitive, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:insensitive, NautilusWindow .sidebar .scrollbar.slider:insensitive, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:insensitive, NemoWindow .sidebar .scrollbar.slider:insensitive, NemoWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, - NemoWindow NemoPlacesSidebar .scrollbar.slider:insensitive, - MarlinViewWindow .sidebar .scrollbar.slider:insensitive, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:insensitive { + MarlinViewWindow .sidebar .scrollbar.slider:insensitive, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive { background-color: transparent; } GtkFileChooserDialog.maximized .sidebar, diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 2b2d3cc..7514403 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -3524,195 +3524,138 @@ MarlinViewWindow.csd.background, MarlinViewWindow .source-list, MarlinViewWindow .source-list.view, MarlinViewWindow .source-list.view:prelight { background-color: transparent; } -GtkFileChooserDialog GtkBox.sidebar, -NautilusWindow GtkBox.sidebar, -NemoWindow GtkBox.sidebar, -MarlinViewWindow GtkBox.sidebar { - background-color: transparent; } - GtkFileChooserDialog .sidebar, GtkFileChooserDialog MarlinPlacesSidebar, -GtkFileChooserDialog NemoPlacesSidebar, NautilusWindow .sidebar, NautilusWindow MarlinPlacesSidebar, -NautilusWindow NemoPlacesSidebar, NemoWindow .sidebar, NemoWindow MarlinPlacesSidebar, -NemoWindow NemoPlacesSidebar, -MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar, MarlinViewWindow NemoPlacesSidebar { +MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar { background-color: rgba(60, 64, 73, 0.95); } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row, - GtkFileChooserDialog NemoPlacesSidebar .view, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row, NautilusWindow .sidebar .view, NautilusWindow .sidebar .source-list.sidebar row, NautilusWindow MarlinPlacesSidebar .view, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row, - NautilusWindow NemoPlacesSidebar .view, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row, NemoWindow .sidebar .view, NemoWindow .sidebar .source-list.sidebar row, NemoWindow MarlinPlacesSidebar .view, NemoWindow MarlinPlacesSidebar .source-list.sidebar row, - NemoWindow NemoPlacesSidebar .view, - 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 { + MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar .source-list.sidebar row, MarlinViewWindow MarlinPlacesSidebar .view, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row { background-color: transparent; color: #BAC3CF; } GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.image, - GtkFileChooserDialog NemoPlacesSidebar .view.image, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.image, NautilusWindow .sidebar .view.image, NautilusWindow .sidebar .source-list.sidebar row.image, NautilusWindow MarlinPlacesSidebar .view.image, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.image, - NautilusWindow NemoPlacesSidebar .view.image, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row.image, NemoWindow .sidebar .view.image, NemoWindow .sidebar .source-list.sidebar row.image, NemoWindow MarlinPlacesSidebar .view.image, NemoWindow MarlinPlacesSidebar .source-list.sidebar row.image, - 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 { + MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar .source-list.sidebar row.image, MarlinViewWindow MarlinPlacesSidebar .view.image, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image { 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, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - GtkFileChooserDialog NemoPlacesSidebar .view.cell:selected, - GtkFileChooserDialog NemoPlacesSidebar .source-list.sidebar row.cell:selected, NautilusWindow .sidebar .view.cell:selected, NautilusWindow .sidebar .source-list.sidebar row.cell:selected, NautilusWindow MarlinPlacesSidebar .view.cell:selected, NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - NautilusWindow NemoPlacesSidebar .view.cell:selected, - NautilusWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected, NemoWindow .sidebar .view.cell:selected, NemoWindow .sidebar .source-list.sidebar row.cell:selected, NemoWindow MarlinPlacesSidebar .view.cell:selected, NemoWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, - NemoWindow NemoPlacesSidebar .view.cell:selected, - NemoWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected, - MarlinViewWindow .sidebar .view.cell:selected, MarlinViewWindow .sidebar .source-list.sidebar row.cell:selected, MarlinViewWindow MarlinPlacesSidebar .view.cell:selected, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, MarlinViewWindow NemoPlacesSidebar .view.cell:selected, MarlinViewWindow NemoPlacesSidebar .source-list.sidebar row.cell:selected { + MarlinViewWindow .sidebar .view.cell:selected, MarlinViewWindow .sidebar .source-list.sidebar row.cell:selected, MarlinViewWindow MarlinPlacesSidebar .view.cell:selected, MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected { background-color: #5294E2; color: #ffffff; } GtkFileChooserDialog .sidebar.frame, GtkFileChooserDialog MarlinPlacesSidebar.frame, - GtkFileChooserDialog NemoPlacesSidebar.frame, NautilusWindow .sidebar.frame, NautilusWindow MarlinPlacesSidebar.frame, - NautilusWindow NemoPlacesSidebar.frame, NemoWindow .sidebar.frame, NemoWindow MarlinPlacesSidebar.frame, - NemoWindow NemoPlacesSidebar.frame, - MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame, MarlinViewWindow NemoPlacesSidebar.frame { + MarlinViewWindow .sidebar.frame, MarlinViewWindow MarlinPlacesSidebar.frame { color: #BAC3CF; } GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, GtkFileChooserDialog MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator, GtkFileChooserDialog NemoPlacesSidebar .separator, - GtkFileChooserDialog NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar GtkFileChooserDialog NemoPlacesSidebar .view.separator, NautilusWindow .sidebar .separator, + GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator, NautilusWindow .sidebar .separator, NautilusWindow GtkPlacesSidebar.sidebar .view.separator, NautilusWindow MarlinPlacesSidebar .separator, NautilusWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NautilusWindow MarlinPlacesSidebar .view.separator, NautilusWindow NemoPlacesSidebar .separator, - NautilusWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NautilusWindow NemoPlacesSidebar .view.separator, NemoWindow .sidebar .separator, + GtkPlacesSidebar.sidebar NautilusWindow MarlinPlacesSidebar .view.separator, NemoWindow .sidebar .separator, NemoWindow GtkPlacesSidebar.sidebar .view.separator, NemoWindow MarlinPlacesSidebar .separator, NemoWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NemoWindow MarlinPlacesSidebar .view.separator, NemoWindow NemoPlacesSidebar .separator, - NemoWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, - GtkPlacesSidebar.sidebar NemoWindow NemoPlacesSidebar .view.separator, MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow MarlinPlacesSidebar .separator, MarlinViewWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator, MarlinViewWindow NemoPlacesSidebar .separator, MarlinViewWindow NemoPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow NemoPlacesSidebar .view.separator { + GtkPlacesSidebar.sidebar NemoWindow MarlinPlacesSidebar .view.separator, MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow MarlinPlacesSidebar .separator, MarlinViewWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator { color: transparent; } GtkFileChooserDialog .sidebar .scrollbar.trough, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.trough, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.trough, NautilusWindow .sidebar .scrollbar.trough, NautilusWindow MarlinPlacesSidebar .scrollbar.trough, - NautilusWindow NemoPlacesSidebar .scrollbar.trough, NemoWindow .sidebar .scrollbar.trough, NemoWindow MarlinPlacesSidebar .scrollbar.trough, - NemoWindow NemoPlacesSidebar .scrollbar.trough, - MarlinViewWindow .sidebar .scrollbar.trough, MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough, MarlinViewWindow NemoPlacesSidebar .scrollbar.trough { + MarlinViewWindow .sidebar .scrollbar.trough, MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough { background-color: transparent; border-color: transparent; } GtkFileChooserDialog .sidebar .scrollbar.slider, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider, NautilusWindow .sidebar .scrollbar.slider, NautilusWindow MarlinPlacesSidebar .scrollbar.slider, - NautilusWindow NemoPlacesSidebar .scrollbar.slider, NemoWindow .sidebar .scrollbar.slider, NemoWindow MarlinPlacesSidebar .scrollbar.slider, - NemoWindow NemoPlacesSidebar .scrollbar.slider, - MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider { + MarlinViewWindow .sidebar .scrollbar.slider, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; background-color: rgba(231, 234, 238, 0.7); } GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:hover, NautilusWindow .sidebar .scrollbar.slider:hover, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:hover, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:hover, NemoWindow .sidebar .scrollbar.slider:hover, 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 { + MarlinViewWindow .sidebar .scrollbar.slider:hover, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover { background-color: #f6f7f9; } GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:prelight:active, NautilusWindow .sidebar .scrollbar.slider:prelight:active, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:prelight:active, NemoWindow .sidebar .scrollbar.slider:prelight:active, NemoWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, - NemoWindow NemoPlacesSidebar .scrollbar.slider:prelight:active, - MarlinViewWindow .sidebar .scrollbar.slider:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:prelight:active { + MarlinViewWindow .sidebar .scrollbar.slider:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active { background-color: #5294E2; } GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune, NautilusWindow .sidebar .scrollbar.slider.fine-tune, NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, - NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune, NemoWindow .sidebar .scrollbar.slider.fine-tune, NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, - NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune, - MarlinViewWindow .sidebar .scrollbar.slider.fine-tune, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune { + MarlinViewWindow .sidebar .scrollbar.slider.fine-tune, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune { border-width: 4px; } GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, NautilusWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - NautilusWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, NemoWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - NemoWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, - MarlinViewWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider.fine-tune:prelight:active { + MarlinViewWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active { background-color: #5294E2; } GtkFileChooserDialog .sidebar .scrollbar.slider:insensitive, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:insensitive, - GtkFileChooserDialog NemoPlacesSidebar .scrollbar.slider:insensitive, NautilusWindow .sidebar .scrollbar.slider:insensitive, NautilusWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, - NautilusWindow NemoPlacesSidebar .scrollbar.slider:insensitive, NemoWindow .sidebar .scrollbar.slider:insensitive, NemoWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, - NemoWindow NemoPlacesSidebar .scrollbar.slider:insensitive, - MarlinViewWindow .sidebar .scrollbar.slider:insensitive, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, MarlinViewWindow NemoPlacesSidebar .scrollbar.slider:insensitive { + MarlinViewWindow .sidebar .scrollbar.slider:insensitive, MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive { background-color: transparent; } GtkFileChooserDialog.maximized .sidebar, 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 e10fb05..d43e46a 100644 --- a/common/gtk-3.0/3.14/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.14/sass/_transparent_widgets.scss @@ -29,9 +29,7 @@ MarlinViewWindow { &.csd.background, .source-list, .source-list.view, .source-list.view:prelight { background-color: transparent; } - GtkBox.sidebar { background-color: transparent; } - - .sidebar, MarlinPlacesSidebar, NemoPlacesSidebar { + .sidebar, MarlinPlacesSidebar { background-color: $dark_sidebar_bg; .view, .source-list.sidebar row { -- cgit v1.2.3 From c87c3c8e474e36cd0f569942bdbbf8971431fbfc Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 3 Sep 2015 15:05:24 +0200 Subject: fix fallout from last commit --- common/gtk-3.0/3.14/gtk-contained-dark.css | 3 +++ common/gtk-3.0/3.14/gtk-contained-darker.css | 3 +++ common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 3 +++ common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 3 +++ common/gtk-3.0/3.14/gtk-contained-solid.css | 3 +++ common/gtk-3.0/3.14/gtk-contained.css | 3 +++ common/gtk-3.0/3.14/sass/_transparent_widgets.scss | 2 ++ 7 files changed, 20 insertions(+) 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 fa8cdc9..a765aa0 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -3518,6 +3518,9 @@ NautilusWindow .sidebar:dir(rtl), NemoWindow .sidebar:dir(rtl) { border-left: 1px solid rgba(37, 39, 45, 0.95); } +NautilusWindow GtkBox.sidebar { + background-color: transparent; } + GtkFileChooserDialog.csd.background, GtkFileChooserDialog .source-list, GtkFileChooserDialog .source-list.view, 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 e9bd3d1..5a8d25a 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -3509,6 +3509,9 @@ NautilusWindow *, NemoWindow { -GtkPaned-handle-size: 0; } +NautilusWindow GtkBox.sidebar { + background-color: transparent; } + GtkFileChooserDialog.csd.background, GtkFileChooserDialog .source-list, GtkFileChooserDialog .source-list.view, 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 1fff08c..14b0595 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 @@ -3518,6 +3518,9 @@ NautilusWindow .sidebar:dir(rtl), NemoWindow .sidebar:dir(rtl) { border-left: 1px solid #25272d; } +NautilusWindow GtkBox.sidebar { + background-color: transparent; } + GtkFileChooserDialog.csd.background, GtkFileChooserDialog .source-list, GtkFileChooserDialog .source-list.view, 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 b098f21..7ca07dd 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 @@ -3509,6 +3509,9 @@ NautilusWindow *, NemoWindow { -GtkPaned-handle-size: 0; } +NautilusWindow GtkBox.sidebar { + background-color: transparent; } + GtkFileChooserDialog.csd.background, GtkFileChooserDialog .source-list, GtkFileChooserDialog .source-list.view, 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 61c273f..3f3b35b 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -3508,6 +3508,9 @@ NautilusWindow *, NemoWindow { -GtkPaned-handle-size: 0; } +NautilusWindow GtkBox.sidebar { + background-color: transparent; } + GtkFileChooserDialog.csd.background, GtkFileChooserDialog .source-list, GtkFileChooserDialog .source-list.view, diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 7514403..abe4ce9 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -3508,6 +3508,9 @@ NautilusWindow *, NemoWindow { -GtkPaned-handle-size: 0; } +NautilusWindow GtkBox.sidebar { + background-color: transparent; } + GtkFileChooserDialog.csd.background, GtkFileChooserDialog .source-list, GtkFileChooserDialog .source-list.view, 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 d43e46a..d9c2c99 100644 --- a/common/gtk-3.0/3.14/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.14/sass/_transparent_widgets.scss @@ -21,6 +21,8 @@ NemoWindow { } // Dark transparent sidebars +NautilusWindow GtkBox.sidebar { background-color: transparent; } + GtkFileChooserDialog, NautilusWindow, NemoWindow, -- cgit v1.2.3 From cf8345d595f40342804bdf091a1f423139f235ed Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 4 Sep 2015 18:10:42 +0200 Subject: regenerate .crx files for the Chrome theme --- extra/Chrome/arc-darker-theme.crx | Bin 2217 -> 2217 bytes extra/Chrome/arc-theme.crx | Bin 2193 -> 2193 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/extra/Chrome/arc-darker-theme.crx b/extra/Chrome/arc-darker-theme.crx index e528be3..e8e939c 100644 Binary files a/extra/Chrome/arc-darker-theme.crx and b/extra/Chrome/arc-darker-theme.crx differ diff --git a/extra/Chrome/arc-theme.crx b/extra/Chrome/arc-theme.crx index e57cc20..26ff10d 100644 Binary files a/extra/Chrome/arc-theme.crx and b/extra/Chrome/arc-theme.crx differ -- cgit v1.2.3 From 4097e62e012ed929335ddde7fc9719ee763d731f Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 9 Sep 2015 21:19:57 +0200 Subject: tweak color scheme and window buttons --- common/cinnamon/cinnamon.css | 148 ++-- common/cinnamon/common-assets/misc/bg.svg | 14 +- common/cinnamon/common-assets/misc/button-box.svg | 15 +- .../cinnamon/common-assets/misc/desklet-header.svg | 10 +- common/cinnamon/common-assets/misc/osd.svg | 16 +- .../cinnamon/common-assets/panel/panel-bottom.svg | 40 +- common/cinnamon/common-assets/panel/panel-top.svg | 14 +- common/cinnamon/sass/_colors.scss | 72 +- common/cinnamon/sass/_drawing.scss | 46 +- .../3.14/common-assets/dash/dash-bottom.svg | 23 +- .../common-assets/dash/dash-extended-bottom.svg | 47 +- .../3.14/common-assets/dash/dash-extended-left.svg | 10 +- .../common-assets/dash/dash-extended-right.svg | 47 +- .../3.14/common-assets/dash/dash-extended-top.svg | 47 +- .../3.14/common-assets/dash/dash-left.svg | 10 +- .../3.14/common-assets/dash/dash-right.svg | 33 +- .../3.14/common-assets/dash/dash-top.svg | 21 +- common/gnome-shell/3.14/common-assets/misc/bg.svg | 14 +- .../3.14/common-assets/misc/button-box.svg | 15 +- .../3.14/common-assets/misc/notification.svg | 137 ++- common/gnome-shell/3.14/common-assets/misc/osd.svg | 16 +- .../3.14/common-assets/panel/panel-overview.svg | 12 +- .../gnome-shell/3.14/common-assets/panel/panel.svg | 14 +- common/gnome-shell/3.14/gnome-shell.css | 188 ++-- common/gnome-shell/3.14/sass/_colors.scss | 72 +- common/gnome-shell/3.14/sass/_common.scss | 50 +- common/gnome-shell/3.14/sass/_drawing.scss | 45 +- .../3.16/common-assets/dash/dash-bottom.svg | 23 +- .../common-assets/dash/dash-extended-bottom.svg | 47 +- .../3.16/common-assets/dash/dash-extended-left.svg | 10 +- .../common-assets/dash/dash-extended-right.svg | 47 +- .../3.16/common-assets/dash/dash-extended-top.svg | 47 +- .../3.16/common-assets/dash/dash-left.svg | 10 +- .../3.16/common-assets/dash/dash-right.svg | 33 +- .../3.16/common-assets/dash/dash-top.svg | 21 +- common/gnome-shell/3.16/common-assets/misc/bg.svg | 14 +- .../3.16/common-assets/misc/button-box.svg | 15 +- common/gnome-shell/3.16/common-assets/misc/osd.svg | 16 +- .../3.16/common-assets/panel/panel-overview.svg | 12 +- .../gnome-shell/3.16/common-assets/panel/panel.svg | 14 +- common/gnome-shell/3.16/gnome-shell.css | 165 ++-- common/gnome-shell/3.16/sass/_colors.scss | 72 +- common/gnome-shell/3.16/sass/_common.scss | 42 +- common/gnome-shell/3.16/sass/_drawing.scss | 45 +- common/gtk-2.0/assets-dark.svg | 397 +++++---- common/gtk-2.0/assets-dark/button-active.png | Bin 306 -> 309 bytes common/gtk-2.0/assets-dark/button-hover.png | Bin 333 -> 317 bytes common/gtk-2.0/assets-dark/button-insensitive.png | Bin 295 -> 304 bytes common/gtk-2.0/assets-dark/button.png | Bin 309 -> 313 bytes .../assets-dark/checkbox-checked-insensitive.png | Bin 415 -> 410 bytes common/gtk-2.0/assets-dark/checkbox-checked.png | Bin 421 -> 423 bytes .../assets-dark/checkbox-unchecked-insensitive.png | Bin 269 -> 263 bytes common/gtk-2.0/assets-dark/checkbox-unchecked.png | Bin 262 -> 268 bytes .../assets-dark/combo-entry-button-active-rtl.png | Bin 247 -> 243 bytes .../assets-dark/combo-entry-button-active.png | Bin 261 -> 264 bytes .../combo-entry-button-insensitive-rtl.png | Bin 244 -> 252 bytes .../assets-dark/combo-entry-button-insensitive.png | Bin 263 -> 267 bytes .../gtk-2.0/assets-dark/combo-entry-button-rtl.png | Bin 253 -> 254 bytes common/gtk-2.0/assets-dark/combo-entry-button.png | Bin 272 -> 274 bytes .../assets-dark/combo-entry-focus-notebook-rtl.png | Bin 286 -> 285 bytes .../assets-dark/combo-entry-focus-notebook.png | Bin 298 -> 297 bytes .../gtk-2.0/assets-dark/combo-entry-focus-rtl.png | Bin 283 -> 286 bytes common/gtk-2.0/assets-dark/combo-entry-focus.png | Bin 290 -> 298 bytes .../combo-entry-insensitive-notebook-rtl.png | Bin 248 -> 265 bytes .../combo-entry-insensitive-notebook.png | Bin 243 -> 264 bytes .../assets-dark/combo-entry-insensitive-rtl.png | Bin 251 -> 253 bytes .../assets-dark/combo-entry-insensitive.png | Bin 249 -> 254 bytes .../assets-dark/combo-entry-notebook-rtl.png | Bin 283 -> 292 bytes .../gtk-2.0/assets-dark/combo-entry-notebook.png | Bin 289 -> 292 bytes common/gtk-2.0/assets-dark/combo-entry-rtl.png | Bin 291 -> 284 bytes common/gtk-2.0/assets-dark/combo-entry.png | Bin 293 -> 294 bytes .../assets-dark/down-background-disable-rtl.png | Bin 197 -> 203 bytes .../assets-dark/down-background-disable.png | Bin 206 -> 209 bytes common/gtk-2.0/assets-dark/down-background-rtl.png | Bin 202 -> 202 bytes common/gtk-2.0/assets-dark/down-background.png | Bin 209 -> 211 bytes .../assets-dark/entry-border-active-bg-solid.png | Bin 372 -> 383 bytes .../gtk-2.0/assets-dark/entry-border-active-bg.png | Bin 400 -> 410 bytes .../gtk-2.0/assets-dark/entry-border-bg-solid.png | Bin 326 -> 333 bytes common/gtk-2.0/assets-dark/entry-border-bg.png | Bin 374 -> 361 bytes .../assets-dark/entry-border-disabled-bg.png | Bin 302 -> 305 bytes common/gtk-2.0/assets-dark/frame-gap-end.png | Bin 148 -> 148 bytes common/gtk-2.0/assets-dark/frame-gap-start.png | Bin 148 -> 148 bytes common/gtk-2.0/assets-dark/frame.png | Bin 178 -> 178 bytes common/gtk-2.0/assets-dark/handle-h.png | Bin 160 -> 160 bytes common/gtk-2.0/assets-dark/handle-v.png | Bin 157 -> 157 bytes common/gtk-2.0/assets-dark/inline-toolbar.png | Bin 193 -> 193 bytes common/gtk-2.0/assets-dark/line-h.png | Bin 151 -> 151 bytes common/gtk-2.0/assets-dark/line-v.png | Bin 151 -> 151 bytes .../menu-checkbox-checked-insensitive.png | Bin 403 -> 390 bytes .../gtk-2.0/assets-dark/menu-checkbox-checked.png | Bin 385 -> 388 bytes .../menu-checkbox-unchecked-insensitive.png | Bin 235 -> 237 bytes .../assets-dark/menu-checkbox-unchecked.png | Bin 242 -> 238 bytes .../assets-dark/menu-radio-checked-insensitive.png | Bin 444 -> 453 bytes common/gtk-2.0/assets-dark/menu-radio-checked.png | Bin 433 -> 434 bytes .../menu-radio-unchecked-insensitive.png | Bin 512 -> 501 bytes .../gtk-2.0/assets-dark/menu-radio-unchecked.png | Bin 507 -> 494 bytes common/gtk-2.0/assets-dark/menubar.png | Bin 183 -> 183 bytes common/gtk-2.0/assets-dark/menuitem.png | Bin 175 -> 176 bytes common/gtk-2.0/assets-dark/minus.png | Bin 289 -> 283 bytes .../notebook-entry-border-active-bg.png | Bin 410 -> 408 bytes .../assets-dark/notebook-entry-border-bg.png | Bin 356 -> 373 bytes .../notebook-entry-border-disabled-bg.png | Bin 288 -> 322 bytes common/gtk-2.0/assets-dark/notebook-gap-horiz.png | Bin 160 -> 160 bytes common/gtk-2.0/assets-dark/notebook-gap-vert.png | Bin 155 -> 155 bytes common/gtk-2.0/assets-dark/notebook.png | Bin 178 -> 178 bytes common/gtk-2.0/assets-dark/plus.png | Bin 281 -> 295 bytes .../assets-dark/radio-checked-insensitive.png | Bin 493 -> 493 bytes common/gtk-2.0/assets-dark/radio-checked.png | Bin 460 -> 458 bytes .../assets-dark/radio-unchecked-insensitive.png | Bin 524 -> 521 bytes common/gtk-2.0/assets-dark/radio-unchecked.png | Bin 529 -> 537 bytes common/gtk-2.0/assets-dark/slider-horiz-insens.png | Bin 258 -> 259 bytes .../gtk-2.0/assets-dark/slider-horiz-prelight.png | Bin 256 -> 260 bytes common/gtk-2.0/assets-dark/slider-horiz.png | Bin 260 -> 257 bytes common/gtk-2.0/assets-dark/slider-insensitive.png | Bin 575 -> 546 bytes common/gtk-2.0/assets-dark/slider-vert-insens.png | Bin 263 -> 267 bytes .../gtk-2.0/assets-dark/slider-vert-prelight.png | Bin 264 -> 264 bytes common/gtk-2.0/assets-dark/slider-vert.png | Bin 271 -> 266 bytes common/gtk-2.0/assets-dark/slider.png | Bin 581 -> 538 bytes common/gtk-2.0/assets-dark/tab-bottom-active.png | Bin 197 -> 197 bytes common/gtk-2.0/assets-dark/tab-left-active.png | Bin 197 -> 198 bytes common/gtk-2.0/assets-dark/tab-right-active.png | Bin 198 -> 199 bytes common/gtk-2.0/assets-dark/tab-top-active.png | Bin 195 -> 196 bytes .../assets-dark/toolbar-entry-border-active-bg.png | Bin 409 -> 409 bytes .../assets-dark/toolbar-entry-border-bg.png | Bin 352 -> 349 bytes .../toolbar-entry-border-disabled-bg.png | Bin 324 -> 321 bytes common/gtk-2.0/assets-dark/toolbar.png | Bin 183 -> 183 bytes common/gtk-2.0/assets-dark/tree_header.png | Bin 166 -> 166 bytes common/gtk-2.0/assets-dark/trough-horizontal.png | Bin 242 -> 246 bytes common/gtk-2.0/assets-dark/trough-progressbar.png | Bin 311 -> 306 bytes .../gtk-2.0/assets-dark/trough-progressbar_v.png | Bin 302 -> 301 bytes common/gtk-2.0/assets-dark/trough-scrollbar.png | Bin 158 -> 158 bytes common/gtk-2.0/assets-dark/trough-vertical.png | Bin 255 -> 257 bytes .../assets-dark/up-background-disable-rtl.png | Bin 203 -> 208 bytes .../gtk-2.0/assets-dark/up-background-disable.png | Bin 218 -> 223 bytes common/gtk-2.0/assets-dark/up-background-rtl.png | Bin 207 -> 209 bytes common/gtk-2.0/assets-dark/up-background.png | Bin 226 -> 224 bytes common/gtk-2.0/assets.svg | 30 +- common/gtk-2.0/assets/button-hover.png | Bin 329 -> 312 bytes common/gtk-2.0/assets/notebook-gap-horiz.png | Bin 158 -> 154 bytes common/gtk-2.0/assets/notebook-gap-vert.png | Bin 155 -> 155 bytes common/gtk-2.0/assets/notebook.png | Bin 178 -> 178 bytes common/gtk-2.0/assets/slider-insensitive.png | Bin 566 -> 521 bytes common/gtk-2.0/assets/slider.png | Bin 597 -> 545 bytes common/gtk-2.0/assets/tab-bottom-active.png | Bin 197 -> 197 bytes common/gtk-2.0/assets/tab-left-active.png | Bin 198 -> 197 bytes common/gtk-2.0/assets/tab-right-active.png | Bin 195 -> 193 bytes common/gtk-2.0/assets/tab-top-active.png | Bin 196 -> 195 bytes common/gtk-2.0/gtkrc | 2 +- common/gtk-2.0/gtkrc-dark | 2 +- common/gtk-2.0/gtkrc-darker | 2 +- common/gtk-2.0/main.rc | 6 +- common/gtk-2.0/menubar-toolbar/button-active.png | Bin 306 -> 309 bytes common/gtk-2.0/menubar-toolbar/button-hover.png | Bin 333 -> 317 bytes .../gtk-2.0/menubar-toolbar/button-insensitive.png | Bin 295 -> 304 bytes common/gtk-2.0/menubar-toolbar/button.png | Bin 309 -> 313 bytes common/gtk-2.0/menubar-toolbar/menubar-dark.png | Bin 183 -> 183 bytes .../menubar-toolbar/menubar-toolbar-dark.rc | 12 +- .../toolbar-entry-border-active-bg-dark.png | Bin 409 -> 409 bytes .../menubar-toolbar/toolbar-entry-border-bg.png | Bin 366 -> 349 bytes .../toolbar-entry-border-disabled-bg-dark.png | Bin 324 -> 321 bytes common/gtk-2.0/panel.rc | 2 +- common/gtk-3.0/3.14/assets.svg | 689 ++++++--------- .../gtk-3.0/3.14/assets/checkbox-checked-dark.png | Bin 421 -> 423 bytes .../3.14/assets/checkbox-checked-dark@2.png | Bin 646 -> 639 bytes .../assets/checkbox-checked-insensitive-dark.png | Bin 415 -> 422 bytes .../assets/checkbox-checked-insensitive-dark@2.png | Bin 645 -> 647 bytes .../assets/checkbox-checked-selectionmode-dark.png | Bin 668 -> 691 bytes .../checkbox-checked-selectionmode-dark@2.png | Bin 1031 -> 1014 bytes common/gtk-3.0/3.14/assets/checkbox-mixed-dark.png | Bin 257 -> 258 bytes .../gtk-3.0/3.14/assets/checkbox-mixed-dark@2.png | Bin 367 -> 364 bytes .../assets/checkbox-mixed-insensitive-dark.png | Bin 264 -> 265 bytes .../assets/checkbox-mixed-insensitive-dark@2.png | Bin 379 -> 377 bytes .../3.14/assets/checkbox-selectionmode-dark.png | Bin 648 -> 668 bytes .../3.14/assets/checkbox-selectionmode-dark@2.png | Bin 1078 -> 1096 bytes .../3.14/assets/checkbox-unchecked-dark.png | Bin 291 -> 290 bytes .../3.14/assets/checkbox-unchecked-dark@2.png | Bin 470 -> 467 bytes .../assets/checkbox-unchecked-insensitive-dark.png | Bin 287 -> 292 bytes .../checkbox-unchecked-insensitive-dark@2.png | Bin 440 -> 452 bytes .../checkbox-unchecked-insensitive-selected.png | Bin 277 -> 252 bytes .../checkbox-unchecked-insensitive-selected@2.png | Bin 420 -> 368 bytes .../3.14/assets/checkbox-unchecked-selected.png | Bin 299 -> 263 bytes .../3.14/assets/checkbox-unchecked-selected@2.png | Bin 445 -> 379 bytes common/gtk-3.0/3.14/assets/radio-checked-dark.png | Bin 460 -> 458 bytes .../gtk-3.0/3.14/assets/radio-checked-dark@2.png | Bin 862 -> 864 bytes .../3.14/assets/radio-checked-insensitive-dark.png | Bin 497 -> 497 bytes .../assets/radio-checked-insensitive-dark@2.png | Bin 889 -> 891 bytes common/gtk-3.0/3.14/assets/radio-mixed-dark.png | Bin 417 -> 415 bytes common/gtk-3.0/3.14/assets/radio-mixed-dark@2.png | Bin 723 -> 724 bytes .../3.14/assets/radio-mixed-insensitive-dark.png | Bin 449 -> 451 bytes .../3.14/assets/radio-mixed-insensitive-dark@2.png | Bin 751 -> 753 bytes .../gtk-3.0/3.14/assets/radio-unchecked-dark.png | Bin 536 -> 533 bytes .../gtk-3.0/3.14/assets/radio-unchecked-dark@2.png | Bin 1023 -> 1009 bytes .../assets/radio-unchecked-insensitive-dark.png | Bin 506 -> 509 bytes .../assets/radio-unchecked-insensitive-dark@2.png | Bin 1047 -> 1004 bytes .../radio-unchecked-insensitive-selected.png | Bin 450 -> 333 bytes .../radio-unchecked-insensitive-selected@2.png | Bin 876 -> 657 bytes .../3.14/assets/radio-unchecked-selected.png | Bin 500 -> 356 bytes .../3.14/assets/radio-unchecked-selected@2.png | Bin 979 -> 725 bytes common/gtk-3.0/3.14/assets/switch-active-dark.png | Bin 1016 -> 1019 bytes .../gtk-3.0/3.14/assets/switch-active-dark@2.png | Bin 2038 -> 2020 bytes .../3.14/assets/switch-active-header-dark.png | Bin 1021 -> 1015 bytes .../3.14/assets/switch-active-header-dark@2.png | Bin 2027 -> 2040 bytes .../3.14/assets/switch-active-insensitive-dark.png | Bin 1015 -> 1004 bytes .../assets/switch-active-insensitive-dark@2.png | Bin 2051 -> 2058 bytes .../switch-active-insensitive-header-dark.png | Bin 1005 -> 999 bytes .../switch-active-insensitive-header-dark@2.png | Bin 2049 -> 2061 bytes common/gtk-3.0/3.14/assets/switch-dark.png | Bin 1002 -> 985 bytes common/gtk-3.0/3.14/assets/switch-dark@2.png | Bin 1998 -> 1948 bytes common/gtk-3.0/3.14/assets/switch-header-dark.png | Bin 965 -> 1000 bytes .../gtk-3.0/3.14/assets/switch-header-dark@2.png | Bin 1898 -> 1970 bytes .../3.14/assets/switch-insensitive-dark.png | Bin 1022 -> 1003 bytes .../3.14/assets/switch-insensitive-dark@2.png | Bin 2054 -> 2033 bytes .../3.14/assets/switch-insensitive-header-dark.png | Bin 987 -> 1017 bytes .../assets/switch-insensitive-header-dark@2.png | Bin 1990 -> 2075 bytes .../3.14/assets/titlebutton-close-active-dark.png | Bin 539 -> 541 bytes .../assets/titlebutton-close-active-dark@2.png | Bin 1039 -> 991 bytes .../3.14/assets/titlebutton-close-active.png | Bin 533 -> 544 bytes .../3.14/assets/titlebutton-close-active@2.png | Bin 1023 -> 1035 bytes .../assets/titlebutton-close-backdrop-dark.png | Bin 686 -> 568 bytes .../assets/titlebutton-close-backdrop-dark@2.png | Bin 1444 -> 1052 bytes .../3.14/assets/titlebutton-close-backdrop.png | Bin 735 -> 591 bytes .../3.14/assets/titlebutton-close-backdrop@2.png | Bin 1487 -> 1129 bytes .../gtk-3.0/3.14/assets/titlebutton-close-dark.png | Bin 540 -> 542 bytes .../3.14/assets/titlebutton-close-dark@2.png | Bin 1016 -> 1011 bytes .../3.14/assets/titlebutton-close-hover-dark.png | Bin 509 -> 547 bytes .../3.14/assets/titlebutton-close-hover-dark@2.png | Bin 996 -> 992 bytes .../3.14/assets/titlebutton-close-hover.png | Bin 528 -> 543 bytes .../3.14/assets/titlebutton-close-hover@2.png | Bin 955 -> 1048 bytes common/gtk-3.0/3.14/assets/titlebutton-close.png | Bin 508 -> 554 bytes common/gtk-3.0/3.14/assets/titlebutton-close@2.png | Bin 1029 -> 1081 bytes .../3.14/assets/titlebutton-max-backdrop-dark.png | Bin 655 -> 281 bytes .../assets/titlebutton-max-backdrop-dark@2.png | Bin 1272 -> 341 bytes .../3.14/assets/titlebutton-max-backdrop.png | Bin 690 -> 304 bytes .../3.14/assets/titlebutton-max-backdrop@2.png | Bin 1324 -> 353 bytes .../gtk-3.0/3.14/assets/titlebutton-max-dark.png | Bin 661 -> 302 bytes .../gtk-3.0/3.14/assets/titlebutton-max-dark@2.png | Bin 1249 -> 345 bytes .../3.14/assets/titlebutton-max-hover-dark.png | Bin 689 -> 676 bytes .../3.14/assets/titlebutton-max-hover-dark@2.png | Bin 1340 -> 1310 bytes .../gtk-3.0/3.14/assets/titlebutton-max-hover.png | Bin 691 -> 696 bytes .../3.14/assets/titlebutton-max-hover@2.png | Bin 1319 -> 1361 bytes common/gtk-3.0/3.14/assets/titlebutton-max.png | Bin 682 -> 285 bytes common/gtk-3.0/3.14/assets/titlebutton-max@2.png | Bin 1326 -> 383 bytes .../3.14/assets/titlebutton-min-backdrop-dark.png | Bin 556 -> 168 bytes .../assets/titlebutton-min-backdrop-dark@2.png | Bin 1121 -> 187 bytes .../3.14/assets/titlebutton-min-backdrop.png | Bin 598 -> 167 bytes .../3.14/assets/titlebutton-min-backdrop@2.png | Bin 1180 -> 184 bytes .../gtk-3.0/3.14/assets/titlebutton-min-dark.png | Bin 567 -> 168 bytes .../gtk-3.0/3.14/assets/titlebutton-min-dark@2.png | Bin 1078 -> 186 bytes .../3.14/assets/titlebutton-min-hover-dark.png | Bin 560 -> 564 bytes .../3.14/assets/titlebutton-min-hover-dark@2.png | Bin 1189 -> 1147 bytes .../gtk-3.0/3.14/assets/titlebutton-min-hover.png | Bin 580 -> 604 bytes .../3.14/assets/titlebutton-min-hover@2.png | Bin 1175 -> 1223 bytes common/gtk-3.0/3.14/assets/titlebutton-min.png | Bin 577 -> 168 bytes common/gtk-3.0/3.14/assets/titlebutton-min@2.png | Bin 1184 -> 186 bytes common/gtk-3.0/3.14/gtk-contained-dark.css | 948 +++++++++++--------- common/gtk-3.0/3.14/gtk-contained-darker.css | 587 ++++++++----- common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 948 +++++++++++--------- common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 587 ++++++++----- common/gtk-3.0/3.14/gtk-contained-solid.css | 444 ++++++---- common/gtk-3.0/3.14/gtk-contained.css | 444 ++++++---- common/gtk-3.0/3.14/sass/_applications.scss | 29 +- common/gtk-3.0/3.14/sass/_colors-public.scss | 7 - common/gtk-3.0/3.14/sass/_colors.scss | 72 +- common/gtk-3.0/3.14/sass/_common.scss | 141 ++- common/gtk-3.0/3.14/sass/_drawing.scss | 61 +- common/gtk-3.0/3.14/sass/_lightdm.scss | 6 +- common/gtk-3.0/3.14/sass/_transparent_widgets.scss | 6 +- common/gtk-3.0/3.16/assets.svg | 689 ++++++--------- .../gtk-3.0/3.16/assets/checkbox-checked-dark.png | Bin 421 -> 423 bytes .../3.16/assets/checkbox-checked-dark@2.png | Bin 646 -> 639 bytes .../assets/checkbox-checked-insensitive-dark.png | Bin 415 -> 422 bytes .../assets/checkbox-checked-insensitive-dark@2.png | Bin 645 -> 647 bytes .../assets/checkbox-checked-selectionmode-dark.png | Bin 668 -> 691 bytes .../checkbox-checked-selectionmode-dark@2.png | Bin 1031 -> 1014 bytes common/gtk-3.0/3.16/assets/checkbox-mixed-dark.png | Bin 257 -> 258 bytes .../gtk-3.0/3.16/assets/checkbox-mixed-dark@2.png | Bin 367 -> 364 bytes .../assets/checkbox-mixed-insensitive-dark.png | Bin 264 -> 265 bytes .../assets/checkbox-mixed-insensitive-dark@2.png | Bin 379 -> 377 bytes .../3.16/assets/checkbox-selectionmode-dark.png | Bin 648 -> 668 bytes .../3.16/assets/checkbox-selectionmode-dark@2.png | Bin 1078 -> 1096 bytes .../3.16/assets/checkbox-unchecked-dark.png | Bin 291 -> 290 bytes .../3.16/assets/checkbox-unchecked-dark@2.png | Bin 470 -> 467 bytes .../assets/checkbox-unchecked-insensitive-dark.png | Bin 287 -> 292 bytes .../checkbox-unchecked-insensitive-dark@2.png | Bin 440 -> 452 bytes .../checkbox-unchecked-insensitive-selected.png | Bin 277 -> 252 bytes .../checkbox-unchecked-insensitive-selected@2.png | Bin 420 -> 368 bytes .../3.16/assets/checkbox-unchecked-selected.png | Bin 299 -> 263 bytes .../3.16/assets/checkbox-unchecked-selected@2.png | Bin 445 -> 379 bytes common/gtk-3.0/3.16/assets/radio-checked-dark.png | Bin 460 -> 458 bytes .../gtk-3.0/3.16/assets/radio-checked-dark@2.png | Bin 862 -> 864 bytes .../3.16/assets/radio-checked-insensitive-dark.png | Bin 497 -> 497 bytes .../assets/radio-checked-insensitive-dark@2.png | Bin 889 -> 891 bytes common/gtk-3.0/3.16/assets/radio-mixed-dark.png | Bin 417 -> 415 bytes common/gtk-3.0/3.16/assets/radio-mixed-dark@2.png | Bin 723 -> 724 bytes .../3.16/assets/radio-mixed-insensitive-dark.png | Bin 449 -> 451 bytes .../3.16/assets/radio-mixed-insensitive-dark@2.png | Bin 751 -> 753 bytes .../gtk-3.0/3.16/assets/radio-unchecked-dark.png | Bin 536 -> 533 bytes .../gtk-3.0/3.16/assets/radio-unchecked-dark@2.png | Bin 1023 -> 1009 bytes .../assets/radio-unchecked-insensitive-dark.png | Bin 506 -> 509 bytes .../assets/radio-unchecked-insensitive-dark@2.png | Bin 1047 -> 1004 bytes .../radio-unchecked-insensitive-selected.png | Bin 450 -> 333 bytes .../radio-unchecked-insensitive-selected@2.png | Bin 876 -> 657 bytes .../3.16/assets/radio-unchecked-selected.png | Bin 500 -> 356 bytes .../3.16/assets/radio-unchecked-selected@2.png | Bin 979 -> 725 bytes common/gtk-3.0/3.16/assets/switch-active-dark.png | Bin 1016 -> 1019 bytes .../gtk-3.0/3.16/assets/switch-active-dark@2.png | Bin 2038 -> 2020 bytes .../3.16/assets/switch-active-header-dark.png | Bin 1021 -> 1015 bytes .../3.16/assets/switch-active-header-dark@2.png | Bin 2027 -> 2040 bytes .../3.16/assets/switch-active-insensitive-dark.png | Bin 1015 -> 1004 bytes .../assets/switch-active-insensitive-dark@2.png | Bin 2051 -> 2058 bytes .../switch-active-insensitive-header-dark.png | Bin 1005 -> 999 bytes .../switch-active-insensitive-header-dark@2.png | Bin 2049 -> 2061 bytes common/gtk-3.0/3.16/assets/switch-dark.png | Bin 1002 -> 985 bytes common/gtk-3.0/3.16/assets/switch-dark@2.png | Bin 1998 -> 1948 bytes common/gtk-3.0/3.16/assets/switch-header-dark.png | Bin 965 -> 1000 bytes .../gtk-3.0/3.16/assets/switch-header-dark@2.png | Bin 1898 -> 1970 bytes .../3.16/assets/switch-insensitive-dark.png | Bin 1022 -> 1003 bytes .../3.16/assets/switch-insensitive-dark@2.png | Bin 2054 -> 2033 bytes .../3.16/assets/switch-insensitive-header-dark.png | Bin 987 -> 1017 bytes .../assets/switch-insensitive-header-dark@2.png | Bin 1990 -> 2075 bytes .../3.16/assets/titlebutton-close-active-dark.png | Bin 539 -> 541 bytes .../assets/titlebutton-close-active-dark@2.png | Bin 1039 -> 991 bytes .../3.16/assets/titlebutton-close-active.png | Bin 533 -> 544 bytes .../3.16/assets/titlebutton-close-active@2.png | Bin 1023 -> 1035 bytes .../assets/titlebutton-close-backdrop-dark.png | Bin 686 -> 568 bytes .../assets/titlebutton-close-backdrop-dark@2.png | Bin 1444 -> 1052 bytes .../3.16/assets/titlebutton-close-backdrop.png | Bin 735 -> 591 bytes .../3.16/assets/titlebutton-close-backdrop@2.png | Bin 1487 -> 1129 bytes .../gtk-3.0/3.16/assets/titlebutton-close-dark.png | Bin 540 -> 542 bytes .../3.16/assets/titlebutton-close-dark@2.png | Bin 1016 -> 1011 bytes .../3.16/assets/titlebutton-close-hover-dark.png | Bin 509 -> 547 bytes .../3.16/assets/titlebutton-close-hover-dark@2.png | Bin 996 -> 992 bytes .../3.16/assets/titlebutton-close-hover.png | Bin 528 -> 543 bytes .../3.16/assets/titlebutton-close-hover@2.png | Bin 955 -> 1048 bytes common/gtk-3.0/3.16/assets/titlebutton-close.png | Bin 508 -> 554 bytes common/gtk-3.0/3.16/assets/titlebutton-close@2.png | Bin 1029 -> 1081 bytes .../3.16/assets/titlebutton-max-backdrop-dark.png | Bin 655 -> 281 bytes .../assets/titlebutton-max-backdrop-dark@2.png | Bin 1272 -> 341 bytes .../3.16/assets/titlebutton-max-backdrop.png | Bin 690 -> 304 bytes .../3.16/assets/titlebutton-max-backdrop@2.png | Bin 1324 -> 353 bytes .../gtk-3.0/3.16/assets/titlebutton-max-dark.png | Bin 661 -> 302 bytes .../gtk-3.0/3.16/assets/titlebutton-max-dark@2.png | Bin 1249 -> 345 bytes .../3.16/assets/titlebutton-max-hover-dark.png | Bin 689 -> 676 bytes .../3.16/assets/titlebutton-max-hover-dark@2.png | Bin 1340 -> 1310 bytes .../gtk-3.0/3.16/assets/titlebutton-max-hover.png | Bin 691 -> 696 bytes .../3.16/assets/titlebutton-max-hover@2.png | Bin 1319 -> 1361 bytes common/gtk-3.0/3.16/assets/titlebutton-max.png | Bin 682 -> 285 bytes common/gtk-3.0/3.16/assets/titlebutton-max@2.png | Bin 1326 -> 383 bytes .../3.16/assets/titlebutton-min-backdrop-dark.png | Bin 556 -> 168 bytes .../assets/titlebutton-min-backdrop-dark@2.png | Bin 1121 -> 187 bytes .../3.16/assets/titlebutton-min-backdrop.png | Bin 598 -> 167 bytes .../3.16/assets/titlebutton-min-backdrop@2.png | Bin 1180 -> 184 bytes .../gtk-3.0/3.16/assets/titlebutton-min-dark.png | Bin 567 -> 168 bytes .../gtk-3.0/3.16/assets/titlebutton-min-dark@2.png | Bin 1078 -> 186 bytes .../3.16/assets/titlebutton-min-hover-dark.png | Bin 560 -> 564 bytes .../3.16/assets/titlebutton-min-hover-dark@2.png | Bin 1189 -> 1147 bytes .../gtk-3.0/3.16/assets/titlebutton-min-hover.png | Bin 580 -> 604 bytes .../3.16/assets/titlebutton-min-hover@2.png | Bin 1175 -> 1223 bytes common/gtk-3.0/3.16/assets/titlebutton-min.png | Bin 577 -> 168 bytes common/gtk-3.0/3.16/assets/titlebutton-min@2.png | Bin 1184 -> 186 bytes common/gtk-3.0/3.16/gtk-contained-dark.css | 964 ++++++++++++--------- common/gtk-3.0/3.16/gtk-contained-darker.css | 591 ++++++++----- common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 964 ++++++++++++--------- common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 591 ++++++++----- common/gtk-3.0/3.16/gtk-contained-solid.css | 436 ++++++---- common/gtk-3.0/3.16/gtk-contained.css | 436 ++++++---- common/gtk-3.0/3.16/sass/_applications.scss | 29 +- common/gtk-3.0/3.16/sass/_colors-public.scss | 7 - common/gtk-3.0/3.16/sass/_colors.scss | 72 +- common/gtk-3.0/3.16/sass/_common.scss | 141 ++- common/gtk-3.0/3.16/sass/_drawing.scss | 56 +- common/gtk-3.0/3.16/sass/_lightdm.scss | 6 +- common/gtk-3.0/3.16/sass/_transparent_widgets.scss | 6 +- common/metacity-1/button-bg.svg | 8 +- common/metacity-1/button-border.svg | 4 +- common/metacity-1/close-icon.svg | 8 +- common/metacity-1/max-icon.svg | 6 +- common/metacity-1/metacity-theme-1-dark.xml | 60 +- common/metacity-1/metacity-theme-1.xml | 48 +- common/metacity-1/metacity-theme-2-dark.xml | 60 +- common/metacity-1/metacity-theme-2.xml | 48 +- common/metacity-1/metacity-theme-3.xml | 54 +- common/metacity-1/min-icon.svg | 10 +- common/unity/dash/close_dash.svg | 56 +- common/unity/dash/close_dash_disabled.svg | 135 ++- common/unity/dash/close_dash_prelight.svg | 56 +- common/unity/dash/close_dash_pressed.svg | 58 +- common/unity/dash/maximize_dash.svg | 56 +- common/unity/dash/maximize_dash_disabled.svg | 52 +- common/unity/dash/maximize_dash_prelight.svg | 161 ++-- common/unity/dash/maximize_dash_pressed.svg | 46 +- common/unity/dash/minimize_dash.svg | 56 +- common/unity/dash/minimize_dash_disabled.svg | 52 +- common/unity/dash/minimize_dash_prelight.svg | 161 ++-- common/unity/dash/minimize_dash_pressed.svg | 46 +- common/unity/window-buttons-dark/close.svg | 58 +- .../unity/window-buttons-dark/close_prelight.svg | 24 +- common/unity/window-buttons-dark/close_pressed.svg | 26 +- .../unity/window-buttons-dark/close_unfocused.svg | 82 +- common/unity/window-buttons-dark/maximize.svg | 24 +- .../window-buttons-dark/maximize_prelight.svg | 12 +- .../unity/window-buttons-dark/maximize_pressed.svg | 99 ++- .../window-buttons-dark/maximize_unfocused.svg | 22 +- common/unity/window-buttons-dark/minimize.svg | 26 +- .../window-buttons-dark/minimize_prelight.svg | 18 +- .../unity/window-buttons-dark/minimize_pressed.svg | 14 +- .../window-buttons-dark/minimize_unfocused.svg | 26 +- common/unity/window-buttons/close.svg | 31 +- common/unity/window-buttons/close_prelight.svg | 29 +- common/unity/window-buttons/close_pressed.svg | 10 +- common/unity/window-buttons/close_unfocused.svg | 87 +- common/unity/window-buttons/maximize.svg | 24 +- common/unity/window-buttons/maximize_prelight.svg | 12 +- common/unity/window-buttons/maximize_pressed.svg | 6 +- common/unity/window-buttons/maximize_unfocused.svg | 22 +- common/unity/window-buttons/minimize.svg | 24 +- common/unity/window-buttons/minimize_prelight.svg | 14 +- common/unity/window-buttons/minimize_pressed.svg | 8 +- common/unity/window-buttons/minimize_unfocused.svg | 22 +- common/xfce-notify-4.0/gtkrc | 8 +- common/xfwm4-dark/bottom-active.xpm | 2 +- common/xfwm4-dark/bottom-inactive.xpm | 2 +- common/xfwm4-dark/close-active.xpm | 112 ++- common/xfwm4-dark/close-inactive.xpm | 104 +-- common/xfwm4-dark/close-prelight.xpm | 105 ++- common/xfwm4-dark/close-pressed.xpm | 114 ++- common/xfwm4-dark/hide-active.xpm | 62 +- common/xfwm4-dark/hide-inactive.xpm | 61 +- common/xfwm4-dark/hide-prelight.xpm | 87 +- common/xfwm4-dark/left-active.xpm | 2 +- common/xfwm4-dark/left-inactive.xpm | 2 +- common/xfwm4-dark/maximize-active.xpm | 78 +- common/xfwm4-dark/maximize-inactive.xpm | 74 +- common/xfwm4-dark/maximize-prelight.xpm | 105 +-- common/xfwm4-dark/menu-active.xpm | 2 +- common/xfwm4-dark/menu-inactive.xpm | 2 +- common/xfwm4-dark/menu-pressed.xpm | 2 +- common/xfwm4-dark/right-active.xpm | 2 +- common/xfwm4-dark/right-inactive.xpm | 2 +- common/xfwm4-dark/shade-active.xpm | 2 +- common/xfwm4-dark/shade-inactive.xpm | 2 +- common/xfwm4-dark/shade-pressed.xpm | 2 +- common/xfwm4-dark/stick-active.xpm | 2 +- common/xfwm4-dark/stick-inactive.xpm | 2 +- common/xfwm4-dark/stick-pressed.xpm | 2 +- common/xfwm4-dark/title-1-active-shaded.xpm | 6 +- common/xfwm4-dark/title-1-active.xpm | 6 +- common/xfwm4-dark/title-1-inactive.xpm | 6 +- common/xfwm4-dark/title-2-active.xpm | 6 +- common/xfwm4-dark/title-2-inactive.xpm | 6 +- common/xfwm4-dark/title-3-active.xpm | 6 +- common/xfwm4-dark/title-3-inactive.xpm | 6 +- common/xfwm4-dark/title-4-active.xpm | 6 +- common/xfwm4-dark/title-4-inactive.xpm | 6 +- common/xfwm4-dark/title-5-active.xpm | 6 +- common/xfwm4-dark/title-5-inactive.xpm | 6 +- common/xfwm4-dark/top-left-active-shaded.xpm | 6 +- common/xfwm4-dark/top-left-active.xpm | 6 +- common/xfwm4-dark/top-left-inactive.xpm | 6 +- common/xfwm4-dark/top-right-active-shaded.xpm | 6 +- common/xfwm4-dark/top-right-active.xpm | 6 +- common/xfwm4-dark/top-right-inactive.xpm | 6 +- common/xfwm4/close-active.xpm | 104 ++- common/xfwm4/close-inactive.xpm | 91 +- common/xfwm4/close-prelight.xpm | 107 +-- common/xfwm4/close-pressed.xpm | 106 +-- common/xfwm4/hide-active.xpm | 49 +- common/xfwm4/hide-inactive.xpm | 47 +- common/xfwm4/hide-prelight.xpm | 84 +- common/xfwm4/maximize-active.xpm | 65 +- common/xfwm4/maximize-inactive.xpm | 61 +- common/xfwm4/maximize-prelight.xpm | 100 +-- extra/Arc-Plank/dock.theme | 8 +- extra/Chrome/arc-darker-theme.crx | Bin 2217 -> 2217 bytes .../Chrome/arc-darker-theme/images/theme_frame.png | Bin 140 -> 140 bytes .../images/theme_frame_inactive.png | Bin 140 -> 140 bytes 476 files changed, 8546 insertions(+), 7498 deletions(-) diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css index 74bda1e..ad41f97 100644 --- a/common/cinnamon/cinnamon.css +++ b/common/cinnamon/cinnamon.css @@ -13,40 +13,40 @@ stage { 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; } + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .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; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .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; } + background-color: white; + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .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; + color: #5c616c; background-color: #fbfbfc; - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .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; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px #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); } + background-color: rgba(251, 251, 252, 0.55); + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .notification-button, .notification-icon-button, .modal-dialog-button-box .modal-dialog-button { min-height: 20px; @@ -54,30 +54,26 @@ stage { 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); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .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); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .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); } + color: #5d626e; + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .popup-menu #notification StEntry, #menu-search-entry { padding: 7px; @@ -86,20 +82,20 @@ stage { selected-color: #ffffff; transition-duration: 300ms; border-radius: 3px; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #ffffff; - border: 1px solid #cfd6e6; } + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .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; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .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; } + border-color: 1px solid #e0e4ee; + box-shadow: inset 0 2px 4px rgba(251, 251, 251, 0.05); } .popup-menu #notification StEntry StIcon.capslock-warning, #menu-search-entry StIcon.capslock-warning { icon-size: 16px; warning-color: #F27835; @@ -113,20 +109,20 @@ stage { selected-color: #ffffff; transition-duration: 300ms; border-radius: 3px; - 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); } + background-color: rgba(102, 109, 132, 0.35); + border: 1px solid rgba(26, 28, 34, 0.35); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .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; } + color: #ffffff; + background-color: #5294E2; + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .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); } + color: rgba(186, 195, 207, 0.55); + background-color: rgba(102, 109, 132, 0.2); + border: 1px solid rgba(26, 28, 34, 0.35); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } StScrollView.vfade { -st-vfade-offset: 0px; } @@ -231,7 +227,7 @@ StScrollBar { #Tooltip { border-radius: 3px; padding: 5px 12px; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); color: #BAC3CF; font-size: 1em; font-weight: normal; @@ -380,8 +376,8 @@ StScrollBar { spacing: 12px; } .window-caption { - background-color: rgba(42, 44, 51, 0.95); - border: 1px solid rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); + border: 1px solid rgba(53, 57, 69, 0.95); color: #BAC3CF; spacing: 25px; border-radius: 2px; @@ -401,10 +397,10 @@ StScrollBar { 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); } + background-color: rgba(102, 109, 132, 0.35); + border: 1px solid rgba(26, 28, 34, 0.35); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .expo-workspaces-name-entry:focus, .expo-workspaces-name-entry#selected:focus { border: 1px solid #5294E2; @@ -425,7 +421,7 @@ StScrollBar { border-radius: 2px; } .expo-background { - background-color: #2a2c33; } + background-color: #353945; } .workspace-thumbnails { spacing: 14px; } @@ -744,15 +740,15 @@ StScrollBar { 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); } + background-color: rgba(102, 109, 132, 0.35); + border: 1px solid rgba(26, 28, 34, 0.35); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .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; } + color: #ffffff; + background-color: #5294E2; + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .run-dialog .modal-dialog-button-box { border: none; box-shadow: none; @@ -815,7 +811,7 @@ StScrollBar { border-width: 0px; } #keyboard { - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); border-width: 0; border-top-width: 1px; border-color: rgba(0, 0, 0, 0.4); } @@ -835,34 +831,30 @@ StScrollBar { 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); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .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); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .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); } + color: #5d626e; + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .keyboard-subkeys { color: #BAC3CF; padding: 5px; -arrow-border-radius: 2px; - -arrow-background-color: rgba(42, 44, 51, 0.95); + -arrow-background-color: rgba(53, 57, 69, 0.95); -arrow-border-width: 1px; -arrow-border-color: rgba(0, 0, 0, 0.4); -arrow-base: 20px; @@ -881,10 +873,10 @@ StScrollBar { 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; } + background-color: white; + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .menu-places-box { margin: auto; @@ -909,10 +901,10 @@ StScrollBar { .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; } + background-color: white; + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .menu-application-button-selected:highlighted { font-weight: bold; } .menu-application-button-label:ltr { @@ -926,10 +918,10 @@ StScrollBar { .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; } + background-color: white; + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .menu-category-button-hover { background-color: red; border-radius: 2px; } diff --git a/common/cinnamon/common-assets/misc/bg.svg b/common/cinnamon/common-assets/misc/bg.svg index cf27958..feeddea 100644 --- a/common/cinnamon/common-assets/misc/bg.svg +++ b/common/cinnamon/common-assets/misc/bg.svg @@ -15,7 +15,7 @@ id="svg5386" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="notification.svg"> + sodipodi:docname="bg.svg"> + style="display:inline;opacity:0.65"> - diff --git a/common/cinnamon/common-assets/misc/desklet-header.svg b/common/cinnamon/common-assets/misc/desklet-header.svg index fd6b6df..a6e1054 100644 --- a/common/cinnamon/common-assets/misc/desklet-header.svg +++ b/common/cinnamon/common-assets/misc/desklet-header.svg @@ -38,9 +38,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="22.627416" - inkscape:cx="16.568127" - inkscape:cy="2.2143252" + inkscape:zoom="15.999999" + inkscape:cx="13.051047" + inkscape:cy="8.8454562" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -88,7 +88,7 @@ height="21.999889" width="23" id="rect4164-4-3" - style="display:inline;opacity:0.72000002;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:0.84;fill:none;fill-opacity:1;stroke:#161a26;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:0.95;fill:#2b2f3b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + sodipodi:docname="osd.svg"> image/svg+xml - + @@ -58,7 +58,7 @@ id="layer1" transform="translate(0,-1020.3622)"> + style="display:inline;opacity:0.65"> image/svg+xml - + @@ -57,19 +57,23 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1025.3622)"> - - + + + + diff --git a/common/cinnamon/common-assets/panel/panel-top.svg b/common/cinnamon/common-assets/panel/panel-top.svg index 106ffac..c0a64da 100644 --- a/common/cinnamon/common-assets/panel/panel-top.svg +++ b/common/cinnamon/common-assets/panel/panel-top.svg @@ -25,12 +25,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="8" - inkscape:cx="17.27365" - inkscape:cy="5.4834765" + inkscape:zoom="22.627416" + inkscape:cx="11.460174" + inkscape:cy="2.920327" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="false" + showgrid="true" units="px" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -48,7 +48,7 @@ image/svg+xml - + @@ -58,14 +58,14 @@ id="layer1" transform="translate(0,-1025.3622)"> image/svg+xml - + @@ -58,19 +58,20 @@ id="layer1" transform="translate(0,-1004.3622)"> + id="g4136" + transform="matrix(0,-1,-1,0,1052.3622,1052.3622)"> + transform="translate(0,1004.3622)" + d="m 0,0 0,1 45,0 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,1 46,0 c 1.108,0 2,-0.892 2,-2 L 48,2 C 48,0.892 47.108,0 46,0 L 0,0 Z" + style="display:inline;opacity:0.81000001;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + inkscape:connector-curvature="0" /> + d="m 45,1005.3622 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,-46 z" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 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 index 2d7ca3b..6d0c2d2 100644 --- 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 @@ -23,11 +23,11 @@ pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="5.6568542" - inkscape:cx="-9.1188503" - inkscape:cy="22.886139" + inkscape:zoom="11.313708" + inkscape:cx="12.059039" + inkscape:cy="31.364908" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -35,7 +35,8 @@ inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" - inkscape:snap-bbox-edge-midpoints="true"> + inkscape:snap-bbox-edge-midpoints="true" + showborder="false"> @@ -48,7 +49,7 @@ image/svg+xml - + @@ -57,21 +58,23 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - - + + + + 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 index e80ed3f..c666279 100644 --- 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 @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="11.313708" - inkscape:cx="32.981286" - inkscape:cy="14.79234" + inkscape:zoom="7.9999996" + inkscape:cx="15.785874" + inkscape:cy="23.97024" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -59,14 +59,14 @@ id="layer1" transform="translate(0,-1004.3622)"> + inkscape:snap-bbox-edge-midpoints="true" + showborder="false"> @@ -48,7 +49,7 @@ image/svg+xml - + @@ -57,21 +58,23 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - - + + + + 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 index b56904e..a501da7 100644 --- 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 @@ -23,11 +23,11 @@ pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="5.6568542" - inkscape:cx="-9.1188503" - inkscape:cy="22.886139" + inkscape:zoom="11.313708" + inkscape:cx="12.059039" + inkscape:cy="31.364908" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -35,7 +35,8 @@ inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" - inkscape:snap-bbox-edge-midpoints="true"> + inkscape:snap-bbox-edge-midpoints="true" + showborder="false"> @@ -48,7 +49,7 @@ image/svg+xml - + @@ -57,21 +58,23 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - - + + + + 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 index 12d3b6b..5fb7bf2 100644 --- a/common/gnome-shell/3.14/common-assets/dash/dash-left.svg +++ b/common/gnome-shell/3.14/common-assets/dash/dash-left.svg @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="4" - inkscape:cx="-8.268968" - inkscape:cy="37.523776" + inkscape:zoom="45.254834" + inkscape:cx="43.604809" + inkscape:cy="43.393322" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -58,12 +58,12 @@ id="layer1" transform="translate(0,-1004.3622)"> image/svg+xml - + @@ -57,16 +57,21 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - - + + + + 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 index 1d05a3c..5f52736 100644 --- a/common/gnome-shell/3.14/common-assets/dash/dash-top.svg +++ b/common/gnome-shell/3.14/common-assets/dash/dash-top.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6568542" - inkscape:cx="-6.5243243" - inkscape:cy="14.85871" + inkscape:cx="-0.050167206" + inkscape:cy="27.067669" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -48,7 +48,7 @@ image/svg+xml - + @@ -58,19 +58,20 @@ id="layer1" transform="translate(0,-1004.3622)"> + id="g4136" + transform="matrix(0,1,-1,0,1052.3622,1004.3622)"> + transform="translate(0,1004.3622)" + d="m 0,0 0,1 45,0 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,1 46,0 c 1.108,0 2,-0.892 2,-2 L 48,2 C 48,0.892 47.108,0 46,0 L 0,0 Z" + style="display:inline;opacity:0.81000001;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + inkscape:connector-curvature="0" /> + d="m 45,1005.3622 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,-46 z" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> diff --git a/common/gnome-shell/3.14/common-assets/misc/bg.svg b/common/gnome-shell/3.14/common-assets/misc/bg.svg index cf27958..feeddea 100644 --- a/common/gnome-shell/3.14/common-assets/misc/bg.svg +++ b/common/gnome-shell/3.14/common-assets/misc/bg.svg @@ -15,7 +15,7 @@ id="svg5386" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="notification.svg"> + sodipodi:docname="bg.svg"> + style="display:inline;opacity:0.65"> - diff --git a/common/gnome-shell/3.14/common-assets/misc/notification.svg b/common/gnome-shell/3.14/common-assets/misc/notification.svg index 21a613a..94c92a9 100644 --- a/common/gnome-shell/3.14/common-assets/misc/notification.svg +++ b/common/gnome-shell/3.14/common-assets/misc/notification.svg @@ -39,9 +39,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.313708" - inkscape:cx="15.008847" - inkscape:cy="15.732233" + inkscape:zoom="15.999999" + inkscape:cx="8.9535339" + inkscape:cy="19.450947" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -67,7 +67,7 @@ image/svg+xml - + @@ -76,76 +76,71 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1028.3622)"> + + + transform="translate(-425.99994,666.36228)" + id="g4271" + style="display:inline;opacity:0.64999999"> + ry="8" + rx="8" + y="362.49994" + x="426.49994" + height="31" + width="31.000011" + id="rect4164-4-7-5-3-8-8" + style="display:inline;opacity:0.02000002;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - - - - - - - + ry="6.999999" + rx="7" + y="363.49997" + x="427.49994" + height="28.999996" + width="29.000011" + id="rect4164-4-7-5-3-8" + style="display:inline;opacity:0.07000002;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + + diff --git a/common/gnome-shell/3.14/common-assets/misc/osd.svg b/common/gnome-shell/3.14/common-assets/misc/osd.svg index e7a4202..df41a00 100644 --- a/common/gnome-shell/3.14/common-assets/misc/osd.svg +++ b/common/gnome-shell/3.14/common-assets/misc/osd.svg @@ -15,7 +15,7 @@ id="svg5386" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="notification.svg"> + sodipodi:docname="osd.svg"> image/svg+xml - + @@ -58,7 +58,7 @@ id="layer1" transform="translate(0,-1020.3622)"> + style="display:inline;opacity:0.65"> image/svg+xml - + @@ -58,14 +58,14 @@ id="layer1" transform="translate(0,-1025.3622)"> .overview-icon { - background-color: rgba(8, 8, 9, 0.8); - border: 1px solid rgba(186, 195, 207, 0.3); } + background-color: rgba(46, 50, 60, 0.95); + border: 1px solid rgba(37, 40, 49, 0.95); } .app-well-app.app-folder:hover > .overview-icon { - background-color: rgba(54, 57, 65, 0.95); } + background-color: rgba(71, 76, 92, 0.95); } .app-well-app.app-folder:active > .overview-icon, .app-well-app.app-folder:checked > .overview-icon { background-color: #5294E2; @@ -1355,12 +1353,11 @@ StScrollBar { .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; } + -arrow-background-color: rgba(46, 50, 60, 0.95); + -arrow-border-color: rgba(37, 40, 49, 0.95); + -arrow-border-width: 1px; + -arrow-base: 5; + -arrow-rise: 5; } .app-folder-popup-bin { padding: 5px; } @@ -1416,7 +1413,7 @@ StScrollBar { color: #5c616c; } #message-tray { - background: #2a2c33; + background: #353945; background-repeat: repeat; height: 72px; border: solid rgba(0, 0, 0, 0.6); @@ -1492,20 +1489,17 @@ StScrollBar { padding-left: 6px; } .summary-source-button .summary-source { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #BAC3CF; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .summary-source-button:hover .summary-source { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #BAC3CF; - border: 1px solid #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .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 black; color: #ffffff; border: 1px solid #5294E2; background-color: #5294E2; } @@ -1562,12 +1556,12 @@ StScrollBar { padding: 7px; caret-color: #BAC3CF; color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); - border: 1px solid rgba(0, 0, 0, 0.4); + background-color: rgba(102, 109, 132, 0.35); + border: 1px solid rgba(26, 28, 34, 0.35); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .notification StEntry:focus { - color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); + color: #ffffff; + background-color: #5294E2; border: 1px solid #5294E2; box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } @@ -1595,12 +1589,12 @@ StScrollBar { StEntry.chat-response { padding: 7px; color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); - border: 1px solid rgba(0, 0, 0, 0.4); + background-color: rgba(102, 109, 132, 0.35); + border: 1px solid rgba(26, 28, 34, 0.35); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } StEntry.chat-response:focus { - color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); + color: #ffffff; + background-color: #5294E2; border: 1px solid #5294E2; box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } @@ -1667,10 +1661,10 @@ StEntry.chat-response { border-width: 0; } #keyboard { - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); border-width: 0; border-top-width: 1px; - border-color: rgba(0, 0, 0, 0.4); } + border-color: rgba(0, 0, 0, 0.2); } .keyboard-layout { spacing: 10px; @@ -1688,34 +1682,30 @@ StEntry.chat-response { box-shadow: none; background-gradient-direction: none; text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #BAC3CF; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .keyboard-key:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #BAC3CF; - border: 1px solid #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .keyboard-key:active, .keyboard-key:checked { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; 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 black; - color: #555a62; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .keyboard-subkeys { color: #BAC3CF; padding: 5px; -arrow-border-radius: 2px; - -arrow-background-color: rgba(42, 44, 51, 0.95); + -arrow-background-color: rgba(53, 57, 69, 0.95); -arrow-border-width: 1px; -arrow-border-color: rgba(0, 0, 0, 0.4); -arrow-base: 20px; @@ -1782,28 +1772,28 @@ StEntry.chat-response { padding: 3px 18px; } .login-dialog .modal-dialog-button:default { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; - border: 1px solid #cfd6e6; } + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .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 black; color: #5c616c; - background-color: #fbfbfc; - border: 1px solid #5294E2; } + background-color: white; + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .login-dialog .modal-dialog-button:default:active { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #ffffff; background-color: #5294E2; - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px #5294E2; } .login-dialog .modal-dialog-button:default:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); - background-color: rgba(251, 251, 252, 0.55); } + background-color: rgba(251, 251, 252, 0.55); + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .login-dialog-logo-bin { padding: 24px 0px; } @@ -1937,7 +1927,7 @@ StEntry.chat-response { .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); + background-color: rgba(53, 57, 69, 0.45); color: #BAC3CF; border-radius: 4px; } .screen-shield-notifications-container .notification { @@ -1951,7 +1941,7 @@ StEntry.chat-response { padding: 0px 0px 0px 12px; } #panel.lock-screen { - background-color: rgba(42, 44, 51, 0.5); } + background-color: rgba(53, 57, 69, 0.5); } .screen-shield-background { background: black; @@ -2008,12 +1998,12 @@ StEntry.chat-response { selection-background-color: #5294E2; selected-color: #ffffff; color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); - border: 1px solid rgba(0, 0, 0, 0.4); + background-color: rgba(102, 109, 132, 0.35); + border: 1px solid rgba(26, 28, 34, 0.35); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .lg-dialog StEntry:focus { - color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); + color: #ffffff; + background-color: #5294E2; border: 1px solid #5294E2; box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } @@ -2046,7 +2036,7 @@ StEntry.chat-response { .lg-extension { border: 1px solid rgba(0, 0, 0, 0.7); border-radius: 2px; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); padding: 4px; } .lg-extension-name { diff --git a/common/gnome-shell/3.14/sass/_colors.scss b/common/gnome-shell/3.14/sass/_colors.scss index 9c51858..47daa0f 100644 --- a/common/gnome-shell/3.14/sass/_colors.scss +++ b/common/gnome-shell/3.14/sass/_colors.scss @@ -2,15 +2,15 @@ // it gets @if ed depending on $variant -$base_color: if($variant =='light', #ffffff, #383C45); +$base_color: if($variant =='light', #ffffff, #404552); $text_color: if($variant == 'light', #5c616c, #D3DAE3); -$bg_color: if($variant =='light', #F5F6F7, #444852); +$bg_color: if($variant =='light', #F5F6F7, #383C4A); $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%)); +$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%)); $link_color: if($variant == 'light', darken($selected_bg_color,10%), lighten($selected_bg_color,20%)); @@ -28,63 +28,67 @@ $suggested_color: #4DADD4; $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; } +@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343f, 0.03); } +@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343f; } $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_border: if($variant == 'light' and $darker=='false', darken($header_bg, 7%), darken($header_bg, 4%)); $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_bg: if($transparency == 'true', transparentize(#353945, 0.05), #353945); $dark_sidebar_fg: #BAC3CF; -$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 10%)); +$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 5%)); $osd_fg_color: $dark_sidebar_fg; -$osd_bg_color: darken($dark_sidebar_bg, 8%); +$osd_bg_color: $dark_sidebar_bg; + +$osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_button_border: transparentize(darken($osd_bg_color, 12%), 0.6); + +$osd_entry_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_entry_border: transparentize(darken($osd_bg_color, 12%), 0.6); $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; +$panel_bg: darken($dark_sidebar_bg, 4.7%); +$panel_fg: $dark_sidebar_fg; + +$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); +$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); + +$header_entry_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($base_color, 0.1)); +$header_entry_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); + +$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); +$button_border: $entry_border; + +$header_button_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($button_bg, 0.1)); +$header_button_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); //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_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #cc575d); +$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #d7787d); +$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #be3841); -$wm_icon_close_bg: $selected_fg_color; -$wm_icon_close_hover_bg: $selected_fg_color; -$wm_icon_close_active_bg: $selected_fg_color; +$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #2f343f); // 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_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #454C5C); $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_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #262932); -$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_bg: if($variant == 'light' and $darker == 'false', #90949E, #90939B); +$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #666A74); +$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #C4C7CC); $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 index 9aee0a1..29b7953 100644 --- a/common/gnome-shell/3.14/sass/_common.scss +++ b/common/gnome-shell/3.14/sass/_common.scss @@ -614,7 +614,7 @@ StScrollBar { margin: 10px 0px; background-color: transparent; border: none; - border-image: url("common-assets/menu-separator.svg") 1 1 1 1; + border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } // Background menu @@ -641,7 +641,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; } @@ -686,7 +686,7 @@ StScrollBar { border-radius: 2px; &:outlined { - padding: 6px; + padding: 8px; border: 1px solid $selected_bg_color; } @@ -802,7 +802,7 @@ StScrollBar { border-image: url('common-assets/panel/panel.svg') 1 1 1 1; // Fix dynamic top bar extension - .dynamic-top-bar-white-btn { border-image: none; } + &.dynamic-top-bar-white-btn { border-image: none; } &.unlock-screen, &.login-screen, @@ -1272,7 +1272,10 @@ StScrollBar { // // Overview // -#overview { spacing: 24px; } +#overview { + spacing: 24px; + background: lighten(opacify($dark_sidebar_bg, 1), 3%); +} .overview-controls { padding-bottom: 32px; } @@ -1613,22 +1616,19 @@ StScrollBar { padding: 4px 32px; background-gradient-direction: none; - background-color: $osd_bg_color; - color: $osd_fg_color; - border-color: rgba(0,0,0,0.7); + @include button(osd); - &:hover { - background-color: $osd_bg_color; - color: $osd_fg_color; - border-color: $selected_bg_color; + &:hover { @include button(osd-hover); } + &:checked { + color: $selected_fg_color; + background-color: $selected_bg_color; } - &:checked { @include button(osd-active); } &:first-child:ltr, - &:last-child:rtl { border-radius: 2px 0 0 2px; } + &:last-child:rtl { border-radius: 2px 0 0 2px; border-right-width: 0; } &:last-child:ltr, - &:first-child:rtl { border-radius: 0 2px 2px 0; } + &:first-child:rtl { border-radius: 0 2px 2px 0; border-left-width: 0;} } // @@ -1684,12 +1684,12 @@ StScrollBar { .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); + background-color: darken($dark_sidebar_bg, 3%); + border: 1px solid darken($dark_sidebar_bg, 7%); } &:hover > .overview-icon { - background-color: lighten($panel_bg, 10%); + background-color: lighten($dark_sidebar_bg, 8%); } &:active > .overview-icon, &:checked > .overview-icon { @@ -1704,12 +1704,12 @@ StScrollBar { .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; + -arrow-background-color: darken($dark_sidebar_bg, 3%); + -arrow-border-color: darken($dark_sidebar_bg, 7%); + -arrow-border-width: 1px; + -arrow-base: 5; + -arrow-rise: 5; + } .app-folder-popup-bin { padding: 5px; } .app-folder-icon { @@ -2059,7 +2059,7 @@ StEntry.chat-response { background-color: $osd_bg_color; border-width: 0; border-top-width: 1px; - border-color: transparentize(black, 0.6); + border-color: transparentize(black, 0.8); } .keyboard-layout { diff --git a/common/gnome-shell/3.14/sass/_drawing.scss b/common/gnome-shell/3.14/sass/_drawing.scss index 5ab1463..738a69d 100644 --- a/common/gnome-shell/3.14/sass/_drawing.scss +++ b/common/gnome-shell/3.14/sass/_drawing.scss @@ -20,41 +20,41 @@ color: $text_color; background-color: $entry_bg; border: 1px solid $entry_border; - box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9); + box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95); } @if $t==focus { color: $fg_color; background-color: $entry_bg; border: 1px solid $selected_bg_color; - box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9); + box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95); } @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%); - box-shadow: inset 0 2px 4px transparentize(mix($entry_bg, $bg_color, 55%), 0.9); + box-shadow: inset 0 2px 4px transparentize(mix($entry_bg, $bg_color, 55%), 0.95); } @if $t==osd { color: $osd_fg_color; - background-color: transparentize(black, 0.8); - border: 1px solid transparentize(black, 0.6); + background-color: $osd_entry_bg; + border: 1px solid $osd_entry_border; box-shadow: inset 0 2px 4px transparentize(black, 0.95); } @if $t==osd-focus { - color: $osd_fg_color; - background-color: transparentize(black, 0.8); + color: $selected_fg_color; + background-color: $selected_bg_color; border: 1px solid $selected_bg_color; box-shadow: inset 0 2px 4px transparentize(black, 0.95); } @if $t==osd-insensitive { - color: $osd_insensitive_fg_color; - background-color: transparentize(black, 0.9); - border-color: 1px solid transparentize(black, 0.6); + color: transparentize($osd_fg_color, 0.45); + background-color: transparentize($osd_entry_bg, 0.15); + border: 1px solid $osd_entry_border; box-shadow: inset 0 2px 4px transparentize(black, 0.95); } } @@ -68,7 +68,6 @@ //@extend %reset_style; text-shadow: 0 1px transparentize($base_color, 1); - box-shadow: inset 0 0 black; @if $t==normal { // @@ -77,6 +76,7 @@ color: $fg_color; background-color: $button_bg; border: 1px solid $button_border; + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==focus { @@ -86,15 +86,17 @@ color: $fg_color; background-color: $button_bg; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==focus-hover { // // focused button // - color: $selected_bg_color; + color: $fg_color; background-color: $button_bg; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==hover { @@ -102,8 +104,9 @@ // hovered button // color: $fg_color; - background-color: $button_bg; - border: 1px solid $selected_bg_color; + background-color: lighten($button_bg, 5%); + border: 1px solid $button_border; + box-shadow: inset 0 2px 4px transparentize(lighten($button_bg, 5%), 0.95); } @else if $t==active { @@ -113,6 +116,7 @@ color: $selected_fg_color; background-color: $selected_bg_color; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px $selected_bg_color; } @else if $t==insensitive { @@ -122,6 +126,7 @@ color: $insensitive_fg_color; border: 1px solid transparentize($button_border, 0.45); background-color: transparentize($button_bg, 0.45); + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==osd { @@ -129,8 +134,8 @@ // normal osd button // color: $osd_fg_color; - border: 1px solid transparentize(black, 0.55); - background-color: transparentize(black, 0.7); + border: 1px solid $osd_button_border; + background-color: $osd_button_bg; } @else if $t==osd-hover { @@ -138,8 +143,8 @@ // active osd button // color: $osd_fg_color; - border: 1px solid $selected_bg_color; - background-color: transparentize(black, 0.7); + border: 1px solid $osd_button_border; + background-color: opacify(lighten($osd_button_bg, 7%), 0.1); } @else if $t==osd-active { @@ -156,7 +161,7 @@ // insensitive osd button // color: $osd_insensitive_fg_color; - border: 1px solid transparentize(black, 0.55); - background-color: transparentize(black, 0.85); + border: 1px solid $osd_button_border; + background-color: transparentize($osd_button_bg, 0.15); } } 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 index b9e8761..ad2de78 100644 --- a/common/gnome-shell/3.16/common-assets/dash/dash-bottom.svg +++ b/common/gnome-shell/3.16/common-assets/dash/dash-bottom.svg @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="16" - inkscape:cx="33.341558" - inkscape:cy="21.66656" + inkscape:zoom="5.6568542" + inkscape:cx="-0.050167206" + inkscape:cy="27.067669" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -48,7 +48,7 @@ image/svg+xml - + @@ -58,19 +58,20 @@ id="layer1" transform="translate(0,-1004.3622)"> + id="g4136" + transform="matrix(0,-1,-1,0,1052.3622,1052.3622)"> + transform="translate(0,1004.3622)" + d="m 0,0 0,1 45,0 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,1 46,0 c 1.108,0 2,-0.892 2,-2 L 48,2 C 48,0.892 47.108,0 46,0 L 0,0 Z" + style="display:inline;opacity:0.81000001;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + inkscape:connector-curvature="0" /> + d="m 45,1005.3622 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,-46 z" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 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 index 2d7ca3b..6d0c2d2 100644 --- 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 @@ -23,11 +23,11 @@ pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="5.6568542" - inkscape:cx="-9.1188503" - inkscape:cy="22.886139" + inkscape:zoom="11.313708" + inkscape:cx="12.059039" + inkscape:cy="31.364908" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -35,7 +35,8 @@ inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" - inkscape:snap-bbox-edge-midpoints="true"> + inkscape:snap-bbox-edge-midpoints="true" + showborder="false"> @@ -48,7 +49,7 @@ image/svg+xml - + @@ -57,21 +58,23 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - - + + + + 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 index e80ed3f..c666279 100644 --- 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 @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="11.313708" - inkscape:cx="32.981286" - inkscape:cy="14.79234" + inkscape:zoom="7.9999996" + inkscape:cx="15.785874" + inkscape:cy="23.97024" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -59,14 +59,14 @@ id="layer1" transform="translate(0,-1004.3622)"> + inkscape:snap-bbox-edge-midpoints="true" + showborder="false"> @@ -48,7 +49,7 @@ image/svg+xml - + @@ -57,21 +58,23 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - - + + + + 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 index b56904e..a501da7 100644 --- 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 @@ -23,11 +23,11 @@ pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="5.6568542" - inkscape:cx="-9.1188503" - inkscape:cy="22.886139" + inkscape:zoom="11.313708" + inkscape:cx="12.059039" + inkscape:cy="31.364908" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -35,7 +35,8 @@ inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" - inkscape:snap-bbox-edge-midpoints="true"> + inkscape:snap-bbox-edge-midpoints="true" + showborder="false"> @@ -48,7 +49,7 @@ image/svg+xml - + @@ -57,21 +58,23 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - - + + + + 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 index 12d3b6b..5fb7bf2 100644 --- a/common/gnome-shell/3.16/common-assets/dash/dash-left.svg +++ b/common/gnome-shell/3.16/common-assets/dash/dash-left.svg @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="4" - inkscape:cx="-8.268968" - inkscape:cy="37.523776" + inkscape:zoom="45.254834" + inkscape:cx="43.604809" + inkscape:cy="43.393322" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -58,12 +58,12 @@ id="layer1" transform="translate(0,-1004.3622)"> image/svg+xml - + @@ -57,16 +57,21 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - - + + + + 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 index 1d05a3c..5f52736 100644 --- a/common/gnome-shell/3.16/common-assets/dash/dash-top.svg +++ b/common/gnome-shell/3.16/common-assets/dash/dash-top.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6568542" - inkscape:cx="-6.5243243" - inkscape:cy="14.85871" + inkscape:cx="-0.050167206" + inkscape:cy="27.067669" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -48,7 +48,7 @@ image/svg+xml - + @@ -58,19 +58,20 @@ id="layer1" transform="translate(0,-1004.3622)"> + id="g4136" + transform="matrix(0,1,-1,0,1052.3622,1004.3622)"> + transform="translate(0,1004.3622)" + d="m 0,0 0,1 45,0 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,1 46,0 c 1.108,0 2,-0.892 2,-2 L 48,2 C 48,0.892 47.108,0 46,0 L 0,0 Z" + style="display:inline;opacity:0.81000001;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + inkscape:connector-curvature="0" /> + d="m 45,1005.3622 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,-46 z" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> diff --git a/common/gnome-shell/3.16/common-assets/misc/bg.svg b/common/gnome-shell/3.16/common-assets/misc/bg.svg index cf27958..feeddea 100644 --- a/common/gnome-shell/3.16/common-assets/misc/bg.svg +++ b/common/gnome-shell/3.16/common-assets/misc/bg.svg @@ -15,7 +15,7 @@ id="svg5386" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="notification.svg"> + sodipodi:docname="bg.svg"> + style="display:inline;opacity:0.65"> - diff --git a/common/gnome-shell/3.16/common-assets/misc/osd.svg b/common/gnome-shell/3.16/common-assets/misc/osd.svg index e7a4202..df41a00 100644 --- a/common/gnome-shell/3.16/common-assets/misc/osd.svg +++ b/common/gnome-shell/3.16/common-assets/misc/osd.svg @@ -15,7 +15,7 @@ id="svg5386" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="notification.svg"> + sodipodi:docname="osd.svg"> image/svg+xml - + @@ -58,7 +58,7 @@ id="layer1" transform="translate(0,-1020.3622)"> + style="display:inline;opacity:0.65"> image/svg+xml - + @@ -58,14 +58,14 @@ id="layer1" transform="translate(0,-1025.3622)"> .overview-icon { - background-color: rgba(8, 8, 9, 0.8); - border: 1px solid rgba(186, 195, 207, 0.3); } + background-color: rgba(46, 50, 60, 0.95); + border: 1px solid rgba(37, 40, 49, 0.95); } .app-well-app.app-folder:hover > .overview-icon { - background-color: rgba(54, 57, 65, 0.95); } + background-color: rgba(71, 76, 92, 0.95); } .app-well-app.app-folder:active > .overview-icon, .app-well-app.app-folder:checked > .overview-icon { background-color: #5294E2; @@ -1324,12 +1322,11 @@ StScrollBar { .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; } + -arrow-background-color: rgba(46, 50, 60, 0.95); + -arrow-border-color: rgba(37, 40, 49, 0.95); + -arrow-border-width: 1px; + -arrow-base: 5; + -arrow-rise: 5; } .app-folder-popup-bin { padding: 5px; } @@ -1507,7 +1504,7 @@ StScrollBar { color: pink; } .legacy-tray { - background-color: rgba(31, 33, 37, 0.95); } + background-color: rgba(43, 46, 55, 0.95); } .legacy-tray:ltr { border-radius: 0 2px 0 0; border-left-width: 0; } @@ -1542,10 +1539,10 @@ StScrollBar { border-width: 0; } #keyboard { - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); border-width: 0; border-top-width: 1px; - border-color: rgba(0, 0, 0, 0.4); } + border-color: rgba(0, 0, 0, 0.2); } .keyboard-layout { spacing: 10px; @@ -1562,34 +1559,30 @@ StScrollBar { border-radius: 3px; box-shadow: none; text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #BAC3CF; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .keyboard-key:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #BAC3CF; - border: 1px solid #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .keyboard-key:active, .keyboard-key:checked { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; 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 black; - color: #555a62; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .keyboard-subkeys { color: #BAC3CF; padding: 5px; -arrow-border-radius: 2px; - -arrow-background-color: rgba(42, 44, 51, 0.95); + -arrow-background-color: rgba(53, 57, 69, 0.95); -arrow-border-width: 1px; -arrow-border-color: rgba(0, 0, 0, 0.4); -arrow-base: 20px; @@ -1656,28 +1649,28 @@ StScrollBar { padding: 3px 18px; } .login-dialog .modal-dialog-button:default { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; - border: 1px solid #cfd6e6; } + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .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 black; color: #5c616c; - background-color: #fbfbfc; - border: 1px solid #5294E2; } + background-color: white; + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .login-dialog .modal-dialog-button:default:active { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #ffffff; background-color: #5294E2; - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px #5294E2; } .login-dialog .modal-dialog-button:default:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); - background-color: rgba(251, 251, 252, 0.55); } + background-color: rgba(251, 251, 252, 0.55); + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .login-dialog-logo-bin { padding: 24px 0px; } @@ -1811,7 +1804,7 @@ StScrollBar { .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); + background-color: rgba(53, 57, 69, 0.45); color: #BAC3CF; border-radius: 4px; } .screen-shield-notifications-container .notification { @@ -1825,7 +1818,7 @@ StScrollBar { padding: 0px 0px 0px 12px; } #panel.lock-screen { - background-color: rgba(42, 44, 51, 0.5); } + background-color: rgba(53, 57, 69, 0.5); } .screen-shield-background { background: black; @@ -1882,12 +1875,12 @@ StScrollBar { selection-background-color: #5294E2; selected-color: #ffffff; color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); - border: 1px solid rgba(0, 0, 0, 0.4); + background-color: rgba(102, 109, 132, 0.35); + border: 1px solid rgba(26, 28, 34, 0.35); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .lg-dialog StEntry:focus { - color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); + color: #ffffff; + background-color: #5294E2; border: 1px solid #5294E2; box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } @@ -1920,7 +1913,7 @@ StScrollBar { .lg-extension { border: 1px solid rgba(0, 0, 0, 0.7); border-radius: 2px; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); padding: 4px; } .lg-extension-name { diff --git a/common/gnome-shell/3.16/sass/_colors.scss b/common/gnome-shell/3.16/sass/_colors.scss index 9c51858..47daa0f 100644 --- a/common/gnome-shell/3.16/sass/_colors.scss +++ b/common/gnome-shell/3.16/sass/_colors.scss @@ -2,15 +2,15 @@ // it gets @if ed depending on $variant -$base_color: if($variant =='light', #ffffff, #383C45); +$base_color: if($variant =='light', #ffffff, #404552); $text_color: if($variant == 'light', #5c616c, #D3DAE3); -$bg_color: if($variant =='light', #F5F6F7, #444852); +$bg_color: if($variant =='light', #F5F6F7, #383C4A); $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%)); +$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%)); $link_color: if($variant == 'light', darken($selected_bg_color,10%), lighten($selected_bg_color,20%)); @@ -28,63 +28,67 @@ $suggested_color: #4DADD4; $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; } +@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343f, 0.03); } +@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343f; } $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_border: if($variant == 'light' and $darker=='false', darken($header_bg, 7%), darken($header_bg, 4%)); $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_bg: if($transparency == 'true', transparentize(#353945, 0.05), #353945); $dark_sidebar_fg: #BAC3CF; -$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 10%)); +$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 5%)); $osd_fg_color: $dark_sidebar_fg; -$osd_bg_color: darken($dark_sidebar_bg, 8%); +$osd_bg_color: $dark_sidebar_bg; + +$osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_button_border: transparentize(darken($osd_bg_color, 12%), 0.6); + +$osd_entry_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_entry_border: transparentize(darken($osd_bg_color, 12%), 0.6); $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; +$panel_bg: darken($dark_sidebar_bg, 4.7%); +$panel_fg: $dark_sidebar_fg; + +$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); +$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); + +$header_entry_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($base_color, 0.1)); +$header_entry_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); + +$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); +$button_border: $entry_border; + +$header_button_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($button_bg, 0.1)); +$header_button_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); //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_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #cc575d); +$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #d7787d); +$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #be3841); -$wm_icon_close_bg: $selected_fg_color; -$wm_icon_close_hover_bg: $selected_fg_color; -$wm_icon_close_active_bg: $selected_fg_color; +$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #2f343f); // 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_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #454C5C); $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_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #262932); -$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_bg: if($variant == 'light' and $darker == 'false', #90949E, #90939B); +$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #666A74); +$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #C4C7CC); $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 0d8c3a1..3b1647c 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -1292,7 +1292,10 @@ StScrollBar { // // Overview // -#overview { spacing: 24px; } +#overview { + spacing: 24px; + background: lighten(opacify($dark_sidebar_bg, 1), 3%); +} .overview-controls { padding-bottom: 32px; } @@ -1555,22 +1558,19 @@ StScrollBar { .app-view-control { padding: 4px 32px; - background-color: $osd_bg_color; - color: $osd_fg_color; - border-color: rgba(0,0,0,0.7); + @include button(osd); - &:hover { - background-color: $osd_bg_color; - color: $osd_fg_color; - border-color: $selected_bg_color; + &:hover { @include button(osd-hover); } + &:checked { + color: $selected_fg_color; + background-color: $selected_bg_color; } - &:checked { @include button(osd-active); } &:first-child:ltr, - &:last-child:rtl { border-radius: 2px 0 0 2px; } + &:last-child:rtl { border-radius: 2px 0 0 2px; border-right-width: 0; } &:last-child:ltr, - &:first-child:rtl { border-radius: 0 2px 2px 0; } + &:first-child:rtl { border-radius: 0 2px 2px 0; border-left-width: 0;} } // @@ -1633,12 +1633,12 @@ StScrollBar { .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); + background-color: darken($dark_sidebar_bg, 3%); + border: 1px solid darken($dark_sidebar_bg, 7%); } &:hover > .overview-icon { - background-color: lighten($panel_bg, 10%); + background-color: lighten($dark_sidebar_bg, 8%); } &:active > .overview-icon, &:checked > .overview-icon { @@ -1653,12 +1653,12 @@ StScrollBar { .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; + -arrow-background-color: darken($dark_sidebar_bg, 3%); + -arrow-border-color: darken($dark_sidebar_bg, 7%); + -arrow-border-width: 1px; + -arrow-base: 5; + -arrow-rise: 5; + } .app-folder-popup-bin { padding: 5px; } .app-folder-icon { @@ -1880,7 +1880,7 @@ $legacy_icon_size: 24px; background-color: $osd_bg_color; border-width: 0; border-top-width: 1px; - border-color: transparentize(black, 0.6); + border-color: transparentize(black, 0.8); } .keyboard-layout { diff --git a/common/gnome-shell/3.16/sass/_drawing.scss b/common/gnome-shell/3.16/sass/_drawing.scss index 5ab1463..738a69d 100644 --- a/common/gnome-shell/3.16/sass/_drawing.scss +++ b/common/gnome-shell/3.16/sass/_drawing.scss @@ -20,41 +20,41 @@ color: $text_color; background-color: $entry_bg; border: 1px solid $entry_border; - box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9); + box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95); } @if $t==focus { color: $fg_color; background-color: $entry_bg; border: 1px solid $selected_bg_color; - box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9); + box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95); } @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%); - box-shadow: inset 0 2px 4px transparentize(mix($entry_bg, $bg_color, 55%), 0.9); + box-shadow: inset 0 2px 4px transparentize(mix($entry_bg, $bg_color, 55%), 0.95); } @if $t==osd { color: $osd_fg_color; - background-color: transparentize(black, 0.8); - border: 1px solid transparentize(black, 0.6); + background-color: $osd_entry_bg; + border: 1px solid $osd_entry_border; box-shadow: inset 0 2px 4px transparentize(black, 0.95); } @if $t==osd-focus { - color: $osd_fg_color; - background-color: transparentize(black, 0.8); + color: $selected_fg_color; + background-color: $selected_bg_color; border: 1px solid $selected_bg_color; box-shadow: inset 0 2px 4px transparentize(black, 0.95); } @if $t==osd-insensitive { - color: $osd_insensitive_fg_color; - background-color: transparentize(black, 0.9); - border-color: 1px solid transparentize(black, 0.6); + color: transparentize($osd_fg_color, 0.45); + background-color: transparentize($osd_entry_bg, 0.15); + border: 1px solid $osd_entry_border; box-shadow: inset 0 2px 4px transparentize(black, 0.95); } } @@ -68,7 +68,6 @@ //@extend %reset_style; text-shadow: 0 1px transparentize($base_color, 1); - box-shadow: inset 0 0 black; @if $t==normal { // @@ -77,6 +76,7 @@ color: $fg_color; background-color: $button_bg; border: 1px solid $button_border; + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==focus { @@ -86,15 +86,17 @@ color: $fg_color; background-color: $button_bg; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==focus-hover { // // focused button // - color: $selected_bg_color; + color: $fg_color; background-color: $button_bg; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==hover { @@ -102,8 +104,9 @@ // hovered button // color: $fg_color; - background-color: $button_bg; - border: 1px solid $selected_bg_color; + background-color: lighten($button_bg, 5%); + border: 1px solid $button_border; + box-shadow: inset 0 2px 4px transparentize(lighten($button_bg, 5%), 0.95); } @else if $t==active { @@ -113,6 +116,7 @@ color: $selected_fg_color; background-color: $selected_bg_color; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px $selected_bg_color; } @else if $t==insensitive { @@ -122,6 +126,7 @@ color: $insensitive_fg_color; border: 1px solid transparentize($button_border, 0.45); background-color: transparentize($button_bg, 0.45); + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==osd { @@ -129,8 +134,8 @@ // normal osd button // color: $osd_fg_color; - border: 1px solid transparentize(black, 0.55); - background-color: transparentize(black, 0.7); + border: 1px solid $osd_button_border; + background-color: $osd_button_bg; } @else if $t==osd-hover { @@ -138,8 +143,8 @@ // active osd button // color: $osd_fg_color; - border: 1px solid $selected_bg_color; - background-color: transparentize(black, 0.7); + border: 1px solid $osd_button_border; + background-color: opacify(lighten($osd_button_bg, 7%), 0.1); } @else if $t==osd-active { @@ -156,7 +161,7 @@ // insensitive osd button // color: $osd_insensitive_fg_color; - border: 1px solid transparentize(black, 0.55); - background-color: transparentize(black, 0.85); + border: 1px solid $osd_button_border; + background-color: transparentize($osd_button_bg, 0.15); } } diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg index c383e92..03f4f96 100644 --- a/common/gtk-2.0/assets-dark.svg +++ b/common/gtk-2.0/assets-dark.svg @@ -565,11 +565,11 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="4" - inkscape:cx="0.57764109" - inkscape:cy="348.64275" + inkscape:zoom="11.313708" + inkscape:cx="247.42082" + inkscape:cy="280.79196" inkscape:document-units="px" - inkscape:current-layer="layer3" + inkscape:current-layer="layer1" showgrid="false" showborder="false" inkscape:window-width="1366" @@ -626,7 +626,8 @@ id="layer3" inkscape:label="superbackdrop" style="display:inline" - transform="translate(7,283.63782)"> + transform="translate(7,283.63782)" + sodipodi:insensitive="true"> + style="opacity:1;fill:#505666;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#3e4351;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#303440;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#2e3340;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> + style="opacity:1;fill:#262934;fill-opacity:1;stroke:#cfd6e6;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> @@ -826,7 +827,7 @@ @@ -837,17 +838,19 @@ transform="translate(-19,1036.9872)"> + inkscape:label="#g21853" + style=""> + style="opacity:1;fill:#262934;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + id="scdsdcd-1-9" + style=""> + id="g5428-8-1-4-0-0-5-9" + style="" /> + id="g5400-0-5" + style=""> @@ -948,7 +953,7 @@ height="1.9999826" width="5" id="rect3977-39-88" - style="fill:#32363d;fill-opacity:1;stroke:none" /> + style="fill:#2b303b;fill-opacity:1;stroke:none" /> + style="fill:#2b303b;fill-opacity:1;stroke:none" /> @@ -998,7 +1003,7 @@ id="g5428-8-1-7-9"> @@ -1189,38 +1194,41 @@ height="5.3846149" width="5.3863964" id="use15101-5-7-2-3" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#32363d;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#2b303b;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;enable-background:accumulate" ry="2.6923075" /> + id="g10964-66-0" + style=""> + id="g7025-1-8" + style=""> + id="g5428-8-1-7-6-8" + style=""> @@ -1273,7 +1281,7 @@ id="g5400-00-1"> + style="fill:#2b303b;fill-opacity:1;stroke:none" /> + style="fill:#2b303b;fill-opacity:1;stroke:none" /> + style="opacity:1;fill:#262934;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + id="sdsd-6-1" + style=""> + transform="translate(0,-30)" + style=""> + id="g5428-8-1-4-0-0-0-6" + style="" /> + id="g5400-7-2" + style=""> + style="opacity:1;fill:#262934;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + id="g10964-62-9" + style=""> + id="g7025-6-0" + style=""> + id="g5428-8-1-7-58-8" + style=""> + style="opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#383c4a;fill-opacity:0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#404552;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> @@ -1858,7 +1873,7 @@ height="23" width="25" id="rect7903-7-1" - style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ry="3" /> @@ -1891,14 +1906,14 @@ @@ -1947,7 +1962,7 @@ height="23" width="24" id="rect7903-7-8-6" - style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ry="3" /> @@ -1982,14 +1997,14 @@ @@ -2030,7 +2045,7 @@ height="23" width="24" id="rect7903-7-8-9" - style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ry="3" /> @@ -2065,14 +2080,14 @@ + style="opacity:0.2;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> @@ -2255,7 +2270,7 @@ height="23" width="24" id="rect7903-7-8-76" - style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ry="3" /> @@ -2290,14 +2305,14 @@ @@ -2338,7 +2353,7 @@ height="23" width="24" id="rect7903-7-8-9-1" - style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ry="3" /> @@ -2373,14 +2388,14 @@ + style="opacity:0.2;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#7a7f8a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#7a7f8a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#7a7f8a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:0.05;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:0.03;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:0.03;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#525762;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#525762;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#525762;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#525762;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#525762;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#525762;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#2d303b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:0.55;fill:#444a58;fill-opacity:1;stroke:#262933;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#2d303b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#2d303b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#5f6573;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#3f4551;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#7d8391;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#5f6573;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#3f4551;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#7d8391;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#2b2e39;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:#2b2e39;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:#2b2e39;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:#2b2e39;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#383c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#404552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#52555e;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#2d303b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> @@ -4961,7 +4976,7 @@ height="23" width="25" id="rect7903-7-1-6" - style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#181b20;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#252932;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ry="3" /> @@ -4994,14 +5009,14 @@ @@ -5041,7 +5056,7 @@ height="23" width="25" id="rect7903-7-31-1" - style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ry="3" /> @@ -5073,7 +5088,7 @@ inkscape:label="#g9335" clip-path="url(#clipPath5131)"> @@ -5086,7 +5101,7 @@ height="23" width="24" id="rect7903-7-1-6-9" - style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2d3036;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ry="3" /> @@ -5123,17 +5138,17 @@ height="32" width="24" id="rect6166-6" - style="opacity:1;fill:#2f343b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#2f343f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#262932;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#2b2e39;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#2b2e39;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:0.55;fill:#ffffff;fill-opacity:1;stroke:#cbd2e3;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - + transform="translate(-471,-43)" + style="opacity:0.8"> - - @@ -2633,13 +2621,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> + - - + transform="translate(-480,-43)" + style="opacity:0.8"> @@ -2724,11 +2700,10 @@ id="g4092-0-2-3" style="display:inline" transform="translate(58,0)"> - @@ -2759,13 +2734,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> + @@ -2863,7 +2837,7 @@ sodipodi:nodetypes="csscccsscc" inkscape:connector-curvature="0" d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384" - style="opacity:0.99999999;fill:#70788d;fill-opacity:1;fill-rule:evenodd;stroke:none" + style="opacity:0.99999999;fill:#7a7f8b;fill-opacity:1;fill-rule:evenodd;stroke:none" id="path4293-6" /> @@ -2887,12 +2861,12 @@ @@ -2947,7 +2921,7 @@ id="layer12-45-6"> @@ -2982,7 +2956,7 @@ r="7" cy="255" cx="1376" - style="fill:#ef4048;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="fill:#f13039;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path4068-7-5-4-9" /> @@ -3224,102 +3198,11 @@ x="383" y="-185.63782" /> - - - - - - - - - - - - - - - - - - - - - - - - @@ -3351,20 +3234,8 @@ - - + style="fill:#2b303b;fill-opacity:1;stroke:none" /> + style="fill:#2b303b;fill-opacity:1;stroke:none" /> @@ -3766,7 +3637,7 @@ ry="11" rx="11" /> + style="display:inline;opacity:1;fill:#353a47;fill-opacity:1;stroke:none" /> + style="display:inline;opacity:1;fill:#353a47;fill-opacity:1;stroke:none" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#353a47;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="display:inline;opacity:1;fill:#353a47;fill-opacity:1;stroke:none" /> + style="display:inline;opacity:1;fill:#353a47;fill-opacity:1;stroke:none" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#353a47;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="fill:#2b303b;fill-opacity:1;stroke:none" /> + style="fill:#2b303b;fill-opacity:1;stroke:none" /> + id="sdsd-0-3-0" + style=""> + transform="translate(0,-30)" + style=""> + id="g5428-8-1-4-0-0-65-4-7" + style="" /> + id="g5400-2-4-7" + style=""> + id="g10964-4-8-3" + style=""> + id="g7025-3-8-9" + style=""> + id="g5428-8-1-7-83-9-6" + style=""> @@ -4510,7 +4388,7 @@ height="31" width="30.999969" id="rect13851-8-3" - style="fill:#32363d;fill-opacity:1;stroke:#26282d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="fill:#2d323d;fill-opacity:1;stroke:#262934;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" rx="2" /> + style="display:inline;opacity:1;fill:#2d323f;fill-opacity:1;stroke:none" /> + style="display:inline;opacity:1;fill:#2d323f;fill-opacity:1;stroke:none" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#2d323f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="display:inline;opacity:1;fill:#2d323f;fill-opacity:1;stroke:none" /> + style="display:inline;opacity:1;fill:#2d323f;fill-opacity:1;stroke:none" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#2d323f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> - - - @@ -4865,13 +4730,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> - - @@ -4958,11 +4805,10 @@ id="g4092-0-2-3-4-6" style="display:inline" transform="translate(58,0)"> - @@ -4993,13 +4839,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> @@ -5098,7 +4938,7 @@ sodipodi:nodetypes="csscccsscc" inkscape:connector-curvature="0" d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384" - style="opacity:1;fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:none" + style="opacity:1;fill:#c4c7cc;fill-opacity:1;fill-rule:evenodd;stroke:none" id="path4293-6-7-1" /> @@ -5123,12 +4963,12 @@ @@ -5183,7 +5023,7 @@ id="layer12-45-6-2-7"> @@ -5215,11 +5055,10 @@ id="g4092-0-2-2-1-7-2" style="display:inline" transform="translate(58,0)"> - @@ -5250,13 +5089,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> - - - - - - - - - - - - - - - - - - - - - - - - @@ -5590,20 +5332,8 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gtk-3.0/3.14/assets/checkbox-checked-dark.png b/common/gtk-3.0/3.14/assets/checkbox-checked-dark.png index 0c22603..7fa191b 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-checked-dark.png and b/common/gtk-3.0/3.14/assets/checkbox-checked-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-checked-dark@2.png b/common/gtk-3.0/3.14/assets/checkbox-checked-dark@2.png index e9816ec..ca01544 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-checked-dark@2.png and b/common/gtk-3.0/3.14/assets/checkbox-checked-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-checked-insensitive-dark.png b/common/gtk-3.0/3.14/assets/checkbox-checked-insensitive-dark.png index 3f48d1e..0897a31 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-checked-insensitive-dark.png and b/common/gtk-3.0/3.14/assets/checkbox-checked-insensitive-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-checked-insensitive-dark@2.png b/common/gtk-3.0/3.14/assets/checkbox-checked-insensitive-dark@2.png index e4226d5..45e5af7 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-checked-insensitive-dark@2.png and b/common/gtk-3.0/3.14/assets/checkbox-checked-insensitive-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-checked-selectionmode-dark.png b/common/gtk-3.0/3.14/assets/checkbox-checked-selectionmode-dark.png index 6f6517f..1046141 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-checked-selectionmode-dark.png and b/common/gtk-3.0/3.14/assets/checkbox-checked-selectionmode-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-checked-selectionmode-dark@2.png b/common/gtk-3.0/3.14/assets/checkbox-checked-selectionmode-dark@2.png index 60487bf..0539eb5 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-checked-selectionmode-dark@2.png and b/common/gtk-3.0/3.14/assets/checkbox-checked-selectionmode-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-mixed-dark.png b/common/gtk-3.0/3.14/assets/checkbox-mixed-dark.png index 6abc474..2391076 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-mixed-dark.png and b/common/gtk-3.0/3.14/assets/checkbox-mixed-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-mixed-dark@2.png b/common/gtk-3.0/3.14/assets/checkbox-mixed-dark@2.png index ac02f2c..7fcaed4 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-mixed-dark@2.png and b/common/gtk-3.0/3.14/assets/checkbox-mixed-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-mixed-insensitive-dark.png b/common/gtk-3.0/3.14/assets/checkbox-mixed-insensitive-dark.png index f7c61c6..8ee4970 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-mixed-insensitive-dark.png and b/common/gtk-3.0/3.14/assets/checkbox-mixed-insensitive-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-mixed-insensitive-dark@2.png b/common/gtk-3.0/3.14/assets/checkbox-mixed-insensitive-dark@2.png index 52ab429..6131a2a 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-mixed-insensitive-dark@2.png and b/common/gtk-3.0/3.14/assets/checkbox-mixed-insensitive-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-selectionmode-dark.png b/common/gtk-3.0/3.14/assets/checkbox-selectionmode-dark.png index 3bea14f..72dccd6 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-selectionmode-dark.png and b/common/gtk-3.0/3.14/assets/checkbox-selectionmode-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-selectionmode-dark@2.png b/common/gtk-3.0/3.14/assets/checkbox-selectionmode-dark@2.png index 839d1da..7ca9156 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-selectionmode-dark@2.png and b/common/gtk-3.0/3.14/assets/checkbox-selectionmode-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-unchecked-dark.png b/common/gtk-3.0/3.14/assets/checkbox-unchecked-dark.png index 01eac8d..400df98 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-unchecked-dark.png and b/common/gtk-3.0/3.14/assets/checkbox-unchecked-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-unchecked-dark@2.png b/common/gtk-3.0/3.14/assets/checkbox-unchecked-dark@2.png index cc62ffd..8f69327 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-unchecked-dark@2.png and b/common/gtk-3.0/3.14/assets/checkbox-unchecked-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-unchecked-insensitive-dark.png b/common/gtk-3.0/3.14/assets/checkbox-unchecked-insensitive-dark.png index 0a4c5ef..e41a2b1 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-unchecked-insensitive-dark.png and b/common/gtk-3.0/3.14/assets/checkbox-unchecked-insensitive-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-unchecked-insensitive-dark@2.png b/common/gtk-3.0/3.14/assets/checkbox-unchecked-insensitive-dark@2.png index fc2fed0..4436c3b 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-unchecked-insensitive-dark@2.png and b/common/gtk-3.0/3.14/assets/checkbox-unchecked-insensitive-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-unchecked-insensitive-selected.png b/common/gtk-3.0/3.14/assets/checkbox-unchecked-insensitive-selected.png index e937146..9fa3fcb 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-unchecked-insensitive-selected.png and b/common/gtk-3.0/3.14/assets/checkbox-unchecked-insensitive-selected.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-unchecked-insensitive-selected@2.png b/common/gtk-3.0/3.14/assets/checkbox-unchecked-insensitive-selected@2.png index 9a0e07a..884ee7d 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-unchecked-insensitive-selected@2.png and b/common/gtk-3.0/3.14/assets/checkbox-unchecked-insensitive-selected@2.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-unchecked-selected.png b/common/gtk-3.0/3.14/assets/checkbox-unchecked-selected.png index 53ef897..3c79a87 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-unchecked-selected.png and b/common/gtk-3.0/3.14/assets/checkbox-unchecked-selected.png differ diff --git a/common/gtk-3.0/3.14/assets/checkbox-unchecked-selected@2.png b/common/gtk-3.0/3.14/assets/checkbox-unchecked-selected@2.png index 191ff32..0178b79 100644 Binary files a/common/gtk-3.0/3.14/assets/checkbox-unchecked-selected@2.png and b/common/gtk-3.0/3.14/assets/checkbox-unchecked-selected@2.png differ diff --git a/common/gtk-3.0/3.14/assets/radio-checked-dark.png b/common/gtk-3.0/3.14/assets/radio-checked-dark.png index 84fb0c6..8ec2267 100644 Binary files a/common/gtk-3.0/3.14/assets/radio-checked-dark.png and b/common/gtk-3.0/3.14/assets/radio-checked-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/radio-checked-dark@2.png b/common/gtk-3.0/3.14/assets/radio-checked-dark@2.png index 7ebd4ad..4ce4fd8 100644 Binary files a/common/gtk-3.0/3.14/assets/radio-checked-dark@2.png and b/common/gtk-3.0/3.14/assets/radio-checked-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/radio-checked-insensitive-dark.png b/common/gtk-3.0/3.14/assets/radio-checked-insensitive-dark.png index 04e54f9..b97a676 100644 Binary files a/common/gtk-3.0/3.14/assets/radio-checked-insensitive-dark.png and b/common/gtk-3.0/3.14/assets/radio-checked-insensitive-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/radio-checked-insensitive-dark@2.png b/common/gtk-3.0/3.14/assets/radio-checked-insensitive-dark@2.png index 084470a..a6cf164 100644 Binary files a/common/gtk-3.0/3.14/assets/radio-checked-insensitive-dark@2.png and b/common/gtk-3.0/3.14/assets/radio-checked-insensitive-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/radio-mixed-dark.png b/common/gtk-3.0/3.14/assets/radio-mixed-dark.png index 2df6c2a..fedb1ea 100644 Binary files a/common/gtk-3.0/3.14/assets/radio-mixed-dark.png and b/common/gtk-3.0/3.14/assets/radio-mixed-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/radio-mixed-dark@2.png b/common/gtk-3.0/3.14/assets/radio-mixed-dark@2.png index ae121a3..de7cd2d 100644 Binary files a/common/gtk-3.0/3.14/assets/radio-mixed-dark@2.png and b/common/gtk-3.0/3.14/assets/radio-mixed-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/radio-mixed-insensitive-dark.png b/common/gtk-3.0/3.14/assets/radio-mixed-insensitive-dark.png index d7c512b..e5227c5 100644 Binary files a/common/gtk-3.0/3.14/assets/radio-mixed-insensitive-dark.png and b/common/gtk-3.0/3.14/assets/radio-mixed-insensitive-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/radio-mixed-insensitive-dark@2.png b/common/gtk-3.0/3.14/assets/radio-mixed-insensitive-dark@2.png index d8a7c95..d0e3bcc 100644 Binary files a/common/gtk-3.0/3.14/assets/radio-mixed-insensitive-dark@2.png and b/common/gtk-3.0/3.14/assets/radio-mixed-insensitive-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/radio-unchecked-dark.png b/common/gtk-3.0/3.14/assets/radio-unchecked-dark.png index 6f46a61..b91e016 100644 Binary files a/common/gtk-3.0/3.14/assets/radio-unchecked-dark.png and b/common/gtk-3.0/3.14/assets/radio-unchecked-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/radio-unchecked-dark@2.png b/common/gtk-3.0/3.14/assets/radio-unchecked-dark@2.png index cd741d3..cbc4046 100644 Binary files a/common/gtk-3.0/3.14/assets/radio-unchecked-dark@2.png and b/common/gtk-3.0/3.14/assets/radio-unchecked-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/radio-unchecked-insensitive-dark.png b/common/gtk-3.0/3.14/assets/radio-unchecked-insensitive-dark.png index 4d7905a..1810955 100644 Binary files a/common/gtk-3.0/3.14/assets/radio-unchecked-insensitive-dark.png and b/common/gtk-3.0/3.14/assets/radio-unchecked-insensitive-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/radio-unchecked-insensitive-dark@2.png b/common/gtk-3.0/3.14/assets/radio-unchecked-insensitive-dark@2.png index 089b4d0..fe6d921 100644 Binary files a/common/gtk-3.0/3.14/assets/radio-unchecked-insensitive-dark@2.png and b/common/gtk-3.0/3.14/assets/radio-unchecked-insensitive-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/radio-unchecked-insensitive-selected.png b/common/gtk-3.0/3.14/assets/radio-unchecked-insensitive-selected.png index 0e5cb21..7e5c6e3 100644 Binary files a/common/gtk-3.0/3.14/assets/radio-unchecked-insensitive-selected.png and b/common/gtk-3.0/3.14/assets/radio-unchecked-insensitive-selected.png differ diff --git a/common/gtk-3.0/3.14/assets/radio-unchecked-insensitive-selected@2.png b/common/gtk-3.0/3.14/assets/radio-unchecked-insensitive-selected@2.png index 030e403..40d3fd8 100644 Binary files a/common/gtk-3.0/3.14/assets/radio-unchecked-insensitive-selected@2.png and b/common/gtk-3.0/3.14/assets/radio-unchecked-insensitive-selected@2.png differ diff --git a/common/gtk-3.0/3.14/assets/radio-unchecked-selected.png b/common/gtk-3.0/3.14/assets/radio-unchecked-selected.png index 09cf922..aba589e 100644 Binary files a/common/gtk-3.0/3.14/assets/radio-unchecked-selected.png and b/common/gtk-3.0/3.14/assets/radio-unchecked-selected.png differ diff --git a/common/gtk-3.0/3.14/assets/radio-unchecked-selected@2.png b/common/gtk-3.0/3.14/assets/radio-unchecked-selected@2.png index facb20e..12da542 100644 Binary files a/common/gtk-3.0/3.14/assets/radio-unchecked-selected@2.png and b/common/gtk-3.0/3.14/assets/radio-unchecked-selected@2.png differ diff --git a/common/gtk-3.0/3.14/assets/switch-active-dark.png b/common/gtk-3.0/3.14/assets/switch-active-dark.png index dc16b48..8ff3d4e 100644 Binary files a/common/gtk-3.0/3.14/assets/switch-active-dark.png and b/common/gtk-3.0/3.14/assets/switch-active-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/switch-active-dark@2.png b/common/gtk-3.0/3.14/assets/switch-active-dark@2.png index b992e86..e3f1f94 100644 Binary files a/common/gtk-3.0/3.14/assets/switch-active-dark@2.png and b/common/gtk-3.0/3.14/assets/switch-active-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/switch-active-header-dark.png b/common/gtk-3.0/3.14/assets/switch-active-header-dark.png index 7cab70f..d94d6b6 100644 Binary files a/common/gtk-3.0/3.14/assets/switch-active-header-dark.png and b/common/gtk-3.0/3.14/assets/switch-active-header-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/switch-active-header-dark@2.png b/common/gtk-3.0/3.14/assets/switch-active-header-dark@2.png index e727c33..58d3906 100644 Binary files a/common/gtk-3.0/3.14/assets/switch-active-header-dark@2.png and b/common/gtk-3.0/3.14/assets/switch-active-header-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/switch-active-insensitive-dark.png b/common/gtk-3.0/3.14/assets/switch-active-insensitive-dark.png index 216f8f9..bbd235d 100644 Binary files a/common/gtk-3.0/3.14/assets/switch-active-insensitive-dark.png and b/common/gtk-3.0/3.14/assets/switch-active-insensitive-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/switch-active-insensitive-dark@2.png b/common/gtk-3.0/3.14/assets/switch-active-insensitive-dark@2.png index 2386907..1f3eae9 100644 Binary files a/common/gtk-3.0/3.14/assets/switch-active-insensitive-dark@2.png and b/common/gtk-3.0/3.14/assets/switch-active-insensitive-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/switch-active-insensitive-header-dark.png b/common/gtk-3.0/3.14/assets/switch-active-insensitive-header-dark.png index 7856149..d9d90dd 100644 Binary files a/common/gtk-3.0/3.14/assets/switch-active-insensitive-header-dark.png and b/common/gtk-3.0/3.14/assets/switch-active-insensitive-header-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/switch-active-insensitive-header-dark@2.png b/common/gtk-3.0/3.14/assets/switch-active-insensitive-header-dark@2.png index e1ed561..d274111 100644 Binary files a/common/gtk-3.0/3.14/assets/switch-active-insensitive-header-dark@2.png and b/common/gtk-3.0/3.14/assets/switch-active-insensitive-header-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/switch-dark.png b/common/gtk-3.0/3.14/assets/switch-dark.png index e100e5c..f7bab5d 100644 Binary files a/common/gtk-3.0/3.14/assets/switch-dark.png and b/common/gtk-3.0/3.14/assets/switch-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/switch-dark@2.png b/common/gtk-3.0/3.14/assets/switch-dark@2.png index 59be7d1..895935d 100644 Binary files a/common/gtk-3.0/3.14/assets/switch-dark@2.png and b/common/gtk-3.0/3.14/assets/switch-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/switch-header-dark.png b/common/gtk-3.0/3.14/assets/switch-header-dark.png index eb37281..bda59c1 100644 Binary files a/common/gtk-3.0/3.14/assets/switch-header-dark.png and b/common/gtk-3.0/3.14/assets/switch-header-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/switch-header-dark@2.png b/common/gtk-3.0/3.14/assets/switch-header-dark@2.png index 87ef62e..9011949 100644 Binary files a/common/gtk-3.0/3.14/assets/switch-header-dark@2.png and b/common/gtk-3.0/3.14/assets/switch-header-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/switch-insensitive-dark.png b/common/gtk-3.0/3.14/assets/switch-insensitive-dark.png index 6ea40d6..f81426f 100644 Binary files a/common/gtk-3.0/3.14/assets/switch-insensitive-dark.png and b/common/gtk-3.0/3.14/assets/switch-insensitive-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/switch-insensitive-dark@2.png b/common/gtk-3.0/3.14/assets/switch-insensitive-dark@2.png index 6348480..3fea8f9 100644 Binary files a/common/gtk-3.0/3.14/assets/switch-insensitive-dark@2.png and b/common/gtk-3.0/3.14/assets/switch-insensitive-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/switch-insensitive-header-dark.png b/common/gtk-3.0/3.14/assets/switch-insensitive-header-dark.png index 3091579..2e2a14f 100644 Binary files a/common/gtk-3.0/3.14/assets/switch-insensitive-header-dark.png and b/common/gtk-3.0/3.14/assets/switch-insensitive-header-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/switch-insensitive-header-dark@2.png b/common/gtk-3.0/3.14/assets/switch-insensitive-header-dark@2.png index 22e6449..1cad2eb 100644 Binary files a/common/gtk-3.0/3.14/assets/switch-insensitive-header-dark@2.png and b/common/gtk-3.0/3.14/assets/switch-insensitive-header-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-close-active-dark.png b/common/gtk-3.0/3.14/assets/titlebutton-close-active-dark.png index 4df4c2f..4ee7416 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-close-active-dark.png and b/common/gtk-3.0/3.14/assets/titlebutton-close-active-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-close-active-dark@2.png b/common/gtk-3.0/3.14/assets/titlebutton-close-active-dark@2.png index 1882b92..5defeda 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-close-active-dark@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-close-active-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-close-active.png b/common/gtk-3.0/3.14/assets/titlebutton-close-active.png index 6d2fc72..59fb3fb 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-close-active.png and b/common/gtk-3.0/3.14/assets/titlebutton-close-active.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-close-active@2.png b/common/gtk-3.0/3.14/assets/titlebutton-close-active@2.png index 4e4b471..42838b3 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-close-active@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-close-active@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-close-backdrop-dark.png b/common/gtk-3.0/3.14/assets/titlebutton-close-backdrop-dark.png index bf5cba7..969ad86 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-close-backdrop-dark.png and b/common/gtk-3.0/3.14/assets/titlebutton-close-backdrop-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-close-backdrop-dark@2.png b/common/gtk-3.0/3.14/assets/titlebutton-close-backdrop-dark@2.png index 6c3d5e3..2edc75e 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-close-backdrop-dark@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-close-backdrop-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-close-backdrop.png b/common/gtk-3.0/3.14/assets/titlebutton-close-backdrop.png index 54690f3..6fc80b5 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-close-backdrop.png and b/common/gtk-3.0/3.14/assets/titlebutton-close-backdrop.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-close-backdrop@2.png b/common/gtk-3.0/3.14/assets/titlebutton-close-backdrop@2.png index 01f61f0..f18aee8 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-close-backdrop@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-close-backdrop@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-close-dark.png b/common/gtk-3.0/3.14/assets/titlebutton-close-dark.png index d471b6d..f6e901c 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-close-dark.png and b/common/gtk-3.0/3.14/assets/titlebutton-close-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-close-dark@2.png b/common/gtk-3.0/3.14/assets/titlebutton-close-dark@2.png index 5c5eddf..e73ce97 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-close-dark@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-close-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-close-hover-dark.png b/common/gtk-3.0/3.14/assets/titlebutton-close-hover-dark.png index 3349844..4d51bb4 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-close-hover-dark.png and b/common/gtk-3.0/3.14/assets/titlebutton-close-hover-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-close-hover-dark@2.png b/common/gtk-3.0/3.14/assets/titlebutton-close-hover-dark@2.png index 2c7366a..265bc4c 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-close-hover-dark@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-close-hover-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-close-hover.png b/common/gtk-3.0/3.14/assets/titlebutton-close-hover.png index 157eaac..d076cad 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-close-hover.png and b/common/gtk-3.0/3.14/assets/titlebutton-close-hover.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-close-hover@2.png b/common/gtk-3.0/3.14/assets/titlebutton-close-hover@2.png index 6eb2d20..8c90967 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-close-hover@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-close-hover@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-close.png b/common/gtk-3.0/3.14/assets/titlebutton-close.png index 4ac9243..1769dc6 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-close.png and b/common/gtk-3.0/3.14/assets/titlebutton-close.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-close@2.png b/common/gtk-3.0/3.14/assets/titlebutton-close@2.png index e1c4b76..97bf6cf 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-close@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-close@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-max-backdrop-dark.png b/common/gtk-3.0/3.14/assets/titlebutton-max-backdrop-dark.png index d4f7166..2b3ceb4 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-max-backdrop-dark.png and b/common/gtk-3.0/3.14/assets/titlebutton-max-backdrop-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-max-backdrop-dark@2.png b/common/gtk-3.0/3.14/assets/titlebutton-max-backdrop-dark@2.png index 1945796..1638d56 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-max-backdrop-dark@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-max-backdrop-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-max-backdrop.png b/common/gtk-3.0/3.14/assets/titlebutton-max-backdrop.png index 9440671..c80d889 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-max-backdrop.png and b/common/gtk-3.0/3.14/assets/titlebutton-max-backdrop.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-max-backdrop@2.png b/common/gtk-3.0/3.14/assets/titlebutton-max-backdrop@2.png index 523fffc..ff24e85 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-max-backdrop@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-max-backdrop@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-max-dark.png b/common/gtk-3.0/3.14/assets/titlebutton-max-dark.png index dccb307..ebba44c 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-max-dark.png and b/common/gtk-3.0/3.14/assets/titlebutton-max-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-max-dark@2.png b/common/gtk-3.0/3.14/assets/titlebutton-max-dark@2.png index 225ca11..dc9869a 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-max-dark@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-max-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-max-hover-dark.png b/common/gtk-3.0/3.14/assets/titlebutton-max-hover-dark.png index 4504709..78561bf 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-max-hover-dark.png and b/common/gtk-3.0/3.14/assets/titlebutton-max-hover-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-max-hover-dark@2.png b/common/gtk-3.0/3.14/assets/titlebutton-max-hover-dark@2.png index e910d0b..cfc6075 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-max-hover-dark@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-max-hover-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-max-hover.png b/common/gtk-3.0/3.14/assets/titlebutton-max-hover.png index 1610b34..f333106 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-max-hover.png and b/common/gtk-3.0/3.14/assets/titlebutton-max-hover.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-max-hover@2.png b/common/gtk-3.0/3.14/assets/titlebutton-max-hover@2.png index 6a467da..5f7d90a 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-max-hover@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-max-hover@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-max.png b/common/gtk-3.0/3.14/assets/titlebutton-max.png index d54043f..3112108 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-max.png and b/common/gtk-3.0/3.14/assets/titlebutton-max.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-max@2.png b/common/gtk-3.0/3.14/assets/titlebutton-max@2.png index 3e9373e..b360efb 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-max@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-max@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-min-backdrop-dark.png b/common/gtk-3.0/3.14/assets/titlebutton-min-backdrop-dark.png index 751f194..b04db91 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-min-backdrop-dark.png and b/common/gtk-3.0/3.14/assets/titlebutton-min-backdrop-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-min-backdrop-dark@2.png b/common/gtk-3.0/3.14/assets/titlebutton-min-backdrop-dark@2.png index 20bf7c4..d841da2 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-min-backdrop-dark@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-min-backdrop-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-min-backdrop.png b/common/gtk-3.0/3.14/assets/titlebutton-min-backdrop.png index de62aa1..b83cb7d 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-min-backdrop.png and b/common/gtk-3.0/3.14/assets/titlebutton-min-backdrop.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-min-backdrop@2.png b/common/gtk-3.0/3.14/assets/titlebutton-min-backdrop@2.png index 434b817..c3f8564 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-min-backdrop@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-min-backdrop@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-min-dark.png b/common/gtk-3.0/3.14/assets/titlebutton-min-dark.png index b4ab5f7..b5c9732 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-min-dark.png and b/common/gtk-3.0/3.14/assets/titlebutton-min-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-min-dark@2.png b/common/gtk-3.0/3.14/assets/titlebutton-min-dark@2.png index 7cc4467..80d53fe 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-min-dark@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-min-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-min-hover-dark.png b/common/gtk-3.0/3.14/assets/titlebutton-min-hover-dark.png index a7859cc..2fc70a6 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-min-hover-dark.png and b/common/gtk-3.0/3.14/assets/titlebutton-min-hover-dark.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-min-hover-dark@2.png b/common/gtk-3.0/3.14/assets/titlebutton-min-hover-dark@2.png index 57bf18e..ab18607 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-min-hover-dark@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-min-hover-dark@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-min-hover.png b/common/gtk-3.0/3.14/assets/titlebutton-min-hover.png index 8d6b6c3..54858db 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-min-hover.png and b/common/gtk-3.0/3.14/assets/titlebutton-min-hover.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-min-hover@2.png b/common/gtk-3.0/3.14/assets/titlebutton-min-hover@2.png index f122bb3..c345277 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-min-hover@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-min-hover@2.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-min.png b/common/gtk-3.0/3.14/assets/titlebutton-min.png index 029627d..f4b6db0 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-min.png and b/common/gtk-3.0/3.14/assets/titlebutton-min.png differ diff --git a/common/gtk-3.0/3.14/assets/titlebutton-min@2.png b/common/gtk-3.0/3.14/assets/titlebutton-min@2.png index 2febb1e..bab2bf2 100644 Binary files a/common/gtk-3.0/3.14/assets/titlebutton-min@2.png and b/common/gtk-3.0/3.14/assets/titlebutton-min@2.png differ 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 a765aa0..bde4cd5 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -33,7 +33,7 @@ ***************/ .background { color: #D3DAE3; - background-color: rgba(68, 72, 82, 0.999); } + background-color: rgba(56, 60, 74, 0.999); } /* These wildcard seems unavoidable, need to investigate. @@ -45,16 +45,16 @@ -gtk-image-effect: dim; } .gtkstyle-fallback { - background-color: #444852; + background-color: #383C4A; color: #D3DAE3; } .gtkstyle-fallback:prelight { - background-color: #5b606e; + background-color: #4e5467; color: #D3DAE3; } .gtkstyle-fallback:active { - background-color: #2d3036; + background-color: #22242d; color: #D3DAE3; } .gtkstyle-fallback:insensitive { - background-color: #494d58; + background-color: #3c4150; color: rgba(211, 218, 227, 0.45); } .gtkstyle-fallback:selected { background-color: #5294E2; @@ -62,7 +62,7 @@ .view { color: #D3DAE3; - background-color: #383C45; } + background-color: #404552; } .view.dim-label, GtkLabel.view.separator, GtkPlacesSidebar.sidebar GtkLabel.view.separator, .header-bar .view.subtitle { color: rgba(211, 218, 227, 0.55); } .view.dim-label:selected, GtkLabel.view.separator:selected, .header-bar .view.subtitle:selected, .view.dim-label:selected:focus, GtkLabel.view.separator:selected:focus, .header-bar .view.subtitle:selected:focus { @@ -83,12 +83,12 @@ GtkLabel:insensitive { opacity: 0.55; } GtkAssistant .sidebar { - background-color: #383C45; - border-top: 1px solid #2d3036; } + background-color: #404552; + border-top: 1px solid #2b2e39; } GtkAssistant .sidebar:dir(ltr) { - border-right: 1px solid #2d3036; } + border-right: 1px solid #2b2e39; } GtkAssistant .sidebar:dir(rtl) { - border-left: 1px solid #2d3036; } + border-left: 1px solid #2b2e39; } GtkAssistant.csd .sidebar { border-top-style: none; } @@ -101,7 +101,7 @@ GtkAssistant .sidebar GtkLabel.highlight { color: #ffffff; } GtkTextView { - background-color: #3e424c; } + background-color: #3c414e; } GtkFlowBox .grid-child { padding: 3px; @@ -112,7 +112,7 @@ GtkFlowBox .grid-child { .popover.osd, .osd { color: #BAC3CF; border: none; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); background-clip: padding-box; outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } @@ -144,9 +144,9 @@ GtkFlowBox .grid-child { border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #D3DAE3; - border-color: #2d3036; - background-color: #383c45; - background-image: linear-gradient(to bottom, #383c45); } + border-color: #2b2e39; + background-color: #404552; + background-image: linear-gradient(to bottom, #404552); } .header-bar .entry { padding: 6px; } .entry.image { @@ -155,22 +155,22 @@ GtkFlowBox .grid-child { .entry.flat, .entry.flat:focus { padding: 2px; color: #D3DAE3; - border-color: #2d3036; - background-color: #383c45; - background-image: linear-gradient(to bottom, #383c45); + border-color: #2b2e39; + background-color: #404552; + background-image: linear-gradient(to bottom, #404552); border: none; border-radius: 0; } .entry:focus { background-clip: border-box; color: #D3DAE3; border-color: #5294E2; - background-color: #383c45; - background-image: linear-gradient(to bottom, #383c45); } + background-color: #404552; + background-image: linear-gradient(to bottom, #404552); } .entry:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(56, 60, 69, 0.55); - background-image: linear-gradient(to bottom, rgba(56, 60, 69, 0.55)); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(64, 69, 82, 0.55); + background-image: linear-gradient(to bottom, rgba(64, 69, 82, 0.55)); } .entry:selected, .entry:selected:focus { background-color: #5294E2; @@ -198,7 +198,7 @@ GtkFlowBox .grid-child { .entry.error { color: white; border-color: #FC4138; - background-image: linear-gradient(to bottom, #d5403b); } + background-image: linear-gradient(to bottom, #d6423d); } .entry.error:focus { background-image: linear-gradient(to bottom, #FC4138); color: white; } @@ -208,7 +208,7 @@ GtkFlowBox .grid-child { .entry.warning { color: white; border-color: #F27835; - background-image: linear-gradient(to bottom, #cd6c38); } + background-image: linear-gradient(to bottom, #ce6e3b); } .entry.warning:focus { background-image: linear-gradient(to bottom, #F27835); color: white; } @@ -216,26 +216,26 @@ GtkFlowBox .grid-child { background-color: white; color: #F27835; } .entry.image { - color: #b4bac3; } + color: #b6bcc6; } .entry.image:hover { color: #D3DAE3; } .entry.image:active { color: #5294E2; } .linked.vertical > .entry { - border-bottom-color: #353841; + border-bottom-color: #3a3e4a; box-shadow: none; } .linked.vertical > .entry:focus { border-color: #5294E2; box-shadow: 0 -1px 0 0 #5294E2; } .linked.vertical > .entry:insensitive { - border-bottom-color: #353841; } + border-bottom-color: #3a3e4a; } .linked.vertical > .entry:first-child { - border-bottom-color: #353841; } + border-bottom-color: #3a3e4a; } .linked.vertical > .entry:first-child:focus { border-bottom-color: #5294E2; box-shadow: none; } .linked.vertical > .entry:first-child:insensitive { - border-bottom-color: #353841; } + border-bottom-color: #3a3e4a; } .linked.vertical > .entry:last-child { border-bottom-color: rgba(0, 0, 0, 0.14); } .linked.vertical > .entry:last-child:focus { @@ -245,17 +245,18 @@ GtkFlowBox .grid-child { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.35); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.35)); + background-color: transparent; } + .osd .entry.image, .osd .entry.image:hover { + color: inherit; } .osd .entry:focus { - color: #BAC3CF; - border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } GtkSearchEntry.entry { border-radius: 20px; } @@ -276,15 +277,15 @@ GtkSearchEntry.entry { padding: 5px 8px; color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } .header-bar .button { padding: 6px 11px; } .button.flat { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(68, 72, 82, 0); + background-color: rgba(56, 60, 74, 0); transition: none; } .button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); @@ -294,14 +295,16 @@ GtkSearchEntry.entry { .button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; + border-color: #2b2e39; + background-color: #505666; -gtk-image-effect: highlight; } .button:active, .button:checked { - background-clip: border-box; + background-clip: padding-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8b98b0; + background-color: #8b98b0; + border-color: transparent; background-color: #5294E2; transition-duration: 50ms; } .button:active { @@ -314,8 +317,8 @@ GtkSearchEntry.entry { background-image: none; } .button:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } .button:insensitive > GtkLabel { color: inherit; } .button:insensitive:active, .button:insensitive:checked { @@ -329,31 +332,31 @@ GtkSearchEntry.entry { 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); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); + background-color: rgba(53, 57, 69, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); - background-color: rgba(42, 44, 51, 0.95); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); + background-color: rgba(53, 57, 69, 0.95); } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .button.osd:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .osd .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -375,17 +378,17 @@ GtkSearchEntry.entry { .osd .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .osd .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .osd .button.flat { border-color: transparent; background-color: transparent; @@ -394,12 +397,12 @@ GtkSearchEntry.entry { .osd .button.flat:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .osd .button.flat:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; @@ -526,23 +529,25 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } .inline-toolbar GtkToolButton > .button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8b98b0; + background-color: #8b98b0; + border-color: transparent; background-color: #5294E2; } .inline-toolbar GtkToolButton > .button:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } .inline-toolbar GtkToolButton > .button:insensitive > GtkLabel { color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active, @@ -568,7 +573,15 @@ GtkSearchEntry.entry { GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .button:hover, .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .button:hover:dir(ltr) { - box-shadow: inset 1px 0 #5294E2, inset -1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5), inset -1px 0 rgba(43, 46, 57, 0.5); } + .inline-toolbar GtkToolButton > .button.flat:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active, + GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .button:active, .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .button:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked, + GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .button:checked, .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .button:checked:dir(ltr) { + box-shadow: none; } .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl), .header-bar .linked.stack-switcher > .button:dir(rtl), @@ -585,7 +598,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:first-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .button:first-child:hover, .linked > GtkComboBox:first-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover, .header-bar .linked.stack-switcher > .button:first-child:hover, .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { - box-shadow: inset -1px 0 #5294E2; } + box-shadow: inset -1px 0 rgba(43, 46, 57, 0.5); } + .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active, + .inline-toolbar GtkToolButton:first-child > .button.flat:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .button:first-child:active, .linked > GtkComboBox:first-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked, + .inline-toolbar GtkToolButton:first-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .button:first-child:checked, .linked > GtkComboBox:first-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } .osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button, .primary-toolbar .linked.stack-switcher > .button:last-child, @@ -597,7 +618,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:last-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .button:last-child:hover, .linked > GtkComboBox:last-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover, .header-bar .linked.stack-switcher > .button:last-child:hover, .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { - box-shadow: inset 1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5); } + .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active, + .inline-toolbar GtkToolButton:last-child > .button.flat:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .button:last-child:active, .linked > GtkComboBox:last-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked, + .inline-toolbar GtkToolButton:last-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .button:last-child:checked, .linked > GtkComboBox:last-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl), .header-bar .linked.stack-switcher > .button:last-child:dir(rtl), @@ -615,6 +644,14 @@ GtkSearchEntry.entry { .header-bar .linked.stack-switcher > .button:only-child:hover, .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { box-shadow: none; } + .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active, + .inline-toolbar GtkToolButton:only-child > .button.flat:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .button:only-child:active, .linked > GtkComboBox:only-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked, + .inline-toolbar GtkToolButton:only-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .button:only-child:checked, .linked > GtkComboBox:only-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button, .linked.vertical > .button:hover, @@ -628,7 +665,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:hover, .linked.vertical > .button:hover, .linked.vertical > GtkComboBoxText > .button:hover, .linked.vertical > GtkComboBox > .button:hover { - box-shadow: inset 0 1px #5294E2, inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(43, 46, 57, 0.5), inset 0 1px rgba(43, 46, 57, 0.5); } + .linked.vertical > .entry:active, .linked.vertical > .button:active, + .linked.vertical > GtkComboBoxText > .button:active, + .linked.vertical > GtkComboBox > .button:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked, + .linked.vertical > GtkComboBoxText > .button:checked, + .linked.vertical > GtkComboBox > .button:checked { + box-shadow: none; } .linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, @@ -638,7 +681,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover, .linked.vertical > GtkComboBoxText:first-child > .button:hover, .linked.vertical > GtkComboBox:first-child > .button:hover { - box-shadow: inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(43, 46, 57, 0.5); } + .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active, + .linked.vertical > GtkComboBoxText:first-child > .button:active, + .linked.vertical > GtkComboBox:first-child > .button:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked, + .linked.vertical > GtkComboBoxText:first-child > .button:checked, + .linked.vertical > GtkComboBox:first-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, @@ -648,7 +697,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover, .linked.vertical > GtkComboBoxText:last-child > .button:hover, .linked.vertical > GtkComboBox:last-child > .button:hover { - box-shadow: inset 0 1px #5294E2; } + box-shadow: inset 0 1px rgba(43, 46, 57, 0.5); } + .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active, + .linked.vertical > GtkComboBoxText:last-child > .button:active, + .linked.vertical > GtkComboBox:last-child > .button:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked, + .linked.vertical > GtkComboBoxText:last-child > .button:checked, + .linked.vertical > GtkComboBox:last-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, @@ -659,6 +714,12 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBoxText:only-child > .button:hover, .linked.vertical > GtkComboBox:only-child > .button:hover { box-shadow: none; } + .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active, + .linked.vertical > GtkComboBoxText:only-child > .button:active, + .linked.vertical > GtkComboBox:only-child > .button:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked, + .linked.vertical > GtkComboBoxText:only-child > .button:checked, + .linked.vertical > GtkComboBox:only-child > .button:checked { + box-shadow: none; } .menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, @@ -674,7 +735,7 @@ GtkSearchEntry.entry { outline-offset: -1px; border-radius: 2px; } .menuitem.button.flat:hover { - background-color: #4b4f59; } + background-color: #484c59; } .menuitem.button.flat:checked { color: #D3DAE3; } @@ -706,17 +767,15 @@ GtkSearchEntry.entry { border-radius: 3px; } .spinbutton .button { background-image: none; - border: 1px solid rgba(45, 48, 54, 0.6); + border: 1px solid rgba(43, 46, 57, 0.6); border-style: none none none solid; - color: #cbd2db; + color: #ccd3dc; border-radius: 0; box-shadow: none; } .spinbutton .button:dir(rtl) { border-style: none solid none none; } .spinbutton .button:first-child { color: red; } - .spinbutton .button:hover { - color: #5294E2; } .spinbutton .button:insensitive { color: rgba(211, 218, 227, 0.45); } .spinbutton .button:active { @@ -725,43 +784,47 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child, .spinbutton.vertical:dir(rtl) .button:first-child { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8b98b0; + background-color: #8b98b0; + border-color: transparent; background-color: #5294E2; } .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } .spinbutton.vertical .button:first-child:insensitive, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } .spinbutton.vertical .button:first-child:insensitive > GtkLabel, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive > GtkLabel { color: inherit; } .spinbutton.vertical .button:last-child, .spinbutton.vertical:dir(rtl) .button:last-child { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8b98b0; + background-color: #8b98b0; + border-color: transparent; background-color: #5294E2; } .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } .spinbutton.vertical .button:last-child:insensitive, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } .spinbutton.vertical .button:last-child:insensitive > GtkLabel, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive > GtkLabel { color: inherit; } .spinbutton.vertical.entry, .spinbutton.vertical:dir(rtl).entry { @@ -800,16 +863,17 @@ GtkComboBox { border-left-style: none; } GtkComboBox.combobox-entry .button { color: rgba(211, 218, 227, 0.6); - background-color: #2d3036; - border-color: #2d3036; } + background-color: #2b2e39; + border-color: #2b2e39; } GtkComboBox.combobox-entry .button:hover { - background-color: #383c44; - border-color: #5294E2; - box-shadow: -1px 0 #5294E2; } + background-color: #363a47; + border-color: #363a47; } GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8b98b0; + background-color: #8b98b0; + border-color: transparent; background-color: #5294E2; } GtkComboBox.combobox-entry .button:insensitive { opacity: 0.5; } @@ -820,40 +884,40 @@ GtkComboBox { .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; - background-color: #444852; } + background-color: #383C4A; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: 1px solid rgba(0, 0, 0, 0.6); + border: 1px solid rgba(0, 0, 0, 0.5); border-radius: 3px; - background-color: rgba(42, 44, 51, 0.85); } + background-color: rgba(53, 57, 69, 0.85); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; + background-color: #2f343f; box-shadow: none; border-width: 0 0 1px 0; border-style: solid; - border-image: linear-gradient(to bottom, #2f343b, rgba(31, 34, 39, 0.97)) 1 0 1 0; } + border-image: linear-gradient(to bottom, #2f343f, rgba(32, 35, 43, 0.97)) 1 0 1 0; } .primary-toolbar:backdrop { - background-color: #32383f; } + background-color: #323843; } .inline-toolbar { - background-color: #3d414a; + background-color: #313541; border-style: solid; - border-color: #2d3036; + border-color: #2b2e39; border-width: 0 1px 1px; padding: 3px; border-radius: 0 0 3px 3px; } .search-bar { - background-color: #444852; + background-color: #383C4A; border-style: solid; - border-color: #2d3036; + border-color: #2b2e39; border-width: 0 0 1px; padding: 3px; } .action-bar { - background-color: #3d414a; } + background-color: #313541; } /*************** * Header bars * @@ -863,16 +927,16 @@ GtkComboBox { border-width: 0 0 1px; border-style: solid; border-radius: 0; - border-color: rgba(36, 39, 45, 0.97); + border-color: rgba(38, 42, 51, 0.97); color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; } + background-color: #2f343f; } .csd .header-bar { - background-color: rgba(47, 52, 59, 0.97); } + background-color: rgba(47, 52, 63, 0.97); } .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); - background-color: #32383f; } + background-color: #323843; } .csd .header-bar:backdrop { - background-color: rgba(50, 56, 63, 0.97); } + background-color: rgba(50, 56, 67, 0.97); } .header-bar .title { padding: 0px 12px; } .header-bar .subtitle { @@ -943,28 +1007,28 @@ GtkComboBox { .maximized .header-bar, .maximized .header-bar:backdrop { border-radius: 0; } .maximized .header-bar { - background-color: #2f343b; } + background-color: #2f343f; } .maximized .header-bar:backdrop { - background-color: #32383f; } + background-color: #323843; } .titlebar { padding-left: 7px; padding-right: 7px; border-radius: 3px 3px 0 0; color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; - box-shadow: inset 0 1px rgba(54, 60, 68, 0.97); } + background-color: #2f343f; + box-shadow: inset 0 1px rgba(54, 59, 72, 0.97); } .csd .titlebar { - background-color: rgba(47, 52, 59, 0.97); } + background-color: rgba(47, 52, 63, 0.97); } .titlebar:backdrop { color: rgba(207, 218, 231, 0.5); - background-color: #32383f; } + background-color: #323843; } .csd .titlebar:backdrop { - background-color: rgba(50, 56, 63, 0.97); } + background-color: rgba(50, 56, 67, 0.97); } .maximized .titlebar { - background-color: #2f343b; } + background-color: #2f343f; } .maximized .titlebar:backdrop { - background-color: #32383f; } + background-color: #323843; } .titlebar .titlebar, .titlebar .titlebar:backdrop { @@ -982,8 +1046,8 @@ GtkComboBox { .primary-toolbar .entry, .header-bar .entry { color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } .primary-toolbar .entry.image, .header-bar .entry.image, .primary-toolbar .entry.image:hover, .header-bar .entry.image:hover { color: inherit; } @@ -991,13 +1055,14 @@ GtkComboBox { opacity: 0.85; } .primary-toolbar .entry:focus, .header-bar .entry:focus { color: #ffffff; - border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); + background-clip: padding-box; } .primary-toolbar .entry:focus.image, .header-bar .entry:focus.image { color: #ffffff; } .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus { background-color: #ffffff; color: #5294E2; } @@ -1010,24 +1075,25 @@ GtkComboBox { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); outline-offset: -3px; - background-color: rgba(47, 52, 59, 0); - border-color: rgba(47, 52, 59, 0); } + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .primary-toolbar .button:backdrop, .header-bar .button:backdrop { opacity: 0.7; } .primary-toolbar .button:hover, .header-bar .button:hover { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: rgba(29, 32, 36, 0.97); - background-color: rgba(40, 44, 50, 0.87); } + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } .primary-toolbar .button:active, .header-bar .button:active, .primary-toolbar .button:checked, .header-bar .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; - background-color: #5294E2; } + border-color: transparent; + background-color: #5294E2; + background-clip: padding-box; } .primary-toolbar .button:insensitive, .header-bar .button:insensitive { color: rgba(207, 218, 231, 0.35); - background-color: rgba(47, 52, 59, 0); - border-color: rgba(47, 52, 59, 0); } + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .primary-toolbar .button:insensitive > GtkLabel, .header-bar .button:insensitive > GtkLabel { color: inherit; } .primary-toolbar .button:insensitive:active, .header-bar .button:insensitive:active, .primary-toolbar .button:insensitive:checked, .header-bar .button:insensitive:checked { @@ -1047,12 +1113,12 @@ GtkComboBox { .primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: rgba(29, 32, 36, 0.97); - background-color: rgba(40, 44, 50, 0.87); } + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { - border-color: #5294E2; } + background-color: rgba(134, 144, 165, 0.37); } .primary-toolbar .linked.stack-switcher > .button:active, .header-bar .linked.stack-switcher > .button:active, .primary-toolbar .linked.stack-switcher > .button:checked, @@ -1060,8 +1126,52 @@ GtkComboBox { .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } + .primary-toolbar .linked.stack-switcher > .button:insensitive, + .header-bar .linked.stack-switcher > .button:insensitive, + .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive { + color: rgba(207, 218, 231, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:hover, + .header-bar .linked.stack-switcher > .button:hover, + .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:first-child:hover, + .header-bar .linked.stack-switcher > .button:first-child:hover, + .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:last-child:hover, + .header-bar .linked.stack-switcher > .button:last-child:hover, + .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:hover, + .header-bar .linked.stack-switcher > .button:only-child:hover, + .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked { + box-shadow: none; } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; @@ -1155,24 +1265,25 @@ GtkComboBox { .primary-toolbar GtkComboBox.combobox-entry .button, .header-bar GtkComboBox.combobox-entry .button { color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } .primary-toolbar GtkComboBox.combobox-entry .button.image, .header-bar GtkComboBox.combobox-entry .button.image, .primary-toolbar GtkComboBox.combobox-entry .button.image:hover, .header-bar GtkComboBox.combobox-entry .button.image:hover { color: inherit; } .primary-toolbar GtkComboBox.combobox-entry .button:hover, .header-bar GtkComboBox.combobox-entry .button:hover { color: #ffffff; - border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); + box-shadow: none; } .primary-toolbar GtkComboBox.combobox-entry .button:insensitive, .header-bar GtkComboBox.combobox-entry .button:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } .primary-toolbar GtkProgressBar.trough, .header-bar GtkProgressBar.trough, .primary-toolbar .level-bar.trough, .header-bar .level-bar.trough { - background-color: rgba(207, 218, 231, 0.15); } + background-color: rgba(21, 23, 28, 0.37); } .primary-toolbar GtkProgressBar:backdrop, .header-bar GtkProgressBar:backdrop { opacity: 0.75; } @@ -1181,14 +1292,22 @@ GtkComboBox { opacity: 0.75; } .primary-toolbar .scale.trough, .header-bar .scale.trough { - background-image: linear-gradient(to bottom, rgba(207, 218, 231, 0.15)); } + background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.37)); } .primary-toolbar .scale.trough:insensitive, .header-bar .scale.trough:insensitive { - background-image: linear-gradient(to bottom, rgba(207, 218, 231, 0.1)); } + background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.27)); } .primary-toolbar .scale.slider, .header-bar .scale.slider { - background-image: linear-gradient(to bottom, rgba(55, 59, 68, 0.997)); } + background-image: linear-gradient(to bottom, #454c5c); + border-color: rgba(21, 23, 28, 0.67); } + .primary-toolbar .scale.slider:hover, .header-bar .scale.slider:hover { + background-image: linear-gradient(to bottom, #50586b); + border-color: rgba(21, 23, 28, 0.67); } + .primary-toolbar .scale.slider:active, .header-bar .scale.slider:active { + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .primary-toolbar .scale.slider:insensitive, .header-bar .scale.slider:insensitive { - background-image: linear-gradient(to bottom, rgba(51, 55, 63, 0.982)); } + background-image: linear-gradient(to bottom, rgba(63, 69, 84, 0.991)); + border-color: rgba(21, 23, 28, 0.67); } /************ * Pathbars * @@ -1223,7 +1342,7 @@ GtkTreeView.view { border-color: #93b7e3; } GtkTreeView.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); - color: #868b94; } + color: #8a909b; } GtkTreeView.view.expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } GtkTreeView.view.expander:hover { @@ -1243,13 +1362,13 @@ GtkTreeView.view { background-color: #ffffff; } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #D3DAE3; - background-color: #2d3036; + background-color: #2b2e39; border-radius: 3px; border-width: 0; } column-header .button { - color: #b4bac3; - background-color: #383C45; } + color: #b6bcc6; + background-color: #404552; } column-header .button:hover { color: #5294E2; box-shadow: none; @@ -1266,7 +1385,7 @@ column-header:last-child.button { column-header.button.dnd, column-header .button.dnd, column-header.button.dnd:active, column-header.button.dnd:selected, column-header.button.dnd:hover { transition: none; color: #5294E2; - box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #383C45, inset -1px 0 #383C45; } + box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #404552, inset -1px 0 #404552; } column-header .button, column-header .button:hover, column-header .button:active { padding: 3px 6px; @@ -1275,11 +1394,11 @@ column-header .button, column-header .button:hover, column-header .button:active border-radius: 0; border-image: linear-gradient(to bottom, rgba(255, 255, 255, 0) 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, rgba(255, 255, 255, 0) 80%) 0 1 0 0/0 1px 0 0 stretch; } column-header .button:active, column-header .button:hover { - background-color: #383C45; } + background-color: #404552; } column-header .button:active:hover { color: #D3DAE3; } column-header .button:insensitive { - border-color: #444852; + border-color: #383C4A; background-image: none; } /********* @@ -1288,10 +1407,10 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar { -GtkWidget-window-dragging: true; padding: 0px; - background-color: #2f343b; + background-color: #2f343f; color: rgba(207, 218, 231, 0.8); } .menubar:backdrop { - background-color: #32383f; } + background-color: #323843; } .menubar > .menuitem { padding: 6px 8px; border: solid transparent; @@ -1307,8 +1426,8 @@ column-header .button, column-header .button:hover, column-header .button:active margin: 4px; padding: 0; border-radius: 0; - background-color: #383C45; - border: 1px solid #2d3036; } + background-color: #383C4A; + border: 1px solid #2b2e39; } .csd .menu, .csd .popup { padding: 4px 0px; border-radius: 2px; @@ -1323,7 +1442,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem:insensitive, .popup .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { - color: rgba(56, 60, 69, 0); } + color: rgba(64, 69, 82, 0); } .menu .menuitem.arrow, .popup .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { @@ -1332,11 +1451,11 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none; border-radius: 0; } .menu.button.top, .popup.button.top { - border-bottom: 1px solid #484c55; } + border-bottom: 1px solid #4f5461; } .menu.button.bottom, .popup.button.bottom { - border-top: 1px solid #484c55; } + border-top: 1px solid #4f5461; } .menu.button:hover, .popup.button:hover { - background-color: #484c55; } + background-color: #4f5461; } .menu.button:insensitive, .popup.button:insensitive { color: transparent; background-color: transparent; @@ -1351,13 +1470,13 @@ column-header .button, column-header .button:hover, column-header .button:active .popover { margin: 10px; padding: 2px; - border: 1px solid #212328; + border: 1px solid #20222a; border-radius: 3px; background-clip: border-box; - background-color: #383C45; + background-color: #383C4A; box-shadow: 0 2px 6px 1px rgba(0, 0, 0, 0.35); } .popover .separator, .popover GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .popover .view.separator { - color: rgba(56, 60, 69, 0); } + color: rgba(64, 69, 82, 0); } .popover > .list, .popover > .view, .popover > .toolbar, @@ -1385,7 +1504,7 @@ column-header .button, column-header .button:hover, column-header .button:active *****************/ .notebook { padding: 0; - background-color: #383C45; + background-color: #404552; -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; @@ -1395,7 +1514,7 @@ column-header .button, column-header .button:hover, column-header .button:active -GtkWidget-focus-line-width: 0; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } .notebook.frame { - border: 1px solid #2d3036; } + border: 1px solid #2b2e39; } .notebook.frame.top { border-top-width: 0; } .notebook.frame.bottom { @@ -1405,9 +1524,9 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.frame.left { border-left-width: 0; } .notebook.header { - background-color: #444852; } + background-color: #383C4A; } .notebook.header.frame { - border: 0px solid #2d3036; } + border: 0px solid #2b2e39; } .notebook.header.frame.top { border-bottom-width: 0; } .notebook.header.frame.bottom { @@ -1417,13 +1536,13 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.header.frame.left { border-right-width: 0; } .notebook.header.top { - box-shadow: inset 0 -1px #2d3036; } + box-shadow: inset 0 -1px #2b2e39; } .notebook.header.bottom { - box-shadow: inset 0 1px #2d3036; } + box-shadow: inset 0 1px #2b2e39; } .notebook.header.right { - box-shadow: inset 1px 0 #2d3036; } + box-shadow: inset 1px 0 #2b2e39; } .notebook.header.left { - box-shadow: inset -1px 0 #2d3036; } + box-shadow: inset -1px 0 #2b2e39; } .notebook tab { border-width: 0; border-style: solid; @@ -1444,52 +1563,52 @@ column-header .button, column-header .button:hover, column-header .button:active border-width: 0; border-top-width: 2px; border-color: transparent; - background-color: rgba(56, 60, 69, 0); } + background-color: rgba(64, 69, 82, 0); } .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page, .notebook tab.top:hover, .notebook tab.top.prelight-page { - background-color: rgba(56, 60, 69, 0.5); - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: rgba(64, 69, 82, 0.5); + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.top:active, .notebook tab.top.active-page, .notebook tab.top.active-page:hover { - background-color: #383C45; - box-shadow: inset 0 1px #2d3036, inset 0 -1px #383C45, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: #404552; + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #404552, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.bottom, .notebook tab.bottom { padding-bottom: 6px; border-radius: 0 0 2px 3.5px; border-width: 0; border-bottom-width: 2px; border-color: transparent; - background-color: rgba(56, 60, 69, 0); } + background-color: rgba(64, 69, 82, 0); } .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page { - background-color: rgba(56, 60, 69, 0.5); - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: rgba(64, 69, 82, 0.5); + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.bottom:active, .notebook tab.bottom.active-page, .notebook tab.bottom.active-page:hover { - background-color: #383C45; - box-shadow: inset 0 -1px #383C45, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: #404552; + box-shadow: inset 0 -1px #404552, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.right, .notebook tab.right { padding-right: 17px; border-radius: 0 3.5px 3.5px 0; border-width: 0; border-right-width: 2px; border-color: transparent; - background-color: rgba(56, 60, 69, 0); } + background-color: rgba(64, 69, 82, 0); } .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page { - background-color: rgba(56, 60, 69, 0.5); - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: rgba(64, 69, 82, 0.5); + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.right:active, .notebook tab.right.active-page, .notebook tab.right.active-page:hover { - background-color: #383C45; - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #383C45, inset -1px 0 #2d3036; } + background-color: #404552; + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #404552, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.left, .notebook tab.left { padding-left: 17px; border-radius: 3.5px 0 0 3.5px; border-width: 0; border-left-width: 2px; border-color: transparent; - background-color: rgba(56, 60, 69, 0); } + background-color: rgba(64, 69, 82, 0); } .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page { - background-color: rgba(56, 60, 69, 0.5); - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: rgba(64, 69, 82, 0.5); + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.left:active, .notebook tab.left.active-page, .notebook tab.left.active-page:hover { - background-color: #383C45; - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #383C45; } + background-color: #404552; + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #404552; } .notebook tab GtkLabel { padding: 0 2px; color: rgba(211, 218, 227, 0.45); } @@ -1499,7 +1618,7 @@ column-header .button, column-header .button:hover, column-header .button:active color: #D3DAE3; } .notebook tab .button { padding: 0; - color: #a1a7b0; } + color: #9da3ad; } .notebook tab .button:hover { color: #ff4d4d; } .notebook tab .button:active { @@ -1534,9 +1653,9 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: #7d828c; } + background-color: #767b87; } .scrollbar.slider:hover { - background-color: #a8aeb7; } + background-color: #a5abb5; } .scrollbar.slider:prelight:active { background-color: #5294E2; } .scrollbar.slider.fine-tune { @@ -1550,7 +1669,7 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbar.trough, .scrollbars-junction.frame, .frame.scrollbar.trough { border-color: transparent; - background-color: #383C45; } + background-color: #404552; } /********** * Switch * @@ -1774,21 +1893,21 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { margin: 3px; } .scale.slider { background-clip: border-box; - background-image: linear-gradient(to bottom, #383c45); - border: 1px solid #5294E2; + background-image: linear-gradient(to bottom, #444a58); + border: 1px solid #262933; border-radius: 50%; box-shadow: none; } .scale.slider:hover { - background-image: linear-gradient(to bottom, #5294E2); - border-color: #5294E2; } + background-image: linear-gradient(to bottom, #505666); + border-color: #262933; } .scale.slider:insensitive { - background-image: linear-gradient(to bottom, #3d414b); - border-color: #4c72a1; } + background-image: linear-gradient(to bottom, #3c414e); + border-color: rgba(38, 41, 51, 0.8); } .scale.slider:active { - background-image: linear-gradient(to bottom, #2679db); - border-color: #2679db; } + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(42, 44, 51, 0.95)); + background-image: linear-gradient(to bottom, rgba(53, 57, 69, 0.95)); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1810,15 +1929,15 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough { border: none; border-radius: 2.5px; - background-image: linear-gradient(to bottom, #2f323a); } + background-image: linear-gradient(to bottom, #2d303b); } .scale.trough.highlight { background-image: linear-gradient(to bottom, #5294E2); } .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, rgba(82, 148, 226, 0.55)); } .scale.trough:insensitive { - background-image: linear-gradient(to bottom, rgba(47, 50, 58, 0.55)); } + background-image: linear-gradient(to bottom, rgba(45, 48, 59, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(58, 62, 70, 0.95)); + background-image: linear-gradient(to bottom, rgba(69, 74, 89, 0.95)); outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; @@ -1858,7 +1977,7 @@ GtkProgressBar { GtkProgressBar.trough, .level-bar.trough { border: none; border-radius: 3px; - background-color: #2f323a; } + background-color: #2d303b; } GtkProgressBar.trough.osd, .osd.level-bar.trough { border-style: none; background-color: transparent; @@ -1894,14 +2013,14 @@ GtkLevelBar.vertical { border-color: #F27835; background-color: #F27835; } .level-bar.fill-block.empty-fill-block { - background-color: rgba(211, 218, 227, 0.2); - border-color: rgba(211, 218, 227, 0.2); } + background-color: #404552; + border-color: #404552; } /********** * Frames * **********/ .frame { - border: 1px solid #2d3036; + border: 1px solid #2b2e39; padding: 0; } .frame.flat { border-style: none; } @@ -1927,8 +2046,8 @@ GtkScrolledWindow GtkViewport.frame { * Lists * *********/ .list, .list-row { - background-color: #383C45; - border-color: #2d3036; } + background-color: #404552; + border-color: #2b2e39; } .list-row, .grid-child { @@ -1965,18 +2084,18 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame { padding: 10px; color: #BAC3CF; - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(53, 57, 69, 0.95); 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: rgba(31, 33, 40, 0.95); } .app-notification .button, .app-notification.frame .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } @@ -1984,8 +2103,8 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { @@ -1995,9 +2114,9 @@ GtkScrolledWindow GtkViewport.frame { background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } /************* * Expanders * @@ -2016,7 +2135,7 @@ GtkExpander { ***********/ GtkCalendar { color: #D3DAE3; - border: 1px solid #2d3036; + border: 1px solid #2b2e39; border-radius: 3px; padding: 2px; } GtkCalendar:selected { @@ -2029,8 +2148,9 @@ GtkCalendar { border-radius: 0; } GtkCalendar.button, GtkCalendar.button:focus { color: rgba(211, 218, 227, 0.45); - box-shadow: none; - border: none; } + border-color: transparent; + background-color: transparent; + background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #D3DAE3; } GtkCalendar.highlight { @@ -2045,8 +2165,8 @@ GtkCalendar { .message-dialog { -GtkDialog-button-spacing: 0; } .message-dialog .titlebar { - background-color: rgba(47, 52, 59, 0.97); - border-bottom: 1px solid rgba(31, 34, 39, 0.97); } + background-color: rgba(47, 52, 63, 0.97); + border-bottom: 1px solid rgba(32, 35, 43, 0.97); } .message-dialog.csd.background { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; @@ -2068,19 +2188,19 @@ GtkCalendar { border-bottom-left-radius: 3px; } GtkFileChooserDialog .search-bar { - background-color: #444852; - border-color: #2d3036; + background-color: #383C4A; + border-color: #2b2e39; box-shadow: none; } GtkFileChooserDialog .dialog-action-box { - border-top: 1px solid #2d3036; } + border-top: 1px solid #2b2e39; } /*********** * Sidebar * ***********/ .sidebar { border: none; - background-color: #444852; } + background-color: #383C4A; } .sidebar .scrollbar.trough { background-color: transparent; border-width: 2px; @@ -2110,7 +2230,7 @@ GtkPaned { margin-left: 8px; } .pane-separator { - background-image: linear-gradient(to bottom, #2d3036); } + background-image: linear-gradient(to bottom, #2b2e39); } /************** * GtkInfoBar * @@ -2163,7 +2283,7 @@ GtkInfoBar { color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2211,13 +2331,13 @@ GtkColorSwatch { border-color: rgba(255, 255, 255, 0.5); } GtkColorChooserWidget #add-color-button { - border-color: #383c44; - background-color: #383c44; - color: #444852; + border-color: #313541; + background-color: #313541; + color: #383C4A; box-shadow: none; } GtkColorChooserWidget #add-color-button:hover { - border-color: #2d3036; - background-color: #2d3036; } + border-color: #2b2e39; + background-color: #2b2e39; } GtkColorButton.button { padding: 4px; } @@ -2232,8 +2352,8 @@ GtkColorButton.button { .scale-popup .button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } GtkVolumeButton.button { padding: 8px; } @@ -2244,16 +2364,16 @@ GtkVolumeButton.button { .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px rgba(31, 34, 39, 0.97), 0 4px 8px 1px rgba(0, 0, 0, 0.65); + box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.35); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px rgba(31, 34, 39, 0.97), 0 4px 5px 2px rgba(0, 0, 0, 0.55); } + box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; - box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #212429; } + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } .window-frame.csd.tooltip { border-radius: 2px; box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.55); } @@ -2266,7 +2386,7 @@ GtkVolumeButton.button { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 59, 0); + background-color: rgba(47, 52, 63, 0); border-width: 0; color: transparent; background-position: center; @@ -2632,7 +2752,7 @@ TerminalWindow .notebook tab.top:active, TerminalWindow .notebook tab.top.active-page, TerminalWindow .notebook tab.top.active-page:hover, PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top:active, PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top.active-page, PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top.active-page:hover, PantheonTerminalPantheonTerminalWindow .notebook tab.top:active, PantheonTerminalPantheonTerminalWindow .notebook tab.top.active-page, PantheonTerminalPantheonTerminalWindow .notebook tab.top.active-page:hover { - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } TerminalWindow .notebook tab.reorderable-page.top, TerminalWindow .notebook tab.top, @@ -2642,10 +2762,10 @@ PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top, Panth TerminalWindow .notebook.header.top, PantheonTerminalPantheonTerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #24272d, inset 0 -1px #2d3036; } + box-shadow: inset 0 1px #262a33, inset 0 -1px #2b2e39; } GtkHTML { - background-color: #383C45; + background-color: #404552; color: #D3DAE3; } GtkHTML:active { color: #ffffff; @@ -2678,7 +2798,7 @@ NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { color: #ffffff; } NautilusNotebook.notebook { - background-color: #383C45; } + background-color: #404552; } NautilusNotebook.notebook tab { border-width: 0; border-style: solid; @@ -2688,32 +2808,50 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar { padding: 5px; box-shadow: none; - background-color: #383C45; } + background-color: #404552; } NemoWindow .sidebar .frame { border-width: 0; } NemoWindow GtkSeparator.separator.horizontal, NemoWindow GtkPlacesSidebar.sidebar GtkSeparator.horizontal.view.separator, GtkPlacesSidebar.sidebar NemoWindow GtkSeparator.horizontal.view.separator { - color: #2d3036; } + color: #2b2e39; } NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: rgba(29, 32, 36, 0.97); - background-color: rgba(40, 44, 50, 0.87); } + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { - border-color: #5294E2; } + background-color: rgba(134, 144, 165, 0.37); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive { + color: rgba(207, 218, 231, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .gedit-headerbar-paned { - color: rgba(36, 39, 45, 0.97); } + color: rgba(38, 42, 51, 0.97); } .open-document-selector-listbox-row { - border-bottom: 1px solid #383c44; + border-bottom: 1px solid #2d303b; padding: 6px 6px 6px 12px; } .open-document-selector-listbox-row .path-label { font-size: smaller; @@ -2732,7 +2870,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: inherit; } .gedit-document-panel .prelight-row .button { - color: #a1a7b0; } + color: #9da3ad; } .gedit-document-panel .list-row .button:hover, .gedit-document-panel .prelight-row .button:hover { @@ -2751,13 +2889,13 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: #D3DAE3; } .gedit-document-panel-dragged-row { - border: 1px solid #2d3036; - background-color: #2d3036; + border: 1px solid #2b2e39; + background-color: #22242d; color: #D3DAE3; } GeditStatusbar { - border-top: 1px solid #2d3036; - background-color: #444852; } + border-top: 1px solid #2b2e39; + background-color: #383C4A; } GeditStatusMenuButton.button.flat, GeditStatusMenuButton:prelight.button.flat, @@ -2766,7 +2904,7 @@ GeditStatusMenuButton:checked.button.flat { border-radius: 0; } GeditFileBrowserWidget .toolbar, GeditFileBrowserWidget .inline-toolbar { - border-bottom: 1px solid #2d3036; } + border-bottom: 1px solid #2b2e39; } .gedit-search-entry-occurrences-tag, .gb-search-entry-occurrences-tag { color: rgba(211, 218, 227, 0.6); @@ -2774,9 +2912,9 @@ GeditFileBrowserWidget .toolbar, GeditFileBrowserWidget .inline-toolbar { padding: 2px; } GeditViewFrame .gedit-search-slider, GbEditorFrame .gb-search-slider { - background-color: #494d58; + background-color: #3c4150; padding: 6px; - border-color: #2d3036; + border-color: #2b2e39; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; } @@ -2785,8 +2923,8 @@ GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr), GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { padding: 0 10px; color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover, @@ -2794,25 +2932,19 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { - color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); - background-color: transparent; - border-color: #5294E2; } - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, - GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { - color: inherit; } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { color: #ffffff; - border-color: #5294E2; + border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; @@ -2838,7 +2970,7 @@ GdTaggedEntry { border: none; } .preferences.sidebar GtkListBox { - background-color: #444852; } + background-color: #383C4A; } .preferences.sidebar GtkListBoxRow { padding: 10px; } @@ -2852,7 +2984,7 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #2a2c33; } + background-color: #353945; } GtkBox.gb-command-bar-box GtkLabel { color: #BAC3CF; } @@ -2861,7 +2993,7 @@ GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; color: #BAC3CF; background-image: none; - background-color: #2a2c33; + background-color: #353945; padding: 6px 6px 6px 6px; border: none; } @@ -2876,10 +3008,10 @@ GbSearchDisplayGroup GtkListBox .list-row, GbDocumentStack .button { GbViewStack GtkBox.header.notebook, GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { - border-bottom: 1px solid #2d3036; } + border-bottom: 1px solid #2b2e39; } GbViewStack.focused GtkBox.header.notebook { - background-color: #383C45; } + background-color: #404552; } GbViewStack.focused GtkBox.header.notebook .button.dim-label, GbViewStack.focused GtkBox.header.notebook GtkLabel.button.separator, GbViewStack.focused GtkBox.header.notebook .header-bar .button.subtitle, .header-bar GbViewStack.focused GtkBox.header.notebook .button.subtitle { opacity: 1; } @@ -2944,7 +3076,7 @@ PanelWidget, PanelAppletFrame, PanelApplet { color: #BAC3CF; - background-image: linear-gradient(to bottom, rgba(31, 33, 37, 0.95)); } + background-image: linear-gradient(to bottom, rgba(43, 46, 55, 0.95)); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2988,18 +3120,18 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(31, 33, 37, 0.95); } + background-color: rgba(43, 46, 55, 0.95); } .xfce4-panel.panel .button.flat { color: #BAC3CF; - background-color: rgba(31, 33, 37, 0); + background-color: rgba(43, 46, 55, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(54, 57, 65, 0.95); } + background-color: rgba(65, 70, 84, 0.95); } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(15, 16, 18, 0.95); } + background-color: rgba(27, 29, 35, 0.95); } .floating-bar { background-color: #5294E2; @@ -3042,26 +3174,26 @@ MarlinViewWindow *:selected:focus { .marlin-pathbar.pathbar { border-radius: 3px; color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } .marlin-pathbar.pathbar.image, .marlin-pathbar.pathbar.image:hover { color: inherit; } .marlin-pathbar.pathbar:focus { color: #ffffff; - border-color: #5294E2; + border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked { color: #5294E2; } .gala-notification { - border: 1px solid #2d3036; + border: 1px solid #2b2e39; border-radius: 3px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); - background-image: linear-gradient(to bottom, #383C45); + background-image: linear-gradient(to bottom, #404552); background-color: transparent; } .gala-notification .title, .gala-notification .label { color: #D3DAE3; } @@ -3167,24 +3299,24 @@ UnityDecoration { -UnityDecoration-title-fade: 35px; -UnityDecoration-title-alignment: 0.0; } UnityDecoration.top { - border: 1px solid rgba(31, 34, 39, 0.97); + border: 1px solid rgba(32, 35, 43, 0.97); border-bottom-width: 0; border-radius: 4px 4px 0 0; padding: 1px 6px 0 6px; - background-image: linear-gradient(to bottom, #2f343b); + background-image: linear-gradient(to bottom, #2f343f); color: rgba(207, 218, 231, 0.8); - box-shadow: inset 0 1px rgba(54, 60, 68, 0.97); } + box-shadow: inset 0 1px rgba(54, 59, 72, 0.97); } UnityDecoration.top:backdrop { border-bottom-width: 0; - background-image: linear-gradient(to bottom, #32383f); + background-image: linear-gradient(to bottom, #323843); color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { - background-image: linear-gradient(to bottom, rgba(31, 34, 39, 0.97)); } + background-image: linear-gradient(to bottom, rgba(32, 35, 43, 0.97)); } UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #1f2125); + background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } @@ -3207,8 +3339,8 @@ GraniteWidgetsThinPaned { background-color: transparent; background-image: none; margin: 0; - border-left: 1px solid #2d3036; - border-right: 1px solid #2d3036; } + border-left: 1px solid #2b2e39; + border-right: 1px solid #2b2e39; } GraniteWidgetsPopOver .frame, GraniteWidgetsStaticNotebook .frame { @@ -3220,7 +3352,7 @@ GraniteWidgetsStaticNotebook .frame { .secondary-toolbar.toolbar, .secondary-toolbar.inline-toolbar { padding: 3px; - border-bottom: 1px solid #2d3036; } + border-bottom: 1px solid #2b2e39; } .secondary-toolbar.toolbar .button, .secondary-toolbar.inline-toolbar .button { padding: 0 3px 0 3px; } @@ -3228,8 +3360,8 @@ GraniteWidgetsStaticNotebook .frame { padding: 5px; border-width: 1px 0 0 0; border-style: solid; - border-color: #2d3036; - background-color: #444852; } + border-color: #2b2e39; + background-color: #383C4A; } .bottom-toolbar.toolbar .button, .bottom-toolbar.inline-toolbar .button { padding: 2px 3px 2px 3px; } @@ -3239,7 +3371,7 @@ GraniteWidgetsStaticNotebook .frame { .source-list, .source-list.view { - background-color: #444852; + background-color: #383C4A; color: #D3DAE3; -gtk-icon-style: regular; } @@ -3247,7 +3379,7 @@ GraniteWidgetsStaticNotebook .frame { color: transparent; } .source-list.view:prelight { - background-color: #505460; } + background-color: #434859; } .source-list.view:selected, .source-list.view:prelight:selected, @@ -3260,7 +3392,7 @@ GraniteWidgetsStaticNotebook .frame { .source-list .scrollbars-junction, .source-list .scrollbar.trough { border-image: none; border-color: transparent; - background-color: #444852; + background-color: #383C4A; background-image: none; } .source-list.badge, @@ -3296,10 +3428,10 @@ GraniteWidgetsStaticNotebook .frame { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GraniteWidgetsWelcome { - background-color: #383C45; } + background-color: #404552; } GraniteWidgetsWelcome GtkLabel { - color: #8c919b; + color: #868b97; font: open sans 11; text-shadow: none; } @@ -3320,7 +3452,7 @@ GraniteWidgetsPopOver { margin: 0; } .popover_bg { - background-image: linear-gradient(to bottom, #383C45); + background-image: linear-gradient(to bottom, #404552); border: 1px solid rgba(0, 0, 0, 0.3); } GraniteWidgetsPopOver .sidebar.view, @@ -3338,7 +3470,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { - color: #a8aeb7; + color: #a5abb5; font-weight: 600; text-shadow: 0 1px rgba(255, 255, 255, 0.6); } @@ -3351,10 +3483,10 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(31, 33, 37, 0.95); + background-color: rgba(43, 46, 55, 0.95); color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(15, 16, 18, 0.95); + box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { @@ -3380,7 +3512,7 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: #383C45; + background-color: #383C4A; border-top-left-radius: 2px; border-top-right-radius: 2px; border: solid rgba(0, 0, 0, 0.1); @@ -3389,22 +3521,24 @@ GtkListBox .h4 { #content_frame .button { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } #content_frame .button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8b98b0; + background-color: #8b98b0; + border-color: transparent; background-color: #5294E2; } #content_frame .button:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } #content_frame .button:insensitive > GtkLabel { color: inherit; } @@ -3413,32 +3547,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(47, 52, 63, 0.97); 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); } + box-shadow: inset 0 1px rgba(38, 42, 51, 0.97); } #buttonbox_frame .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } #buttonbox_frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } #login_window #user_combobox { color: #D3DAE3; @@ -3498,10 +3632,10 @@ GtkListBox .h4 { font: bold; } .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator { - color: rgba(36, 39, 45, 0.97); } + color: rgba(38, 42, 51, 0.97); } NemoWindow GtkEventBox { - background-color: #444852; } + background-color: #383C4A; } GtkFileChooserDialog *, NautilusWindow *, @@ -3511,12 +3645,12 @@ NemoWindow { GtkFileChooserDialog .sidebar, NautilusWindow .sidebar, NemoWindow .sidebar { - border-right: 1px solid rgba(37, 39, 45, 0.95); } + border-right: 1px solid rgba(42, 45, 55, 0.95); } GtkFileChooserDialog .sidebar:dir(rtl), NautilusWindow .sidebar:dir(rtl), NemoWindow .sidebar:dir(rtl) { - border-left: 1px solid rgba(37, 39, 45, 0.95); } + border-left: 1px solid rgba(42, 45, 55, 0.95); } NautilusWindow GtkBox.sidebar { background-color: transparent; } @@ -3544,7 +3678,7 @@ NautilusWindow MarlinPlacesSidebar, NemoWindow .sidebar, NemoWindow MarlinPlacesSidebar, MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, @@ -3675,25 +3809,25 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: rgba(37, 39, 45, 0.95); } + background-color: rgba(42, 45, 55, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog .sidebar { background-color: transparent; } GtkFileChooserDialog GtkPaned > .vertical > .horizontal { - background-color: #444852; } + background-color: #383C4A; } GtkFileChooserDialog .dialog-action-box { - background-color: #444852; } + background-color: #383C4A; } GtkFileChooserDialog .dialog-vbox > .frame { color: #BAC3CF; @@ -3701,7 +3835,7 @@ GtkFileChooserDialog .dialog-vbox > .frame { GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: rgba(25, 27, 31, 0.95); } + border-color: rgba(31, 33, 40, 0.95); } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, @@ -3712,20 +3846,20 @@ GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: rgba(37, 39, 45, 0.95); } + background-color: rgba(42, 45, 55, 0.95); } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop { - background-color: rgba(36, 39, 45, 0.97); } + background-color: rgba(38, 42, 51, 0.97); } .gedit-bottom-panel-paned { - background-color: #383C45; } + background-color: #404552; } .gedit-document-panel { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } .maximized .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .gedit-document-panel .list-row { color: #BAC3CF; } .gedit-document-panel .list-row { @@ -3752,9 +3886,9 @@ GeditWindow.background.csd { color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.trough { background-color: transparent; border-color: transparent; } @@ -3779,7 +3913,7 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: rgba(44, 47, 53, 0.95); } + border-color: rgba(37, 40, 49, 0.95); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #BAC3CF; } @@ -3795,14 +3929,14 @@ GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } 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 { @@ -3812,75 +3946,71 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.35); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.35)); + background-color: transparent; } + GtkFileChooserDialog .action-bar.frame .image.entry, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry, GtkFileChooserDialog .action-bar.frame .image.entry:hover, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry:hover { + color: inherit; } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #BAC3CF; - border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #D3DAE3; @define-color theme_text_color #D3DAE3; -@define-color theme_bg_color #444852; -@define-color theme_base_color #383C45; +@define-color theme_bg_color #383C4A; +@define-color theme_base_color #404552; @define-color theme_selected_bg_color #5294E2; @define-color theme_selected_fg_color #ffffff; @define-color fg_color #D3DAE3; @define-color text_color #D3DAE3; -@define-color bg_color #444852; -@define-color base_color #383C45; +@define-color bg_color #383C4A; +@define-color base_color #404552; @define-color selected_bg_color #5294E2; @define-color selected_fg_color #ffffff; -@define-color insensitive_bg_color #494d58; +@define-color insensitive_bg_color #3c4150; @define-color insensitive_fg_color alpha(#d3dae3, 0.5); -@define-color insensitive_base_color #383C45; +@define-color insensitive_base_color #404552; @define-color theme_unfocused_fg_color #D3DAE3; @define-color theme_unfocused_text_color #D3DAE3; -@define-color theme_unfocused_bg_color #444852; -@define-color theme_unfocused_base_color #383C45; -@define-color borders #2d3036; -@define-color unfocused_borders #2d3036; +@define-color theme_unfocused_bg_color #383C4A; +@define-color theme_unfocused_base_color #404552; +@define-color borders #2b2e39; +@define-color unfocused_borders #2b2e39; @define-color warning_color #F27835; @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); -@define-color wm_bg #2f343b; -@define-color wm_bg_unfocused #32383f; -@define-color wm_highlight #363c44; +@define-color wm_bg #2f343f; +@define-color wm_bg_unfocused #323843; +@define-color wm_highlight #363b48; @define-color wm_shadow alpha(black, 0.35); -@define-color wm_button_close_bg #e45e65; -@define-color wm_button_close_hover_bg #f48085; -@define-color wm_button_close_active_bg #e6262f; -@define-color wm_icon_close_bg #ffffff; -@define-color wm_icon_close_hover_bg #ffffff; -@define-color wm_icon_close_active_bg #ffffff; -@define-color wm_button_bg #272c32; -@define-color wm_button_unfocused_bg #2a3035; -@define-color wm_button_hover_bg #272c32; +@define-color wm_button_close_bg #cc575d; +@define-color wm_button_close_hover_bg #d7787d; +@define-color wm_button_close_active_bg #be3841; +@define-color wm_icon_close_bg #2f343f; +@define-color wm_button_hover_bg #454C5C; @define-color wm_button_active_bg #5294E2; -@define-color wm_button_border #191C21; -@define-color wm_button_unfocused_border #1F2328; -@define-color wm_button_hover_border #5294E2; -@define-color wm_button_active_border #5294E2; -@define-color wm_icon_bg #939ca8; -@define-color wm_icon_unfocused_bg #686f78; -@define-color wm_icon_hover_bg #afb8c5; +@define-color wm_button_hover_border #262932; +@define-color wm_icon_bg #90939B; +@define-color wm_icon_unfocused_bg #666A74; +@define-color wm_icon_hover_bg #C4C7CC; @define-color wm_icon_active_bg #ffffff; -@define-color content_view_bg #383C45; +@define-color content_view_bg #404552; 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 5a8d25a..c39202e 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -112,7 +112,7 @@ GtkFlowBox .grid-child { .popover.osd, .osd { color: #BAC3CF; border: none; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); background-clip: padding-box; outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } @@ -245,17 +245,18 @@ GtkFlowBox .grid-child { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.35); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.35)); + background-color: transparent; } + .osd .entry.image, .osd .entry.image:hover { + color: inherit; } .osd .entry:focus { - color: #BAC3CF; - border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } GtkSearchEntry.entry { border-radius: 20px; } @@ -294,14 +295,16 @@ GtkSearchEntry.entry { .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; + border-color: #cfd6e6; + background-color: white; -gtk-image-effect: highlight; } .button:active, .button:checked { background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8f9aae; + background-color: #8f9aae; + border-color: transparent; background-color: #5294E2; transition-duration: 50ms; } .button:active { @@ -329,31 +332,31 @@ GtkSearchEntry.entry { 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); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); + background-color: rgba(53, 57, 69, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); - background-color: rgba(42, 44, 51, 0.95); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); + background-color: rgba(53, 57, 69, 0.95); } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .button.osd:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .osd .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -375,17 +378,17 @@ GtkSearchEntry.entry { .osd .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .osd .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .osd .button.flat { border-color: transparent; background-color: transparent; @@ -394,12 +397,12 @@ GtkSearchEntry.entry { .osd .button.flat:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .osd .button.flat:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; @@ -531,13 +534,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8f9aae; + background-color: #8f9aae; + border-color: transparent; background-color: #5294E2; } .inline-toolbar GtkToolButton > .button:insensitive { color: rgba(92, 97, 108, 0.55); @@ -568,7 +573,15 @@ GtkSearchEntry.entry { GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .button:hover, .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .button:hover:dir(ltr) { - box-shadow: inset 1px 0 #5294E2, inset -1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); } + .inline-toolbar GtkToolButton > .button.flat:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active, + GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .button:active, .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .button:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked, + GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .button:checked, .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .button:checked:dir(ltr) { + box-shadow: none; } .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl), .header-bar .linked.stack-switcher > .button:dir(rtl), @@ -585,7 +598,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:first-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .button:first-child:hover, .linked > GtkComboBox:first-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover, .header-bar .linked.stack-switcher > .button:first-child:hover, .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { - box-shadow: inset -1px 0 #5294E2; } + box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); } + .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active, + .inline-toolbar GtkToolButton:first-child > .button.flat:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .button:first-child:active, .linked > GtkComboBox:first-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked, + .inline-toolbar GtkToolButton:first-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .button:first-child:checked, .linked > GtkComboBox:first-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } .osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button, .primary-toolbar .linked.stack-switcher > .button:last-child, @@ -597,7 +618,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:last-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .button:last-child:hover, .linked > GtkComboBox:last-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover, .header-bar .linked.stack-switcher > .button:last-child:hover, .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { - box-shadow: inset 1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); } + .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active, + .inline-toolbar GtkToolButton:last-child > .button.flat:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .button:last-child:active, .linked > GtkComboBox:last-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked, + .inline-toolbar GtkToolButton:last-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .button:last-child:checked, .linked > GtkComboBox:last-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl), .header-bar .linked.stack-switcher > .button:last-child:dir(rtl), @@ -615,6 +644,14 @@ GtkSearchEntry.entry { .header-bar .linked.stack-switcher > .button:only-child:hover, .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { box-shadow: none; } + .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active, + .inline-toolbar GtkToolButton:only-child > .button.flat:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .button:only-child:active, .linked > GtkComboBox:only-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked, + .inline-toolbar GtkToolButton:only-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .button:only-child:checked, .linked > GtkComboBox:only-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button, .linked.vertical > .button:hover, @@ -628,7 +665,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:hover, .linked.vertical > .button:hover, .linked.vertical > GtkComboBoxText > .button:hover, .linked.vertical > GtkComboBox > .button:hover { - box-shadow: inset 0 1px #5294E2, inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4), inset 0 1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:active, .linked.vertical > .button:active, + .linked.vertical > GtkComboBoxText > .button:active, + .linked.vertical > GtkComboBox > .button:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked, + .linked.vertical > GtkComboBoxText > .button:checked, + .linked.vertical > GtkComboBox > .button:checked { + box-shadow: none; } .linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, @@ -638,7 +681,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover, .linked.vertical > GtkComboBoxText:first-child > .button:hover, .linked.vertical > GtkComboBox:first-child > .button:hover { - box-shadow: inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active, + .linked.vertical > GtkComboBoxText:first-child > .button:active, + .linked.vertical > GtkComboBox:first-child > .button:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked, + .linked.vertical > GtkComboBoxText:first-child > .button:checked, + .linked.vertical > GtkComboBox:first-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, @@ -648,7 +697,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover, .linked.vertical > GtkComboBoxText:last-child > .button:hover, .linked.vertical > GtkComboBox:last-child > .button:hover { - box-shadow: inset 0 1px #5294E2; } + box-shadow: inset 0 1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active, + .linked.vertical > GtkComboBoxText:last-child > .button:active, + .linked.vertical > GtkComboBox:last-child > .button:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked, + .linked.vertical > GtkComboBoxText:last-child > .button:checked, + .linked.vertical > GtkComboBox:last-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, @@ -659,6 +714,12 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBoxText:only-child > .button:hover, .linked.vertical > GtkComboBox:only-child > .button:hover { box-shadow: none; } + .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active, + .linked.vertical > GtkComboBoxText:only-child > .button:active, + .linked.vertical > GtkComboBox:only-child > .button:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked, + .linked.vertical > GtkComboBoxText:only-child > .button:checked, + .linked.vertical > GtkComboBox:only-child > .button:checked { + box-shadow: none; } .menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, @@ -715,8 +776,6 @@ GtkSearchEntry.entry { border-style: none solid none none; } .spinbutton .button:first-child { color: red; } - .spinbutton .button:hover { - color: #5294E2; } .spinbutton .button:insensitive { color: rgba(92, 97, 108, 0.55); } .spinbutton .button:active { @@ -730,13 +789,15 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8f9aae; + background-color: #8f9aae; + border-color: transparent; background-color: #5294E2; } .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .spinbutton.vertical .button:first-child:insensitive, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive { color: rgba(92, 97, 108, 0.55); border-color: rgba(207, 214, 230, 0.55); @@ -751,13 +812,15 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8f9aae; + background-color: #8f9aae; + border-color: transparent; background-color: #5294E2; } .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .spinbutton.vertical .button:last-child:insensitive, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive { color: rgba(92, 97, 108, 0.55); border-color: rgba(207, 214, 230, 0.55); @@ -804,12 +867,13 @@ GtkComboBox { border-color: #cfd6e6; } GtkComboBox.combobox-entry .button:hover { background-color: #e0e4ef; - border-color: #5294E2; - box-shadow: -1px 0 #5294E2; } + border-color: #e0e4ef; } GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8f9aae; + background-color: #8f9aae; + border-color: transparent; background-color: #5294E2; } GtkComboBox.combobox-entry .button:insensitive { opacity: 0.5; } @@ -823,19 +887,19 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: 1px solid rgba(0, 0, 0, 0.6); + border: 1px solid rgba(0, 0, 0, 0.5); border-radius: 3px; - background-color: rgba(42, 44, 51, 0.85); } + background-color: rgba(53, 57, 69, 0.85); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; + background-color: #2f343f; box-shadow: none; border-width: 0 0 1px 0; border-style: solid; - border-image: linear-gradient(to bottom, #2f343b, rgba(31, 34, 39, 0.97)) 1 0 1 0; } + border-image: linear-gradient(to bottom, #2f343f, rgba(32, 35, 43, 0.97)) 1 0 1 0; } .primary-toolbar:backdrop { - background-color: #32383f; } + background-color: #323843; } .inline-toolbar { background-color: #edeef0; @@ -863,16 +927,16 @@ GtkComboBox { border-width: 0 0 1px; border-style: solid; border-radius: 0; - border-color: rgba(31, 34, 39, 0.97); + border-color: rgba(38, 42, 51, 0.97); color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; } + background-color: #2f343f; } .csd .header-bar { - background-color: rgba(47, 52, 59, 0.97); } + background-color: rgba(47, 52, 63, 0.97); } .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); - background-color: #32383f; } + background-color: #323843; } .csd .header-bar:backdrop { - background-color: rgba(50, 56, 63, 0.97); } + background-color: rgba(50, 56, 67, 0.97); } .header-bar .title { padding: 0px 12px; } .header-bar .subtitle { @@ -943,28 +1007,28 @@ GtkComboBox { .maximized .header-bar, .maximized .header-bar:backdrop { border-radius: 0; } .maximized .header-bar { - background-color: #2f343b; } + background-color: #2f343f; } .maximized .header-bar:backdrop { - background-color: #32383f; } + background-color: #323843; } .titlebar { padding-left: 7px; padding-right: 7px; border-radius: 3px 3px 0 0; color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; - box-shadow: inset 0 1px rgba(54, 60, 68, 0.97); } + background-color: #2f343f; + box-shadow: inset 0 1px rgba(54, 59, 72, 0.97); } .csd .titlebar { - background-color: rgba(47, 52, 59, 0.97); } + background-color: rgba(47, 52, 63, 0.97); } .titlebar:backdrop { color: rgba(207, 218, 231, 0.5); - background-color: #32383f; } + background-color: #323843; } .csd .titlebar:backdrop { - background-color: rgba(50, 56, 63, 0.97); } + background-color: rgba(50, 56, 67, 0.97); } .maximized .titlebar { - background-color: #2f343b; } + background-color: #2f343f; } .maximized .titlebar:backdrop { - background-color: #32383f; } + background-color: #323843; } .titlebar .titlebar, .titlebar .titlebar:backdrop { @@ -982,8 +1046,8 @@ GtkComboBox { .primary-toolbar .entry, .header-bar .entry { color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } .primary-toolbar .entry.image, .header-bar .entry.image, .primary-toolbar .entry.image:hover, .header-bar .entry.image:hover { color: inherit; } @@ -991,13 +1055,14 @@ GtkComboBox { opacity: 0.85; } .primary-toolbar .entry:focus, .header-bar .entry:focus { color: #ffffff; - border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); + background-clip: padding-box; } .primary-toolbar .entry:focus.image, .header-bar .entry:focus.image { color: #ffffff; } .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus { background-color: #ffffff; color: #5294E2; } @@ -1010,24 +1075,25 @@ GtkComboBox { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); outline-offset: -3px; - background-color: rgba(47, 52, 59, 0); - border-color: rgba(47, 52, 59, 0); } + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .primary-toolbar .button:backdrop, .header-bar .button:backdrop { opacity: 0.7; } .primary-toolbar .button:hover, .header-bar .button:hover { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: rgba(29, 32, 36, 0.97); - background-color: rgba(40, 44, 50, 0.87); } + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } .primary-toolbar .button:active, .header-bar .button:active, .primary-toolbar .button:checked, .header-bar .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; - background-color: #5294E2; } + border-color: transparent; + background-color: #5294E2; + background-clip: padding-box; } .primary-toolbar .button:insensitive, .header-bar .button:insensitive { color: rgba(207, 218, 231, 0.35); - background-color: rgba(47, 52, 59, 0); - border-color: rgba(47, 52, 59, 0); } + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .primary-toolbar .button:insensitive > GtkLabel, .header-bar .button:insensitive > GtkLabel { color: inherit; } .primary-toolbar .button:insensitive:active, .header-bar .button:insensitive:active, .primary-toolbar .button:insensitive:checked, .header-bar .button:insensitive:checked { @@ -1047,12 +1113,12 @@ GtkComboBox { .primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: rgba(29, 32, 36, 0.97); - background-color: rgba(40, 44, 50, 0.87); } + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { - border-color: #5294E2; } + background-color: rgba(134, 144, 165, 0.37); } .primary-toolbar .linked.stack-switcher > .button:active, .header-bar .linked.stack-switcher > .button:active, .primary-toolbar .linked.stack-switcher > .button:checked, @@ -1060,8 +1126,52 @@ GtkComboBox { .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } + .primary-toolbar .linked.stack-switcher > .button:insensitive, + .header-bar .linked.stack-switcher > .button:insensitive, + .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive { + color: rgba(207, 218, 231, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:hover, + .header-bar .linked.stack-switcher > .button:hover, + .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:first-child:hover, + .header-bar .linked.stack-switcher > .button:first-child:hover, + .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:last-child:hover, + .header-bar .linked.stack-switcher > .button:last-child:hover, + .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:hover, + .header-bar .linked.stack-switcher > .button:only-child:hover, + .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked { + box-shadow: none; } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; @@ -1155,24 +1265,25 @@ GtkComboBox { .primary-toolbar GtkComboBox.combobox-entry .button, .header-bar GtkComboBox.combobox-entry .button { color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } .primary-toolbar GtkComboBox.combobox-entry .button.image, .header-bar GtkComboBox.combobox-entry .button.image, .primary-toolbar GtkComboBox.combobox-entry .button.image:hover, .header-bar GtkComboBox.combobox-entry .button.image:hover { color: inherit; } .primary-toolbar GtkComboBox.combobox-entry .button:hover, .header-bar GtkComboBox.combobox-entry .button:hover { color: #ffffff; - border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); + box-shadow: none; } .primary-toolbar GtkComboBox.combobox-entry .button:insensitive, .header-bar GtkComboBox.combobox-entry .button:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } .primary-toolbar GtkProgressBar.trough, .header-bar GtkProgressBar.trough, .primary-toolbar .level-bar.trough, .header-bar .level-bar.trough { - background-color: rgba(207, 218, 231, 0.15); } + background-color: rgba(21, 23, 28, 0.37); } .primary-toolbar GtkProgressBar:backdrop, .header-bar GtkProgressBar:backdrop { opacity: 0.75; } @@ -1181,15 +1292,22 @@ GtkComboBox { opacity: 0.75; } .primary-toolbar .scale.trough, .header-bar .scale.trough { - background-image: linear-gradient(to bottom, rgba(207, 218, 231, 0.15)); } + background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.37)); } .primary-toolbar .scale.trough:insensitive, .header-bar .scale.trough:insensitive { - background-image: linear-gradient(to bottom, rgba(207, 218, 231, 0.1)); } + background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.27)); } .primary-toolbar .scale.slider, .header-bar .scale.slider { - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.97)); } + background-image: linear-gradient(to bottom, #454c5c); + border-color: rgba(21, 23, 28, 0.67); } + .primary-toolbar .scale.slider:hover, .header-bar .scale.slider:hover { + background-image: linear-gradient(to bottom, #50586b); + border-color: rgba(21, 23, 28, 0.67); } + .primary-toolbar .scale.slider:active, .header-bar .scale.slider:active { + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .primary-toolbar .scale.slider:insensitive, .header-bar .scale.slider:insensitive { - background-image: linear-gradient(to bottom, rgba(45, 49, 56, 0.97)); - border-color: rgba(62, 92, 128, 0.982); } + background-image: linear-gradient(to bottom, rgba(63, 69, 84, 0.991)); + border-color: rgba(21, 23, 28, 0.67); } /************ * Pathbars * @@ -1289,10 +1407,10 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar { -GtkWidget-window-dragging: true; padding: 0px; - background-color: #2f343b; + background-color: #2f343f; color: rgba(207, 218, 231, 0.8); } .menubar:backdrop { - background-color: #32383f; } + background-color: #323843; } .menubar > .menuitem { padding: 6px 8px; border: solid transparent; @@ -1775,21 +1893,21 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { margin: 3px; } .scale.slider { background-clip: border-box; - background-image: linear-gradient(to bottom, #ffffff); - border: 1px solid #5294E2; + background-image: linear-gradient(to bottom, #fbfbfc); + border: 1px solid rgba(123, 142, 186, 0.5); border-radius: 50%; box-shadow: none; } .scale.slider:hover { - background-image: linear-gradient(to bottom, #5294E2); - border-color: #5294E2; } + background-image: linear-gradient(to bottom, white); + border-color: rgba(123, 142, 186, 0.5); } .scale.slider:insensitive { background-image: linear-gradient(to bottom, #fbfbfb); - border-color: #9bc0eb; } + border-color: rgba(123, 142, 186, 0.3); } .scale.slider:active { - background-image: linear-gradient(to bottom, #2679db); - border-color: #2679db; } + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(42, 44, 51, 0.95)); + background-image: linear-gradient(to bottom, rgba(53, 57, 69, 0.95)); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1819,7 +1937,7 @@ 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(58, 62, 70, 0.95)); + background-image: linear-gradient(to bottom, rgba(69, 74, 89, 0.95)); outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; @@ -1966,18 +2084,18 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame { padding: 10px; color: #BAC3CF; - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(53, 57, 69, 0.95); 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: rgba(31, 33, 40, 0.95); } .app-notification .button, .app-notification.frame .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } @@ -1985,8 +2103,8 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { @@ -1996,9 +2114,9 @@ GtkScrolledWindow GtkViewport.frame { background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } /************* * Expanders * @@ -2030,8 +2148,9 @@ GtkCalendar { border-radius: 0; } GtkCalendar.button, GtkCalendar.button:focus { color: rgba(92, 97, 108, 0.45); - box-shadow: none; - border: none; } + border-color: transparent; + background-color: transparent; + background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #5c616c; } GtkCalendar.highlight { @@ -2046,8 +2165,8 @@ GtkCalendar { .message-dialog { -GtkDialog-button-spacing: 0; } .message-dialog .titlebar { - background-color: rgba(47, 52, 59, 0.97); - border-bottom: 1px solid rgba(31, 34, 39, 0.97); } + background-color: rgba(47, 52, 63, 0.97); + border-bottom: 1px solid rgba(32, 35, 43, 0.97); } .message-dialog.csd.background { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; @@ -2164,7 +2283,7 @@ GtkInfoBar { color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2233,8 +2352,8 @@ GtkColorButton.button { .scale-popup .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } GtkVolumeButton.button { padding: 8px; } @@ -2245,11 +2364,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px rgba(31, 34, 39, 0.97), 0 4px 8px 1px rgba(0, 0, 0, 0.25); + box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.2); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px rgba(31, 34, 39, 0.97), 0 4px 5px 2px rgba(0, 0, 0, 0.25); } + box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { @@ -2267,7 +2386,7 @@ GtkVolumeButton.button { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 59, 0); + background-color: rgba(47, 52, 63, 0); border-width: 0; color: transparent; background-position: center; @@ -2643,7 +2762,7 @@ PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top, Panth TerminalWindow .notebook.header.top, PantheonTerminalPantheonTerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #1f2227, inset 0 -1px #dbdfe3; } + box-shadow: inset 0 1px #262a33, inset 0 -1px #dbdfe3; } GtkHTML { background-color: #ffffff; @@ -2700,18 +2819,36 @@ NemoWindow GtkSeparator.separator.horizontal, NemoWindow GtkPlacesSidebar.sideba NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: rgba(29, 32, 36, 0.97); - background-color: rgba(40, 44, 50, 0.87); } + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { - border-color: #5294E2; } + background-color: rgba(134, 144, 165, 0.37); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive { + color: rgba(207, 218, 231, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .gedit-headerbar-paned { - color: rgba(31, 34, 39, 0.97); } + color: rgba(38, 42, 51, 0.97); } .open-document-selector-listbox-row { border-bottom: 1px solid #e7e9ec; @@ -2786,8 +2923,8 @@ GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr), GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { padding: 0 10px; color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover, @@ -2795,25 +2932,19 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { - color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); - background-color: transparent; - border-color: #5294E2; } - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, - GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { - color: inherit; } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { color: #ffffff; - border-color: #5294E2; + border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; @@ -2853,7 +2984,7 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #2a2c33; } + background-color: #353945; } GtkBox.gb-command-bar-box GtkLabel { color: #BAC3CF; } @@ -2862,7 +2993,7 @@ GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; color: #BAC3CF; background-image: none; - background-color: #2a2c33; + background-color: #353945; padding: 6px 6px 6px 6px; border: none; } @@ -2945,7 +3076,7 @@ PanelWidget, PanelAppletFrame, PanelApplet { color: #BAC3CF; - background-image: linear-gradient(to bottom, rgba(31, 33, 37, 0.95)); } + background-image: linear-gradient(to bottom, rgba(43, 46, 55, 0.95)); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2989,18 +3120,18 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(31, 33, 37, 0.95); } + background-color: rgba(43, 46, 55, 0.95); } .xfce4-panel.panel .button.flat { color: #BAC3CF; - background-color: rgba(31, 33, 37, 0); + background-color: rgba(43, 46, 55, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(54, 57, 65, 0.95); } + background-color: rgba(65, 70, 84, 0.95); } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(15, 16, 18, 0.95); } + background-color: rgba(27, 29, 35, 0.95); } .floating-bar { background-color: #5294E2; @@ -3043,18 +3174,18 @@ MarlinViewWindow *:selected:focus { .marlin-pathbar.pathbar { border-radius: 3px; color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } .marlin-pathbar.pathbar.image, .marlin-pathbar.pathbar.image:hover { color: inherit; } .marlin-pathbar.pathbar:focus { color: #ffffff; - border-color: #5294E2; + border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked { color: #5294E2; } @@ -3168,24 +3299,24 @@ UnityDecoration { -UnityDecoration-title-fade: 35px; -UnityDecoration-title-alignment: 0.0; } UnityDecoration.top { - border: 1px solid rgba(31, 34, 39, 0.97); + border: 1px solid rgba(32, 35, 43, 0.97); border-bottom-width: 0; border-radius: 4px 4px 0 0; padding: 1px 6px 0 6px; - background-image: linear-gradient(to bottom, #2f343b); + background-image: linear-gradient(to bottom, #2f343f); color: rgba(207, 218, 231, 0.8); - box-shadow: inset 0 1px rgba(54, 60, 68, 0.97); } + box-shadow: inset 0 1px rgba(54, 59, 72, 0.97); } UnityDecoration.top:backdrop { border-bottom-width: 0; - background-image: linear-gradient(to bottom, #32383f); + background-image: linear-gradient(to bottom, #323843); color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { - background-image: linear-gradient(to bottom, rgba(31, 34, 39, 0.97)); } + background-image: linear-gradient(to bottom, rgba(32, 35, 43, 0.97)); } UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #1f2125); + background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } @@ -3352,10 +3483,10 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(31, 33, 37, 0.95); + background-color: rgba(43, 46, 55, 0.95); color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(15, 16, 18, 0.95); + box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { @@ -3395,12 +3526,14 @@ GtkListBox .h4 { #content_frame .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8f9aae; + background-color: #8f9aae; + border-color: transparent; background-color: #5294E2; } #content_frame .button:insensitive { color: rgba(92, 97, 108, 0.55); @@ -3414,32 +3547,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 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); } + box-shadow: inset 0 1px rgba(53, 57, 69, 0.95); } #buttonbox_frame .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } #buttonbox_frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } #login_window #user_combobox { color: #5c616c; @@ -3499,7 +3632,7 @@ GtkListBox .h4 { font: bold; } .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator { - color: rgba(31, 34, 39, 0.97); } + color: rgba(38, 42, 51, 0.97); } NemoWindow GtkEventBox { background-color: #F5F6F7; } @@ -3535,7 +3668,7 @@ NautilusWindow MarlinPlacesSidebar, NemoWindow .sidebar, NemoWindow MarlinPlacesSidebar, MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, @@ -3666,16 +3799,16 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog .sidebar { background-color: transparent; } @@ -3692,7 +3825,7 @@ GtkFileChooserDialog .dialog-vbox > .frame { GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: rgba(44, 47, 53, 0.95); } + border-color: rgba(42, 45, 55, 0.95); } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, @@ -3703,20 +3836,20 @@ GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop { - background-color: rgba(31, 34, 39, 0.97); } + background-color: rgba(38, 42, 51, 0.97); } .gedit-bottom-panel-paned { background-color: #ffffff; } .gedit-document-panel { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } .maximized .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .gedit-document-panel .list-row { color: #BAC3CF; } .gedit-document-panel .list-row { @@ -3743,9 +3876,9 @@ GeditWindow.background.csd { color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.trough { background-color: transparent; border-color: transparent; } @@ -3770,7 +3903,7 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: rgba(44, 47, 53, 0.95); } + border-color: rgba(37, 40, 49, 0.95); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #BAC3CF; } @@ -3786,14 +3919,14 @@ GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } 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 { @@ -3803,26 +3936,29 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.35); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.35)); + background-color: transparent; } + GtkFileChooserDialog .action-bar.frame .image.entry, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry, GtkFileChooserDialog .action-bar.frame .image.entry:hover, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry:hover { + color: inherit; } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #BAC3CF; - border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @@ -3852,26 +3988,19 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { @define-color placeholder_text_color #A8A8A8; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); -@define-color wm_bg #2f343b; -@define-color wm_bg_unfocused #32383f; -@define-color wm_highlight #363c44; +@define-color wm_bg #2f343f; +@define-color wm_bg_unfocused #323843; +@define-color wm_highlight #363b48; @define-color wm_shadow alpha(black, 0.35); -@define-color wm_button_close_bg #e45e65; -@define-color wm_button_close_hover_bg #f48085; -@define-color wm_button_close_active_bg #e6262f; -@define-color wm_icon_close_bg #ffffff; -@define-color wm_icon_close_hover_bg #ffffff; -@define-color wm_icon_close_active_bg #ffffff; -@define-color wm_button_bg #272c32; -@define-color wm_button_unfocused_bg #2a3035; -@define-color wm_button_hover_bg #272c32; +@define-color wm_button_close_bg #cc575d; +@define-color wm_button_close_hover_bg #d7787d; +@define-color wm_button_close_active_bg #be3841; +@define-color wm_icon_close_bg #2f343f; +@define-color wm_button_hover_bg #454C5C; @define-color wm_button_active_bg #5294E2; -@define-color wm_button_border #191C21; -@define-color wm_button_unfocused_border #1F2328; -@define-color wm_button_hover_border #5294E2; -@define-color wm_button_active_border #5294E2; -@define-color wm_icon_bg #939ca8; -@define-color wm_icon_unfocused_bg #686f78; -@define-color wm_icon_hover_bg #afb8c5; +@define-color wm_button_hover_border #262932; +@define-color wm_icon_bg #90939B; +@define-color wm_icon_unfocused_bg #666A74; +@define-color wm_icon_hover_bg #C4C7CC; @define-color wm_icon_active_bg #ffffff; @define-color content_view_bg #ffffff; 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 14b0595..0bfa4ce 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 @@ -33,7 +33,7 @@ ***************/ .background { color: #D3DAE3; - background-color: #444852; } + background-color: #383C4A; } /* These wildcard seems unavoidable, need to investigate. @@ -45,16 +45,16 @@ -gtk-image-effect: dim; } .gtkstyle-fallback { - background-color: #444852; + background-color: #383C4A; color: #D3DAE3; } .gtkstyle-fallback:prelight { - background-color: #5b606e; + background-color: #4e5467; color: #D3DAE3; } .gtkstyle-fallback:active { - background-color: #2d3036; + background-color: #22242d; color: #D3DAE3; } .gtkstyle-fallback:insensitive { - background-color: #494d58; + background-color: #3c4150; color: rgba(211, 218, 227, 0.45); } .gtkstyle-fallback:selected { background-color: #5294E2; @@ -62,7 +62,7 @@ .view { color: #D3DAE3; - background-color: #383C45; } + background-color: #404552; } .view.dim-label, GtkLabel.view.separator, GtkPlacesSidebar.sidebar GtkLabel.view.separator, .header-bar .view.subtitle { color: rgba(211, 218, 227, 0.55); } .view.dim-label:selected, GtkLabel.view.separator:selected, .header-bar .view.subtitle:selected, .view.dim-label:selected:focus, GtkLabel.view.separator:selected:focus, .header-bar .view.subtitle:selected:focus { @@ -83,12 +83,12 @@ GtkLabel:insensitive { opacity: 0.55; } GtkAssistant .sidebar { - background-color: #383C45; - border-top: 1px solid #2d3036; } + background-color: #404552; + border-top: 1px solid #2b2e39; } GtkAssistant .sidebar:dir(ltr) { - border-right: 1px solid #2d3036; } + border-right: 1px solid #2b2e39; } GtkAssistant .sidebar:dir(rtl) { - border-left: 1px solid #2d3036; } + border-left: 1px solid #2b2e39; } GtkAssistant.csd .sidebar { border-top-style: none; } @@ -101,7 +101,7 @@ GtkAssistant .sidebar GtkLabel.highlight { color: #ffffff; } GtkTextView { - background-color: #3e424c; } + background-color: #3c414e; } GtkFlowBox .grid-child { padding: 3px; @@ -112,7 +112,7 @@ GtkFlowBox .grid-child { .popover.osd, .osd { color: #BAC3CF; border: none; - background-color: #2a2c33; + background-color: #353945; background-clip: padding-box; outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } @@ -144,9 +144,9 @@ GtkFlowBox .grid-child { border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #D3DAE3; - border-color: #2d3036; - background-color: #383c45; - background-image: linear-gradient(to bottom, #383c45); } + border-color: #2b2e39; + background-color: #404552; + background-image: linear-gradient(to bottom, #404552); } .header-bar .entry { padding: 6px; } .entry.image { @@ -155,22 +155,22 @@ GtkFlowBox .grid-child { .entry.flat, .entry.flat:focus { padding: 2px; color: #D3DAE3; - border-color: #2d3036; - background-color: #383c45; - background-image: linear-gradient(to bottom, #383c45); + border-color: #2b2e39; + background-color: #404552; + background-image: linear-gradient(to bottom, #404552); border: none; border-radius: 0; } .entry:focus { background-clip: border-box; color: #D3DAE3; border-color: #5294E2; - background-color: #383c45; - background-image: linear-gradient(to bottom, #383c45); } + background-color: #404552; + background-image: linear-gradient(to bottom, #404552); } .entry:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(56, 60, 69, 0.55); - background-image: linear-gradient(to bottom, rgba(56, 60, 69, 0.55)); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(64, 69, 82, 0.55); + background-image: linear-gradient(to bottom, rgba(64, 69, 82, 0.55)); } .entry:selected, .entry:selected:focus { background-color: #5294E2; @@ -198,7 +198,7 @@ GtkFlowBox .grid-child { .entry.error { color: white; border-color: #FC4138; - background-image: linear-gradient(to bottom, #d5403b); } + background-image: linear-gradient(to bottom, #d6423d); } .entry.error:focus { background-image: linear-gradient(to bottom, #FC4138); color: white; } @@ -208,7 +208,7 @@ GtkFlowBox .grid-child { .entry.warning { color: white; border-color: #F27835; - background-image: linear-gradient(to bottom, #cd6c38); } + background-image: linear-gradient(to bottom, #ce6e3b); } .entry.warning:focus { background-image: linear-gradient(to bottom, #F27835); color: white; } @@ -216,26 +216,26 @@ GtkFlowBox .grid-child { background-color: white; color: #F27835; } .entry.image { - color: #b4bac3; } + color: #b6bcc6; } .entry.image:hover { color: #D3DAE3; } .entry.image:active { color: #5294E2; } .linked.vertical > .entry { - border-bottom-color: #353841; + border-bottom-color: #3a3e4a; box-shadow: none; } .linked.vertical > .entry:focus { border-color: #5294E2; box-shadow: 0 -1px 0 0 #5294E2; } .linked.vertical > .entry:insensitive { - border-bottom-color: #353841; } + border-bottom-color: #3a3e4a; } .linked.vertical > .entry:first-child { - border-bottom-color: #353841; } + border-bottom-color: #3a3e4a; } .linked.vertical > .entry:first-child:focus { border-bottom-color: #5294E2; box-shadow: none; } .linked.vertical > .entry:first-child:insensitive { - border-bottom-color: #353841; } + border-bottom-color: #3a3e4a; } .linked.vertical > .entry:last-child { border-bottom-color: rgba(0, 0, 0, 0.14); } .linked.vertical > .entry:last-child:focus { @@ -245,17 +245,18 @@ GtkFlowBox .grid-child { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.4); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.4)); + background-color: transparent; } + .osd .entry.image, .osd .entry.image:hover { + color: inherit; } .osd .entry:focus { - color: #BAC3CF; - border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } GtkSearchEntry.entry { border-radius: 20px; } @@ -276,15 +277,15 @@ GtkSearchEntry.entry { padding: 5px 8px; color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } .header-bar .button { padding: 6px 11px; } .button.flat { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(68, 72, 82, 0); + background-color: rgba(56, 60, 74, 0); transition: none; } .button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); @@ -294,14 +295,16 @@ GtkSearchEntry.entry { .button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; + border-color: #2b2e39; + background-color: #505666; -gtk-image-effect: highlight; } .button:active, .button:checked { - background-clip: border-box; + background-clip: padding-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8b98b0; + background-color: #8b98b0; + border-color: transparent; background-color: #5294E2; transition-duration: 50ms; } .button:active { @@ -314,8 +317,8 @@ GtkSearchEntry.entry { background-image: none; } .button:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } .button:insensitive > GtkLabel { color: inherit; } .button:insensitive:active, .button:insensitive:checked { @@ -329,31 +332,31 @@ GtkSearchEntry.entry { 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; } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); + background-color: #353945; } .button.osd.image-button { padding: 10px; } .button.osd:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); - background-color: #2a2c33; } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); + background-color: #353945; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .button.osd:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } .osd .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -375,17 +378,17 @@ GtkSearchEntry.entry { .osd .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .osd .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } .osd .button.flat { border-color: transparent; background-color: transparent; @@ -394,12 +397,12 @@ GtkSearchEntry.entry { .osd .button.flat:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .osd .button.flat:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; @@ -526,23 +529,25 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } .inline-toolbar GtkToolButton > .button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8b98b0; + background-color: #8b98b0; + border-color: transparent; background-color: #5294E2; } .inline-toolbar GtkToolButton > .button:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } .inline-toolbar GtkToolButton > .button:insensitive > GtkLabel { color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active, @@ -568,7 +573,15 @@ GtkSearchEntry.entry { GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .button:hover, .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .button:hover:dir(ltr) { - box-shadow: inset 1px 0 #5294E2, inset -1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5), inset -1px 0 rgba(43, 46, 57, 0.5); } + .inline-toolbar GtkToolButton > .button.flat:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active, + GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .button:active, .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .button:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked, + GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .button:checked, .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .button:checked:dir(ltr) { + box-shadow: none; } .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl), .header-bar .linked.stack-switcher > .button:dir(rtl), @@ -585,7 +598,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:first-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .button:first-child:hover, .linked > GtkComboBox:first-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover, .header-bar .linked.stack-switcher > .button:first-child:hover, .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { - box-shadow: inset -1px 0 #5294E2; } + box-shadow: inset -1px 0 rgba(43, 46, 57, 0.5); } + .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active, + .inline-toolbar GtkToolButton:first-child > .button.flat:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .button:first-child:active, .linked > GtkComboBox:first-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked, + .inline-toolbar GtkToolButton:first-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .button:first-child:checked, .linked > GtkComboBox:first-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } .osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button, .primary-toolbar .linked.stack-switcher > .button:last-child, @@ -597,7 +618,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:last-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .button:last-child:hover, .linked > GtkComboBox:last-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover, .header-bar .linked.stack-switcher > .button:last-child:hover, .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { - box-shadow: inset 1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5); } + .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active, + .inline-toolbar GtkToolButton:last-child > .button.flat:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .button:last-child:active, .linked > GtkComboBox:last-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked, + .inline-toolbar GtkToolButton:last-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .button:last-child:checked, .linked > GtkComboBox:last-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl), .header-bar .linked.stack-switcher > .button:last-child:dir(rtl), @@ -615,6 +644,14 @@ GtkSearchEntry.entry { .header-bar .linked.stack-switcher > .button:only-child:hover, .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { box-shadow: none; } + .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active, + .inline-toolbar GtkToolButton:only-child > .button.flat:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .button:only-child:active, .linked > GtkComboBox:only-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked, + .inline-toolbar GtkToolButton:only-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .button:only-child:checked, .linked > GtkComboBox:only-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button, .linked.vertical > .button:hover, @@ -628,7 +665,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:hover, .linked.vertical > .button:hover, .linked.vertical > GtkComboBoxText > .button:hover, .linked.vertical > GtkComboBox > .button:hover { - box-shadow: inset 0 1px #5294E2, inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(43, 46, 57, 0.5), inset 0 1px rgba(43, 46, 57, 0.5); } + .linked.vertical > .entry:active, .linked.vertical > .button:active, + .linked.vertical > GtkComboBoxText > .button:active, + .linked.vertical > GtkComboBox > .button:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked, + .linked.vertical > GtkComboBoxText > .button:checked, + .linked.vertical > GtkComboBox > .button:checked { + box-shadow: none; } .linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, @@ -638,7 +681,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover, .linked.vertical > GtkComboBoxText:first-child > .button:hover, .linked.vertical > GtkComboBox:first-child > .button:hover { - box-shadow: inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(43, 46, 57, 0.5); } + .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active, + .linked.vertical > GtkComboBoxText:first-child > .button:active, + .linked.vertical > GtkComboBox:first-child > .button:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked, + .linked.vertical > GtkComboBoxText:first-child > .button:checked, + .linked.vertical > GtkComboBox:first-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, @@ -648,7 +697,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover, .linked.vertical > GtkComboBoxText:last-child > .button:hover, .linked.vertical > GtkComboBox:last-child > .button:hover { - box-shadow: inset 0 1px #5294E2; } + box-shadow: inset 0 1px rgba(43, 46, 57, 0.5); } + .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active, + .linked.vertical > GtkComboBoxText:last-child > .button:active, + .linked.vertical > GtkComboBox:last-child > .button:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked, + .linked.vertical > GtkComboBoxText:last-child > .button:checked, + .linked.vertical > GtkComboBox:last-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, @@ -659,6 +714,12 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBoxText:only-child > .button:hover, .linked.vertical > GtkComboBox:only-child > .button:hover { box-shadow: none; } + .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active, + .linked.vertical > GtkComboBoxText:only-child > .button:active, + .linked.vertical > GtkComboBox:only-child > .button:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked, + .linked.vertical > GtkComboBoxText:only-child > .button:checked, + .linked.vertical > GtkComboBox:only-child > .button:checked { + box-shadow: none; } .menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, @@ -674,7 +735,7 @@ GtkSearchEntry.entry { outline-offset: -1px; border-radius: 2px; } .menuitem.button.flat:hover { - background-color: #4b4f59; } + background-color: #484c59; } .menuitem.button.flat:checked { color: #D3DAE3; } @@ -706,17 +767,15 @@ GtkSearchEntry.entry { border-radius: 3px; } .spinbutton .button { background-image: none; - border: 1px solid rgba(45, 48, 54, 0.6); + border: 1px solid rgba(43, 46, 57, 0.6); border-style: none none none solid; - color: #cbd2db; + color: #ccd3dc; border-radius: 0; box-shadow: none; } .spinbutton .button:dir(rtl) { border-style: none solid none none; } .spinbutton .button:first-child { color: red; } - .spinbutton .button:hover { - color: #5294E2; } .spinbutton .button:insensitive { color: rgba(211, 218, 227, 0.45); } .spinbutton .button:active { @@ -725,43 +784,47 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child, .spinbutton.vertical:dir(rtl) .button:first-child { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8b98b0; + background-color: #8b98b0; + border-color: transparent; background-color: #5294E2; } .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } .spinbutton.vertical .button:first-child:insensitive, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } .spinbutton.vertical .button:first-child:insensitive > GtkLabel, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive > GtkLabel { color: inherit; } .spinbutton.vertical .button:last-child, .spinbutton.vertical:dir(rtl) .button:last-child { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8b98b0; + background-color: #8b98b0; + border-color: transparent; background-color: #5294E2; } .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } .spinbutton.vertical .button:last-child:insensitive, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } .spinbutton.vertical .button:last-child:insensitive > GtkLabel, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive > GtkLabel { color: inherit; } .spinbutton.vertical.entry, .spinbutton.vertical:dir(rtl).entry { @@ -800,16 +863,17 @@ GtkComboBox { border-left-style: none; } GtkComboBox.combobox-entry .button { color: rgba(211, 218, 227, 0.6); - background-color: #2d3036; - border-color: #2d3036; } + background-color: #2b2e39; + border-color: #2b2e39; } GtkComboBox.combobox-entry .button:hover { - background-color: #383c44; - border-color: #5294E2; - box-shadow: -1px 0 #5294E2; } + background-color: #363a47; + border-color: #363a47; } GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8b98b0; + background-color: #8b98b0; + border-color: transparent; background-color: #5294E2; } GtkComboBox.combobox-entry .button:insensitive { opacity: 0.5; } @@ -820,40 +884,40 @@ GtkComboBox { .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; - background-color: #444852; } + background-color: #383C4A; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: 1px solid rgba(0, 0, 0, 0.6); + border: 1px solid rgba(0, 0, 0, 0.5); border-radius: 3px; - background-color: rgba(42, 44, 51, 0.9); } + background-color: rgba(53, 57, 69, 0.9); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; + background-color: #2f343f; box-shadow: none; border-width: 0 0 1px 0; border-style: solid; - border-image: linear-gradient(to bottom, #2f343b, #1f2227) 1 0 1 0; } + border-image: linear-gradient(to bottom, #2f343f, #20232b) 1 0 1 0; } .primary-toolbar:backdrop { - background-color: #32383f; } + background-color: #323843; } .inline-toolbar { - background-color: #3d414a; + background-color: #313541; border-style: solid; - border-color: #2d3036; + border-color: #2b2e39; border-width: 0 1px 1px; padding: 3px; border-radius: 0 0 3px 3px; } .search-bar { - background-color: #444852; + background-color: #383C4A; border-style: solid; - border-color: #2d3036; + border-color: #2b2e39; border-width: 0 0 1px; padding: 3px; } .action-bar { - background-color: #3d414a; } + background-color: #313541; } /*************** * Header bars * @@ -863,16 +927,16 @@ GtkComboBox { border-width: 0 0 1px; border-style: solid; border-radius: 0; - border-color: #24272d; + border-color: #262a33; color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; } + background-color: #2f343f; } .csd .header-bar { - background-color: #2f343b; } + background-color: #2f343f; } .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); - background-color: #32383f; } + background-color: #323843; } .csd .header-bar:backdrop { - background-color: #32383f; } + background-color: #323843; } .header-bar .title { padding: 0px 12px; } .header-bar .subtitle { @@ -943,28 +1007,28 @@ GtkComboBox { .maximized .header-bar, .maximized .header-bar:backdrop { border-radius: 0; } .maximized .header-bar { - background-color: #2f343b; } + background-color: #2f343f; } .maximized .header-bar:backdrop { - background-color: #32383f; } + background-color: #323843; } .titlebar { padding-left: 7px; padding-right: 7px; border-radius: 3px 3px 0 0; color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; - box-shadow: inset 0 1px #363c44; } + background-color: #2f343f; + box-shadow: inset 0 1px #363b48; } .csd .titlebar { - background-color: #2f343b; } + background-color: #2f343f; } .titlebar:backdrop { color: rgba(207, 218, 231, 0.5); - background-color: #32383f; } + background-color: #323843; } .csd .titlebar:backdrop { - background-color: #32383f; } + background-color: #323843; } .maximized .titlebar { - background-color: #2f343b; } + background-color: #2f343f; } .maximized .titlebar:backdrop { - background-color: #32383f; } + background-color: #323843; } .titlebar .titlebar, .titlebar .titlebar:backdrop { @@ -982,8 +1046,8 @@ GtkComboBox { .primary-toolbar .entry, .header-bar .entry { color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } .primary-toolbar .entry.image, .header-bar .entry.image, .primary-toolbar .entry.image:hover, .header-bar .entry.image:hover { color: inherit; } @@ -991,13 +1055,14 @@ GtkComboBox { opacity: 0.85; } .primary-toolbar .entry:focus, .header-bar .entry:focus { color: #ffffff; - border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); + background-clip: padding-box; } .primary-toolbar .entry:focus.image, .header-bar .entry:focus.image { color: #ffffff; } .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus { background-color: #ffffff; color: #5294E2; } @@ -1010,24 +1075,25 @@ GtkComboBox { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); outline-offset: -3px; - background-color: rgba(47, 52, 59, 0); - border-color: rgba(47, 52, 59, 0); } + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .primary-toolbar .button:backdrop, .header-bar .button:backdrop { opacity: 0.7; } .primary-toolbar .button:hover, .header-bar .button:hover { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: #1d2024; - background-color: rgba(40, 44, 50, 0.9); } + border-color: rgba(21, 23, 28, 0.4); + background-color: rgba(95, 105, 127, 0.4); } .primary-toolbar .button:active, .header-bar .button:active, .primary-toolbar .button:checked, .header-bar .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; - background-color: #5294E2; } + border-color: transparent; + background-color: #5294E2; + background-clip: padding-box; } .primary-toolbar .button:insensitive, .header-bar .button:insensitive { color: rgba(207, 218, 231, 0.35); - background-color: rgba(47, 52, 59, 0); - border-color: rgba(47, 52, 59, 0); } + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .primary-toolbar .button:insensitive > GtkLabel, .header-bar .button:insensitive > GtkLabel { color: inherit; } .primary-toolbar .button:insensitive:active, .header-bar .button:insensitive:active, .primary-toolbar .button:insensitive:checked, .header-bar .button:insensitive:checked { @@ -1047,12 +1113,12 @@ GtkComboBox { .primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: #1d2024; - background-color: rgba(40, 44, 50, 0.9); } + border-color: rgba(21, 23, 28, 0.4); + background-color: rgba(95, 105, 127, 0.4); } .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { - border-color: #5294E2; } + background-color: rgba(134, 144, 165, 0.4); } .primary-toolbar .linked.stack-switcher > .button:active, .header-bar .linked.stack-switcher > .button:active, .primary-toolbar .linked.stack-switcher > .button:checked, @@ -1060,8 +1126,52 @@ GtkComboBox { .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } + .primary-toolbar .linked.stack-switcher > .button:insensitive, + .header-bar .linked.stack-switcher > .button:insensitive, + .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive { + color: rgba(207, 218, 231, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:hover, + .header-bar .linked.stack-switcher > .button:hover, + .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:first-child:hover, + .header-bar .linked.stack-switcher > .button:first-child:hover, + .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:last-child:hover, + .header-bar .linked.stack-switcher > .button:last-child:hover, + .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:hover, + .header-bar .linked.stack-switcher > .button:only-child:hover, + .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked { + box-shadow: none; } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; @@ -1155,24 +1265,25 @@ GtkComboBox { .primary-toolbar GtkComboBox.combobox-entry .button, .header-bar GtkComboBox.combobox-entry .button { color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } .primary-toolbar GtkComboBox.combobox-entry .button.image, .header-bar GtkComboBox.combobox-entry .button.image, .primary-toolbar GtkComboBox.combobox-entry .button.image:hover, .header-bar GtkComboBox.combobox-entry .button.image:hover { color: inherit; } .primary-toolbar GtkComboBox.combobox-entry .button:hover, .header-bar GtkComboBox.combobox-entry .button:hover { color: #ffffff; - border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); + box-shadow: none; } .primary-toolbar GtkComboBox.combobox-entry .button:insensitive, .header-bar GtkComboBox.combobox-entry .button:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } .primary-toolbar GtkProgressBar.trough, .header-bar GtkProgressBar.trough, .primary-toolbar .level-bar.trough, .header-bar .level-bar.trough { - background-color: rgba(207, 218, 231, 0.15); } + background-color: rgba(21, 23, 28, 0.4); } .primary-toolbar GtkProgressBar:backdrop, .header-bar GtkProgressBar:backdrop { opacity: 0.75; } @@ -1181,14 +1292,22 @@ GtkComboBox { opacity: 0.75; } .primary-toolbar .scale.trough, .header-bar .scale.trough { - background-image: linear-gradient(to bottom, rgba(207, 218, 231, 0.15)); } + background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.4)); } .primary-toolbar .scale.trough:insensitive, .header-bar .scale.trough:insensitive { - background-image: linear-gradient(to bottom, rgba(207, 218, 231, 0.1)); } + background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.3)); } .primary-toolbar .scale.slider, .header-bar .scale.slider { - background-image: linear-gradient(to bottom, #373b44); } + background-image: linear-gradient(to bottom, #454c5c); + border-color: rgba(21, 23, 28, 0.7); } + .primary-toolbar .scale.slider:hover, .header-bar .scale.slider:hover { + background-image: linear-gradient(to bottom, #50586b); + border-color: rgba(21, 23, 28, 0.7); } + .primary-toolbar .scale.slider:active, .header-bar .scale.slider:active { + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .primary-toolbar .scale.slider:insensitive, .header-bar .scale.slider:insensitive { - background-image: linear-gradient(to bottom, #33373f); } + background-image: linear-gradient(to bottom, #3e4553); + border-color: rgba(21, 23, 28, 0.7); } /************ * Pathbars * @@ -1223,7 +1342,7 @@ GtkTreeView.view { border-color: #93b7e3; } GtkTreeView.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); - color: #868b94; } + color: #8a909b; } GtkTreeView.view.expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } GtkTreeView.view.expander:hover { @@ -1243,13 +1362,13 @@ GtkTreeView.view { background-color: #ffffff; } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #D3DAE3; - background-color: #2d3036; + background-color: #2b2e39; border-radius: 3px; border-width: 0; } column-header .button { - color: #b4bac3; - background-color: #383C45; } + color: #b6bcc6; + background-color: #404552; } column-header .button:hover { color: #5294E2; box-shadow: none; @@ -1266,7 +1385,7 @@ column-header:last-child.button { column-header.button.dnd, column-header .button.dnd, column-header.button.dnd:active, column-header.button.dnd:selected, column-header.button.dnd:hover { transition: none; color: #5294E2; - box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #383C45, inset -1px 0 #383C45; } + box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #404552, inset -1px 0 #404552; } column-header .button, column-header .button:hover, column-header .button:active { padding: 3px 6px; @@ -1275,11 +1394,11 @@ column-header .button, column-header .button:hover, column-header .button:active border-radius: 0; border-image: linear-gradient(to bottom, rgba(255, 255, 255, 0) 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, rgba(255, 255, 255, 0) 80%) 0 1 0 0/0 1px 0 0 stretch; } column-header .button:active, column-header .button:hover { - background-color: #383C45; } + background-color: #404552; } column-header .button:active:hover { color: #D3DAE3; } column-header .button:insensitive { - border-color: #444852; + border-color: #383C4A; background-image: none; } /********* @@ -1288,10 +1407,10 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar { -GtkWidget-window-dragging: true; padding: 0px; - background-color: #2f343b; + background-color: #2f343f; color: rgba(207, 218, 231, 0.8); } .menubar:backdrop { - background-color: #32383f; } + background-color: #323843; } .menubar > .menuitem { padding: 6px 8px; border: solid transparent; @@ -1307,8 +1426,8 @@ column-header .button, column-header .button:hover, column-header .button:active margin: 4px; padding: 0; border-radius: 0; - background-color: #383C45; - border: 1px solid #2d3036; } + background-color: #383C4A; + border: 1px solid #2b2e39; } .csd .menu, .csd .popup { padding: 4px 0px; border-radius: 2px; @@ -1323,7 +1442,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem:insensitive, .popup .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { - color: rgba(56, 60, 69, 0); } + color: rgba(64, 69, 82, 0); } .menu .menuitem.arrow, .popup .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { @@ -1332,11 +1451,11 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none; border-radius: 0; } .menu.button.top, .popup.button.top { - border-bottom: 1px solid #484c55; } + border-bottom: 1px solid #4f5461; } .menu.button.bottom, .popup.button.bottom { - border-top: 1px solid #484c55; } + border-top: 1px solid #4f5461; } .menu.button:hover, .popup.button:hover { - background-color: #484c55; } + background-color: #4f5461; } .menu.button:insensitive, .popup.button:insensitive { color: transparent; background-color: transparent; @@ -1351,13 +1470,13 @@ column-header .button, column-header .button:hover, column-header .button:active .popover { margin: 10px; padding: 2px; - border: 1px solid #212328; + border: 1px solid #20222a; border-radius: 3px; background-clip: border-box; - background-color: #383C45; + background-color: #383C4A; box-shadow: 0 2px 6px 1px rgba(0, 0, 0, 0.35); } .popover .separator, .popover GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .popover .view.separator { - color: rgba(56, 60, 69, 0); } + color: rgba(64, 69, 82, 0); } .popover > .list, .popover > .view, .popover > .toolbar, @@ -1385,7 +1504,7 @@ column-header .button, column-header .button:hover, column-header .button:active *****************/ .notebook { padding: 0; - background-color: #383C45; + background-color: #404552; -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; @@ -1395,7 +1514,7 @@ column-header .button, column-header .button:hover, column-header .button:active -GtkWidget-focus-line-width: 0; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } .notebook.frame { - border: 1px solid #2d3036; } + border: 1px solid #2b2e39; } .notebook.frame.top { border-top-width: 0; } .notebook.frame.bottom { @@ -1405,9 +1524,9 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.frame.left { border-left-width: 0; } .notebook.header { - background-color: #444852; } + background-color: #383C4A; } .notebook.header.frame { - border: 0px solid #2d3036; } + border: 0px solid #2b2e39; } .notebook.header.frame.top { border-bottom-width: 0; } .notebook.header.frame.bottom { @@ -1417,13 +1536,13 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.header.frame.left { border-right-width: 0; } .notebook.header.top { - box-shadow: inset 0 -1px #2d3036; } + box-shadow: inset 0 -1px #2b2e39; } .notebook.header.bottom { - box-shadow: inset 0 1px #2d3036; } + box-shadow: inset 0 1px #2b2e39; } .notebook.header.right { - box-shadow: inset 1px 0 #2d3036; } + box-shadow: inset 1px 0 #2b2e39; } .notebook.header.left { - box-shadow: inset -1px 0 #2d3036; } + box-shadow: inset -1px 0 #2b2e39; } .notebook tab { border-width: 0; border-style: solid; @@ -1444,52 +1563,52 @@ column-header .button, column-header .button:hover, column-header .button:active border-width: 0; border-top-width: 2px; border-color: transparent; - background-color: rgba(56, 60, 69, 0); } + background-color: rgba(64, 69, 82, 0); } .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page, .notebook tab.top:hover, .notebook tab.top.prelight-page { - background-color: rgba(56, 60, 69, 0.5); - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: rgba(64, 69, 82, 0.5); + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.top:active, .notebook tab.top.active-page, .notebook tab.top.active-page:hover { - background-color: #383C45; - box-shadow: inset 0 1px #2d3036, inset 0 -1px #383C45, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: #404552; + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #404552, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.bottom, .notebook tab.bottom { padding-bottom: 6px; border-radius: 0 0 2px 3.5px; border-width: 0; border-bottom-width: 2px; border-color: transparent; - background-color: rgba(56, 60, 69, 0); } + background-color: rgba(64, 69, 82, 0); } .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page { - background-color: rgba(56, 60, 69, 0.5); - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: rgba(64, 69, 82, 0.5); + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.bottom:active, .notebook tab.bottom.active-page, .notebook tab.bottom.active-page:hover { - background-color: #383C45; - box-shadow: inset 0 -1px #383C45, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: #404552; + box-shadow: inset 0 -1px #404552, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.right, .notebook tab.right { padding-right: 17px; border-radius: 0 3.5px 3.5px 0; border-width: 0; border-right-width: 2px; border-color: transparent; - background-color: rgba(56, 60, 69, 0); } + background-color: rgba(64, 69, 82, 0); } .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page { - background-color: rgba(56, 60, 69, 0.5); - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: rgba(64, 69, 82, 0.5); + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.right:active, .notebook tab.right.active-page, .notebook tab.right.active-page:hover { - background-color: #383C45; - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #383C45, inset -1px 0 #2d3036; } + background-color: #404552; + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #404552, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.left, .notebook tab.left { padding-left: 17px; border-radius: 3.5px 0 0 3.5px; border-width: 0; border-left-width: 2px; border-color: transparent; - background-color: rgba(56, 60, 69, 0); } + background-color: rgba(64, 69, 82, 0); } .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page { - background-color: rgba(56, 60, 69, 0.5); - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: rgba(64, 69, 82, 0.5); + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.left:active, .notebook tab.left.active-page, .notebook tab.left.active-page:hover { - background-color: #383C45; - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #383C45; } + background-color: #404552; + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #404552; } .notebook tab GtkLabel { padding: 0 2px; color: rgba(211, 218, 227, 0.45); } @@ -1499,7 +1618,7 @@ column-header .button, column-header .button:hover, column-header .button:active color: #D3DAE3; } .notebook tab .button { padding: 0; - color: #a1a7b0; } + color: #9da3ad; } .notebook tab .button:hover { color: #ff4d4d; } .notebook tab .button:active { @@ -1534,9 +1653,9 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; - background-color: #7d828c; } + background-color: #767b87; } .scrollbar.slider:hover { - background-color: #a8aeb7; } + background-color: #a5abb5; } .scrollbar.slider:prelight:active { background-color: #5294E2; } .scrollbar.slider.fine-tune { @@ -1550,7 +1669,7 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbar.trough, .scrollbars-junction.frame, .frame.scrollbar.trough { border-color: transparent; - background-color: #383C45; } + background-color: #404552; } /********** * Switch * @@ -1774,21 +1893,21 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { margin: 3px; } .scale.slider { background-clip: border-box; - background-image: linear-gradient(to bottom, #383c45); - border: 1px solid #5294E2; + background-image: linear-gradient(to bottom, #444a58); + border: 1px solid #262933; border-radius: 50%; box-shadow: none; } .scale.slider:hover { - background-image: linear-gradient(to bottom, #5294E2); - border-color: #5294E2; } + background-image: linear-gradient(to bottom, #505666); + border-color: #262933; } .scale.slider:insensitive { - background-image: linear-gradient(to bottom, #3d414b); - border-color: #4c72a1; } + background-image: linear-gradient(to bottom, #3c414e); + border-color: rgba(38, 41, 51, 0.8); } .scale.slider:active { - background-image: linear-gradient(to bottom, #2679db); - border-color: #2679db; } + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .osd .scale.slider { - background-image: linear-gradient(to bottom, #2a2c33); + background-image: linear-gradient(to bottom, #353945); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1810,15 +1929,15 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough { border: none; border-radius: 2.5px; - background-image: linear-gradient(to bottom, #2f323a); } + background-image: linear-gradient(to bottom, #2d303b); } .scale.trough.highlight { background-image: linear-gradient(to bottom, #5294E2); } .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, rgba(82, 148, 226, 0.55)); } .scale.trough:insensitive { - background-image: linear-gradient(to bottom, rgba(47, 50, 58, 0.55)); } + background-image: linear-gradient(to bottom, rgba(45, 48, 59, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, #3a3e46); + background-image: linear-gradient(to bottom, #454a59); outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; @@ -1858,7 +1977,7 @@ GtkProgressBar { GtkProgressBar.trough, .level-bar.trough { border: none; border-radius: 3px; - background-color: #2f323a; } + background-color: #2d303b; } GtkProgressBar.trough.osd, .osd.level-bar.trough { border-style: none; background-color: transparent; @@ -1894,14 +2013,14 @@ GtkLevelBar.vertical { border-color: #F27835; background-color: #F27835; } .level-bar.fill-block.empty-fill-block { - background-color: rgba(211, 218, 227, 0.2); - border-color: rgba(211, 218, 227, 0.2); } + background-color: #404552; + border-color: #404552; } /********** * Frames * **********/ .frame { - border: 1px solid #2d3036; + border: 1px solid #2b2e39; padding: 0; } .frame.flat { border-style: none; } @@ -1927,8 +2046,8 @@ GtkScrolledWindow GtkViewport.frame { * Lists * *********/ .list, .list-row { - background-color: #383C45; - border-color: #2d3036; } + background-color: #404552; + border-color: #2b2e39; } .list-row, .grid-child { @@ -1965,18 +2084,18 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame { padding: 10px; color: #BAC3CF; - background-color: #3c4049; + background-color: #353945; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: #25272d; } + border-color: #1f2128; } .app-notification .button, .app-notification.frame .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } @@ -1984,8 +2103,8 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { @@ -1995,9 +2114,9 @@ GtkScrolledWindow GtkViewport.frame { background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } /************* * Expanders * @@ -2016,7 +2135,7 @@ GtkExpander { ***********/ GtkCalendar { color: #D3DAE3; - border: 1px solid #2d3036; + border: 1px solid #2b2e39; border-radius: 3px; padding: 2px; } GtkCalendar:selected { @@ -2029,8 +2148,9 @@ GtkCalendar { border-radius: 0; } GtkCalendar.button, GtkCalendar.button:focus { color: rgba(211, 218, 227, 0.45); - box-shadow: none; - border: none; } + border-color: transparent; + background-color: transparent; + background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #D3DAE3; } GtkCalendar.highlight { @@ -2045,8 +2165,8 @@ GtkCalendar { .message-dialog { -GtkDialog-button-spacing: 0; } .message-dialog .titlebar { - background-color: #2f343b; - border-bottom: 1px solid #1f2227; } + background-color: #2f343f; + border-bottom: 1px solid #20232b; } .message-dialog.csd.background { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; @@ -2068,19 +2188,19 @@ GtkCalendar { border-bottom-left-radius: 3px; } GtkFileChooserDialog .search-bar { - background-color: #444852; - border-color: #2d3036; + background-color: #383C4A; + border-color: #2b2e39; box-shadow: none; } GtkFileChooserDialog .dialog-action-box { - border-top: 1px solid #2d3036; } + border-top: 1px solid #2b2e39; } /*********** * Sidebar * ***********/ .sidebar { border: none; - background-color: #444852; } + background-color: #383C4A; } .sidebar .scrollbar.trough { background-color: transparent; border-width: 2px; @@ -2110,7 +2230,7 @@ GtkPaned { margin-left: 8px; } .pane-separator { - background-image: linear-gradient(to bottom, #2d3036); } + background-image: linear-gradient(to bottom, #2b2e39); } /************** * GtkInfoBar * @@ -2163,7 +2283,7 @@ GtkInfoBar { color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: #2a2c33; + background-color: #353945; background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2211,13 +2331,13 @@ GtkColorSwatch { border-color: rgba(255, 255, 255, 0.5); } GtkColorChooserWidget #add-color-button { - border-color: #383c44; - background-color: #383c44; - color: #444852; + border-color: #313541; + background-color: #313541; + color: #383C4A; box-shadow: none; } GtkColorChooserWidget #add-color-button:hover { - border-color: #2d3036; - background-color: #2d3036; } + border-color: #2b2e39; + background-color: #2b2e39; } GtkColorButton.button { padding: 4px; } @@ -2232,8 +2352,8 @@ GtkColorButton.button { .scale-popup .button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } GtkVolumeButton.button { padding: 8px; } @@ -2244,16 +2364,16 @@ GtkVolumeButton.button { .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px #1f2227, 0 4px 8px 1px rgba(0, 0, 0, 0.65); + box-shadow: 0 0 0 1px #22262d, 0 8px 8px 0 rgba(0, 0, 0, 0.35); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px #1f2227, 0 4px 5px 2px rgba(0, 0, 0, 0.55); } + box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; - box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #212429; } + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } .window-frame.csd.tooltip { border-radius: 2px; box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.55); } @@ -2266,7 +2386,7 @@ GtkVolumeButton.button { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 59, 0); + background-color: rgba(47, 52, 63, 0); border-width: 0; color: transparent; background-position: center; @@ -2632,7 +2752,7 @@ TerminalWindow .notebook tab.top:active, TerminalWindow .notebook tab.top.active-page, TerminalWindow .notebook tab.top.active-page:hover, PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top:active, PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top.active-page, PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top.active-page:hover, PantheonTerminalPantheonTerminalWindow .notebook tab.top:active, PantheonTerminalPantheonTerminalWindow .notebook tab.top.active-page, PantheonTerminalPantheonTerminalWindow .notebook tab.top.active-page:hover { - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } TerminalWindow .notebook tab.reorderable-page.top, TerminalWindow .notebook tab.top, @@ -2642,10 +2762,10 @@ PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top, Panth TerminalWindow .notebook.header.top, PantheonTerminalPantheonTerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #24272d, inset 0 -1px #2d3036; } + box-shadow: inset 0 1px #262a33, inset 0 -1px #2b2e39; } GtkHTML { - background-color: #383C45; + background-color: #404552; color: #D3DAE3; } GtkHTML:active { color: #ffffff; @@ -2678,7 +2798,7 @@ NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { color: #ffffff; } NautilusNotebook.notebook { - background-color: #383C45; } + background-color: #404552; } NautilusNotebook.notebook tab { border-width: 0; border-style: solid; @@ -2688,32 +2808,50 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar { padding: 5px; box-shadow: none; - background-color: #383C45; } + background-color: #404552; } NemoWindow .sidebar .frame { border-width: 0; } NemoWindow GtkSeparator.separator.horizontal, NemoWindow GtkPlacesSidebar.sidebar GtkSeparator.horizontal.view.separator, GtkPlacesSidebar.sidebar NemoWindow GtkSeparator.horizontal.view.separator { - color: #2d3036; } + color: #2b2e39; } NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: #1d2024; - background-color: rgba(40, 44, 50, 0.9); } + border-color: rgba(21, 23, 28, 0.4); + background-color: rgba(95, 105, 127, 0.4); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { - border-color: #5294E2; } + background-color: rgba(134, 144, 165, 0.4); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive { + color: rgba(207, 218, 231, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .gedit-headerbar-paned { - color: #24272d; } + color: #262a33; } .open-document-selector-listbox-row { - border-bottom: 1px solid #383c44; + border-bottom: 1px solid #2d303b; padding: 6px 6px 6px 12px; } .open-document-selector-listbox-row .path-label { font-size: smaller; @@ -2732,7 +2870,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: inherit; } .gedit-document-panel .prelight-row .button { - color: #a1a7b0; } + color: #9da3ad; } .gedit-document-panel .list-row .button:hover, .gedit-document-panel .prelight-row .button:hover { @@ -2751,13 +2889,13 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: #D3DAE3; } .gedit-document-panel-dragged-row { - border: 1px solid #2d3036; - background-color: #2d3036; + border: 1px solid #2b2e39; + background-color: #22242d; color: #D3DAE3; } GeditStatusbar { - border-top: 1px solid #2d3036; - background-color: #444852; } + border-top: 1px solid #2b2e39; + background-color: #383C4A; } GeditStatusMenuButton.button.flat, GeditStatusMenuButton:prelight.button.flat, @@ -2766,7 +2904,7 @@ GeditStatusMenuButton:checked.button.flat { border-radius: 0; } GeditFileBrowserWidget .toolbar, GeditFileBrowserWidget .inline-toolbar { - border-bottom: 1px solid #2d3036; } + border-bottom: 1px solid #2b2e39; } .gedit-search-entry-occurrences-tag, .gb-search-entry-occurrences-tag { color: rgba(211, 218, 227, 0.6); @@ -2774,9 +2912,9 @@ GeditFileBrowserWidget .toolbar, GeditFileBrowserWidget .inline-toolbar { padding: 2px; } GeditViewFrame .gedit-search-slider, GbEditorFrame .gb-search-slider { - background-color: #494d58; + background-color: #3c4150; padding: 6px; - border-color: #2d3036; + border-color: #2b2e39; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; } @@ -2785,8 +2923,8 @@ GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr), GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { padding: 0 10px; color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover, @@ -2794,25 +2932,19 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { - color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); - background-color: transparent; - border-color: #5294E2; } - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, - GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { - color: inherit; } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { color: #ffffff; - border-color: #5294E2; + border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; @@ -2838,7 +2970,7 @@ GdTaggedEntry { border: none; } .preferences.sidebar GtkListBox { - background-color: #444852; } + background-color: #383C4A; } .preferences.sidebar GtkListBoxRow { padding: 10px; } @@ -2852,7 +2984,7 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #2a2c33; } + background-color: #353945; } GtkBox.gb-command-bar-box GtkLabel { color: #BAC3CF; } @@ -2861,7 +2993,7 @@ GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; color: #BAC3CF; background-image: none; - background-color: #2a2c33; + background-color: #353945; padding: 6px 6px 6px 6px; border: none; } @@ -2876,10 +3008,10 @@ GbSearchDisplayGroup GtkListBox .list-row, GbDocumentStack .button { GbViewStack GtkBox.header.notebook, GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { - border-bottom: 1px solid #2d3036; } + border-bottom: 1px solid #2b2e39; } GbViewStack.focused GtkBox.header.notebook { - background-color: #383C45; } + background-color: #404552; } GbViewStack.focused GtkBox.header.notebook .button.dim-label, GbViewStack.focused GtkBox.header.notebook GtkLabel.button.separator, GbViewStack.focused GtkBox.header.notebook .header-bar .button.subtitle, .header-bar GbViewStack.focused GtkBox.header.notebook .button.subtitle { opacity: 1; } @@ -2944,7 +3076,7 @@ PanelWidget, PanelAppletFrame, PanelApplet { color: #BAC3CF; - background-image: linear-gradient(to bottom, #1f2125); } + background-image: linear-gradient(to bottom, #2b2e37); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2988,18 +3120,18 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: #1f2125; } + background-color: #2b2e37; } .xfce4-panel.panel .button.flat { color: #BAC3CF; - background-color: rgba(31, 33, 37, 0); + background-color: rgba(43, 46, 55, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: #363941; } + background-color: #414654; } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: #0f1012; } + background-color: #1b1d23; } .floating-bar { background-color: #5294E2; @@ -3042,26 +3174,26 @@ MarlinViewWindow *:selected:focus { .marlin-pathbar.pathbar { border-radius: 3px; color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } .marlin-pathbar.pathbar.image, .marlin-pathbar.pathbar.image:hover { color: inherit; } .marlin-pathbar.pathbar:focus { color: #ffffff; - border-color: #5294E2; + border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked { color: #5294E2; } .gala-notification { - border: 1px solid #2d3036; + border: 1px solid #2b2e39; border-radius: 3px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); - background-image: linear-gradient(to bottom, #383C45); + background-image: linear-gradient(to bottom, #404552); background-color: transparent; } .gala-notification .title, .gala-notification .label { color: #D3DAE3; } @@ -3167,24 +3299,24 @@ UnityDecoration { -UnityDecoration-title-fade: 35px; -UnityDecoration-title-alignment: 0.0; } UnityDecoration.top { - border: 1px solid #1f2227; + border: 1px solid #20232b; border-bottom-width: 0; border-radius: 4px 4px 0 0; padding: 1px 6px 0 6px; - background-image: linear-gradient(to bottom, #2f343b); + background-image: linear-gradient(to bottom, #2f343f); color: rgba(207, 218, 231, 0.8); - box-shadow: inset 0 1px #363c44; } + box-shadow: inset 0 1px #363b48; } UnityDecoration.top:backdrop { border-bottom-width: 0; - background-image: linear-gradient(to bottom, #32383f); + background-image: linear-gradient(to bottom, #323843); color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { - background-image: linear-gradient(to bottom, #1f2227); } + background-image: linear-gradient(to bottom, #20232b); } UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #1f2125); + background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } @@ -3207,8 +3339,8 @@ GraniteWidgetsThinPaned { background-color: transparent; background-image: none; margin: 0; - border-left: 1px solid #2d3036; - border-right: 1px solid #2d3036; } + border-left: 1px solid #2b2e39; + border-right: 1px solid #2b2e39; } GraniteWidgetsPopOver .frame, GraniteWidgetsStaticNotebook .frame { @@ -3220,7 +3352,7 @@ GraniteWidgetsStaticNotebook .frame { .secondary-toolbar.toolbar, .secondary-toolbar.inline-toolbar { padding: 3px; - border-bottom: 1px solid #2d3036; } + border-bottom: 1px solid #2b2e39; } .secondary-toolbar.toolbar .button, .secondary-toolbar.inline-toolbar .button { padding: 0 3px 0 3px; } @@ -3228,8 +3360,8 @@ GraniteWidgetsStaticNotebook .frame { padding: 5px; border-width: 1px 0 0 0; border-style: solid; - border-color: #2d3036; - background-color: #444852; } + border-color: #2b2e39; + background-color: #383C4A; } .bottom-toolbar.toolbar .button, .bottom-toolbar.inline-toolbar .button { padding: 2px 3px 2px 3px; } @@ -3239,7 +3371,7 @@ GraniteWidgetsStaticNotebook .frame { .source-list, .source-list.view { - background-color: #444852; + background-color: #383C4A; color: #D3DAE3; -gtk-icon-style: regular; } @@ -3247,7 +3379,7 @@ GraniteWidgetsStaticNotebook .frame { color: transparent; } .source-list.view:prelight { - background-color: #505460; } + background-color: #434859; } .source-list.view:selected, .source-list.view:prelight:selected, @@ -3260,7 +3392,7 @@ GraniteWidgetsStaticNotebook .frame { .source-list .scrollbars-junction, .source-list .scrollbar.trough { border-image: none; border-color: transparent; - background-color: #444852; + background-color: #383C4A; background-image: none; } .source-list.badge, @@ -3296,10 +3428,10 @@ GraniteWidgetsStaticNotebook .frame { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GraniteWidgetsWelcome { - background-color: #383C45; } + background-color: #404552; } GraniteWidgetsWelcome GtkLabel { - color: #8c919b; + color: #868b97; font: open sans 11; text-shadow: none; } @@ -3320,7 +3452,7 @@ GraniteWidgetsPopOver { margin: 0; } .popover_bg { - background-image: linear-gradient(to bottom, #383C45); + background-image: linear-gradient(to bottom, #404552); border: 1px solid rgba(0, 0, 0, 0.3); } GraniteWidgetsPopOver .sidebar.view, @@ -3338,7 +3470,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { - color: #a8aeb7; + color: #a5abb5; font-weight: 600; text-shadow: 0 1px rgba(255, 255, 255, 0.6); } @@ -3351,10 +3483,10 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: #1f2125; + background-color: #2b2e37; color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px #0f1012; + box-shadow: inset 0 -1px #1b1d23; /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { @@ -3380,7 +3512,7 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: #383C45; + background-color: #383C4A; border-top-left-radius: 2px; border-top-right-radius: 2px; border: solid rgba(0, 0, 0, 0.1); @@ -3389,22 +3521,24 @@ GtkListBox .h4 { #content_frame .button { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } #content_frame .button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8b98b0; + background-color: #8b98b0; + border-color: transparent; background-color: #5294E2; } #content_frame .button:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } #content_frame .button:insensitive > GtkLabel { color: inherit; } @@ -3413,32 +3547,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: #2a2c33; + background-color: #2f343f; 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; } + box-shadow: inset 0 1px #262a33; } #buttonbox_frame .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } #buttonbox_frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } #login_window #user_combobox { color: #D3DAE3; @@ -3498,10 +3632,10 @@ GtkListBox .h4 { font: bold; } .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator { - color: #24272d; } + color: #262a33; } NemoWindow GtkEventBox { - background-color: #444852; } + background-color: #383C4A; } GtkFileChooserDialog *, NautilusWindow *, @@ -3511,12 +3645,12 @@ NemoWindow { GtkFileChooserDialog .sidebar, NautilusWindow .sidebar, NemoWindow .sidebar { - border-right: 1px solid #25272d; } + border-right: 1px solid #2a2d37; } GtkFileChooserDialog .sidebar:dir(rtl), NautilusWindow .sidebar:dir(rtl), NemoWindow .sidebar:dir(rtl) { - border-left: 1px solid #25272d; } + border-left: 1px solid #2a2d37; } NautilusWindow GtkBox.sidebar { background-color: transparent; } @@ -3544,7 +3678,7 @@ NautilusWindow MarlinPlacesSidebar, NemoWindow .sidebar, NemoWindow MarlinPlacesSidebar, MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, @@ -3675,25 +3809,25 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: #25272d; } + background-color: #2a2d37; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .sidebar { background-color: transparent; } GtkFileChooserDialog GtkPaned > .vertical > .horizontal { - background-color: #444852; } + background-color: #383C4A; } GtkFileChooserDialog .dialog-action-box { - background-color: #444852; } + background-color: #383C4A; } GtkFileChooserDialog .dialog-vbox > .frame { color: #BAC3CF; @@ -3701,7 +3835,7 @@ GtkFileChooserDialog .dialog-vbox > .frame { GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: #191b1f; } + border-color: #1f2128; } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, @@ -3712,20 +3846,20 @@ GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: #25272d; } + background-color: #2a2d37; } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop { - background-color: #24272d; } + background-color: #262a33; } .gedit-bottom-panel-paned { - background-color: #383C45; } + background-color: #404552; } .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .maximized .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .gedit-document-panel .list-row { color: #BAC3CF; } .gedit-document-panel .list-row { @@ -3752,9 +3886,9 @@ GeditWindow.background.csd { color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.trough { background-color: transparent; border-color: transparent; } @@ -3779,7 +3913,7 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: #2c2f35; } + border-color: #252831; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #BAC3CF; } @@ -3795,14 +3929,14 @@ GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } 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 { @@ -3812,75 +3946,71 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.4); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.4)); + background-color: transparent; } + GtkFileChooserDialog .action-bar.frame .image.entry, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry, GtkFileChooserDialog .action-bar.frame .image.entry:hover, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry:hover { + color: inherit; } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #BAC3CF; - border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #D3DAE3; @define-color theme_text_color #D3DAE3; -@define-color theme_bg_color #444852; -@define-color theme_base_color #383C45; +@define-color theme_bg_color #383C4A; +@define-color theme_base_color #404552; @define-color theme_selected_bg_color #5294E2; @define-color theme_selected_fg_color #ffffff; @define-color fg_color #D3DAE3; @define-color text_color #D3DAE3; -@define-color bg_color #444852; -@define-color base_color #383C45; +@define-color bg_color #383C4A; +@define-color base_color #404552; @define-color selected_bg_color #5294E2; @define-color selected_fg_color #ffffff; -@define-color insensitive_bg_color #494d58; +@define-color insensitive_bg_color #3c4150; @define-color insensitive_fg_color alpha(#d3dae3, 0.5); -@define-color insensitive_base_color #383C45; +@define-color insensitive_base_color #404552; @define-color theme_unfocused_fg_color #D3DAE3; @define-color theme_unfocused_text_color #D3DAE3; -@define-color theme_unfocused_bg_color #444852; -@define-color theme_unfocused_base_color #383C45; -@define-color borders #2d3036; -@define-color unfocused_borders #2d3036; +@define-color theme_unfocused_bg_color #383C4A; +@define-color theme_unfocused_base_color #404552; +@define-color borders #2b2e39; +@define-color unfocused_borders #2b2e39; @define-color warning_color #F27835; @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); -@define-color wm_bg #2f343b; -@define-color wm_bg_unfocused #32383f; -@define-color wm_highlight #363c44; +@define-color wm_bg #2f343f; +@define-color wm_bg_unfocused #323843; +@define-color wm_highlight #363b48; @define-color wm_shadow alpha(black, 0.35); -@define-color wm_button_close_bg #e45e65; -@define-color wm_button_close_hover_bg #f48085; -@define-color wm_button_close_active_bg #e6262f; -@define-color wm_icon_close_bg #ffffff; -@define-color wm_icon_close_hover_bg #ffffff; -@define-color wm_icon_close_active_bg #ffffff; -@define-color wm_button_bg #272c32; -@define-color wm_button_unfocused_bg #2a3035; -@define-color wm_button_hover_bg #272c32; +@define-color wm_button_close_bg #cc575d; +@define-color wm_button_close_hover_bg #d7787d; +@define-color wm_button_close_active_bg #be3841; +@define-color wm_icon_close_bg #2f343f; +@define-color wm_button_hover_bg #454C5C; @define-color wm_button_active_bg #5294E2; -@define-color wm_button_border #191C21; -@define-color wm_button_unfocused_border #1F2328; -@define-color wm_button_hover_border #5294E2; -@define-color wm_button_active_border #5294E2; -@define-color wm_icon_bg #939ca8; -@define-color wm_icon_unfocused_bg #686f78; -@define-color wm_icon_hover_bg #afb8c5; +@define-color wm_button_hover_border #262932; +@define-color wm_icon_bg #90939B; +@define-color wm_icon_unfocused_bg #666A74; +@define-color wm_icon_hover_bg #C4C7CC; @define-color wm_icon_active_bg #ffffff; -@define-color content_view_bg #383C45; +@define-color content_view_bg #404552; 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 7ca07dd..c6114a2 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 @@ -112,7 +112,7 @@ GtkFlowBox .grid-child { .popover.osd, .osd { color: #BAC3CF; border: none; - background-color: #2a2c33; + background-color: #353945; background-clip: padding-box; outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } @@ -245,17 +245,18 @@ GtkFlowBox .grid-child { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.4); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.4)); + background-color: transparent; } + .osd .entry.image, .osd .entry.image:hover { + color: inherit; } .osd .entry:focus { - color: #BAC3CF; - border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } GtkSearchEntry.entry { border-radius: 20px; } @@ -294,14 +295,16 @@ GtkSearchEntry.entry { .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; + border-color: #cfd6e6; + background-color: white; -gtk-image-effect: highlight; } .button:active, .button:checked { background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8f9aae; + background-color: #8f9aae; + border-color: transparent; background-color: #5294E2; transition-duration: 50ms; } .button:active { @@ -329,31 +332,31 @@ GtkSearchEntry.entry { 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; } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); + background-color: #353945; } .button.osd.image-button { padding: 10px; } .button.osd:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); - background-color: #2a2c33; } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); + background-color: #353945; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .button.osd:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } .osd .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -375,17 +378,17 @@ GtkSearchEntry.entry { .osd .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .osd .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } .osd .button.flat { border-color: transparent; background-color: transparent; @@ -394,12 +397,12 @@ GtkSearchEntry.entry { .osd .button.flat:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .osd .button.flat:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; @@ -531,13 +534,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8f9aae; + background-color: #8f9aae; + border-color: transparent; background-color: #5294E2; } .inline-toolbar GtkToolButton > .button:insensitive { color: rgba(92, 97, 108, 0.55); @@ -568,7 +573,15 @@ GtkSearchEntry.entry { GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .button:hover, .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .button:hover:dir(ltr) { - box-shadow: inset 1px 0 #5294E2, inset -1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); } + .inline-toolbar GtkToolButton > .button.flat:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active, + GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .button:active, .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .button:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked, + GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .button:checked, .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .button:checked:dir(ltr) { + box-shadow: none; } .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl), .header-bar .linked.stack-switcher > .button:dir(rtl), @@ -585,7 +598,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:first-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .button:first-child:hover, .linked > GtkComboBox:first-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover, .header-bar .linked.stack-switcher > .button:first-child:hover, .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { - box-shadow: inset -1px 0 #5294E2; } + box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); } + .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active, + .inline-toolbar GtkToolButton:first-child > .button.flat:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .button:first-child:active, .linked > GtkComboBox:first-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked, + .inline-toolbar GtkToolButton:first-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .button:first-child:checked, .linked > GtkComboBox:first-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } .osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button, .primary-toolbar .linked.stack-switcher > .button:last-child, @@ -597,7 +618,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:last-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .button:last-child:hover, .linked > GtkComboBox:last-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover, .header-bar .linked.stack-switcher > .button:last-child:hover, .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { - box-shadow: inset 1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); } + .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active, + .inline-toolbar GtkToolButton:last-child > .button.flat:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .button:last-child:active, .linked > GtkComboBox:last-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked, + .inline-toolbar GtkToolButton:last-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .button:last-child:checked, .linked > GtkComboBox:last-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl), .header-bar .linked.stack-switcher > .button:last-child:dir(rtl), @@ -615,6 +644,14 @@ GtkSearchEntry.entry { .header-bar .linked.stack-switcher > .button:only-child:hover, .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { box-shadow: none; } + .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active, + .inline-toolbar GtkToolButton:only-child > .button.flat:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .button:only-child:active, .linked > GtkComboBox:only-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked, + .inline-toolbar GtkToolButton:only-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .button:only-child:checked, .linked > GtkComboBox:only-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button, .linked.vertical > .button:hover, @@ -628,7 +665,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:hover, .linked.vertical > .button:hover, .linked.vertical > GtkComboBoxText > .button:hover, .linked.vertical > GtkComboBox > .button:hover { - box-shadow: inset 0 1px #5294E2, inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4), inset 0 1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:active, .linked.vertical > .button:active, + .linked.vertical > GtkComboBoxText > .button:active, + .linked.vertical > GtkComboBox > .button:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked, + .linked.vertical > GtkComboBoxText > .button:checked, + .linked.vertical > GtkComboBox > .button:checked { + box-shadow: none; } .linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, @@ -638,7 +681,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover, .linked.vertical > GtkComboBoxText:first-child > .button:hover, .linked.vertical > GtkComboBox:first-child > .button:hover { - box-shadow: inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active, + .linked.vertical > GtkComboBoxText:first-child > .button:active, + .linked.vertical > GtkComboBox:first-child > .button:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked, + .linked.vertical > GtkComboBoxText:first-child > .button:checked, + .linked.vertical > GtkComboBox:first-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, @@ -648,7 +697,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover, .linked.vertical > GtkComboBoxText:last-child > .button:hover, .linked.vertical > GtkComboBox:last-child > .button:hover { - box-shadow: inset 0 1px #5294E2; } + box-shadow: inset 0 1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active, + .linked.vertical > GtkComboBoxText:last-child > .button:active, + .linked.vertical > GtkComboBox:last-child > .button:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked, + .linked.vertical > GtkComboBoxText:last-child > .button:checked, + .linked.vertical > GtkComboBox:last-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, @@ -659,6 +714,12 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBoxText:only-child > .button:hover, .linked.vertical > GtkComboBox:only-child > .button:hover { box-shadow: none; } + .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active, + .linked.vertical > GtkComboBoxText:only-child > .button:active, + .linked.vertical > GtkComboBox:only-child > .button:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked, + .linked.vertical > GtkComboBoxText:only-child > .button:checked, + .linked.vertical > GtkComboBox:only-child > .button:checked { + box-shadow: none; } .menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, @@ -715,8 +776,6 @@ GtkSearchEntry.entry { border-style: none solid none none; } .spinbutton .button:first-child { color: red; } - .spinbutton .button:hover { - color: #5294E2; } .spinbutton .button:insensitive { color: rgba(92, 97, 108, 0.55); } .spinbutton .button:active { @@ -730,13 +789,15 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8f9aae; + background-color: #8f9aae; + border-color: transparent; background-color: #5294E2; } .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .spinbutton.vertical .button:first-child:insensitive, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive { color: rgba(92, 97, 108, 0.55); border-color: rgba(207, 214, 230, 0.55); @@ -751,13 +812,15 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8f9aae; + background-color: #8f9aae; + border-color: transparent; background-color: #5294E2; } .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .spinbutton.vertical .button:last-child:insensitive, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive { color: rgba(92, 97, 108, 0.55); border-color: rgba(207, 214, 230, 0.55); @@ -804,12 +867,13 @@ GtkComboBox { border-color: #cfd6e6; } GtkComboBox.combobox-entry .button:hover { background-color: #e0e4ef; - border-color: #5294E2; - box-shadow: -1px 0 #5294E2; } + border-color: #e0e4ef; } GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8f9aae; + background-color: #8f9aae; + border-color: transparent; background-color: #5294E2; } GtkComboBox.combobox-entry .button:insensitive { opacity: 0.5; } @@ -823,19 +887,19 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: 1px solid rgba(0, 0, 0, 0.6); + border: 1px solid rgba(0, 0, 0, 0.5); border-radius: 3px; - background-color: rgba(42, 44, 51, 0.9); } + background-color: rgba(53, 57, 69, 0.9); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; + background-color: #2f343f; box-shadow: none; border-width: 0 0 1px 0; border-style: solid; - border-image: linear-gradient(to bottom, #2f343b, #1f2227) 1 0 1 0; } + border-image: linear-gradient(to bottom, #2f343f, #20232b) 1 0 1 0; } .primary-toolbar:backdrop { - background-color: #32383f; } + background-color: #323843; } .inline-toolbar { background-color: #edeef0; @@ -863,16 +927,16 @@ GtkComboBox { border-width: 0 0 1px; border-style: solid; border-radius: 0; - border-color: #1f2227; + border-color: #262a33; color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; } + background-color: #2f343f; } .csd .header-bar { - background-color: #2f343b; } + background-color: #2f343f; } .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); - background-color: #32383f; } + background-color: #323843; } .csd .header-bar:backdrop { - background-color: #32383f; } + background-color: #323843; } .header-bar .title { padding: 0px 12px; } .header-bar .subtitle { @@ -943,28 +1007,28 @@ GtkComboBox { .maximized .header-bar, .maximized .header-bar:backdrop { border-radius: 0; } .maximized .header-bar { - background-color: #2f343b; } + background-color: #2f343f; } .maximized .header-bar:backdrop { - background-color: #32383f; } + background-color: #323843; } .titlebar { padding-left: 7px; padding-right: 7px; border-radius: 3px 3px 0 0; color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; - box-shadow: inset 0 1px #363c44; } + background-color: #2f343f; + box-shadow: inset 0 1px #363b48; } .csd .titlebar { - background-color: #2f343b; } + background-color: #2f343f; } .titlebar:backdrop { color: rgba(207, 218, 231, 0.5); - background-color: #32383f; } + background-color: #323843; } .csd .titlebar:backdrop { - background-color: #32383f; } + background-color: #323843; } .maximized .titlebar { - background-color: #2f343b; } + background-color: #2f343f; } .maximized .titlebar:backdrop { - background-color: #32383f; } + background-color: #323843; } .titlebar .titlebar, .titlebar .titlebar:backdrop { @@ -982,8 +1046,8 @@ GtkComboBox { .primary-toolbar .entry, .header-bar .entry { color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } .primary-toolbar .entry.image, .header-bar .entry.image, .primary-toolbar .entry.image:hover, .header-bar .entry.image:hover { color: inherit; } @@ -991,13 +1055,14 @@ GtkComboBox { opacity: 0.85; } .primary-toolbar .entry:focus, .header-bar .entry:focus { color: #ffffff; - border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); + background-clip: padding-box; } .primary-toolbar .entry:focus.image, .header-bar .entry:focus.image { color: #ffffff; } .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus { background-color: #ffffff; color: #5294E2; } @@ -1010,24 +1075,25 @@ GtkComboBox { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); outline-offset: -3px; - background-color: rgba(47, 52, 59, 0); - border-color: rgba(47, 52, 59, 0); } + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .primary-toolbar .button:backdrop, .header-bar .button:backdrop { opacity: 0.7; } .primary-toolbar .button:hover, .header-bar .button:hover { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: #1d2024; - background-color: rgba(40, 44, 50, 0.9); } + border-color: rgba(21, 23, 28, 0.4); + background-color: rgba(95, 105, 127, 0.4); } .primary-toolbar .button:active, .header-bar .button:active, .primary-toolbar .button:checked, .header-bar .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; - background-color: #5294E2; } + border-color: transparent; + background-color: #5294E2; + background-clip: padding-box; } .primary-toolbar .button:insensitive, .header-bar .button:insensitive { color: rgba(207, 218, 231, 0.35); - background-color: rgba(47, 52, 59, 0); - border-color: rgba(47, 52, 59, 0); } + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .primary-toolbar .button:insensitive > GtkLabel, .header-bar .button:insensitive > GtkLabel { color: inherit; } .primary-toolbar .button:insensitive:active, .header-bar .button:insensitive:active, .primary-toolbar .button:insensitive:checked, .header-bar .button:insensitive:checked { @@ -1047,12 +1113,12 @@ GtkComboBox { .primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: #1d2024; - background-color: rgba(40, 44, 50, 0.9); } + border-color: rgba(21, 23, 28, 0.4); + background-color: rgba(95, 105, 127, 0.4); } .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { - border-color: #5294E2; } + background-color: rgba(134, 144, 165, 0.4); } .primary-toolbar .linked.stack-switcher > .button:active, .header-bar .linked.stack-switcher > .button:active, .primary-toolbar .linked.stack-switcher > .button:checked, @@ -1060,8 +1126,52 @@ GtkComboBox { .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } + .primary-toolbar .linked.stack-switcher > .button:insensitive, + .header-bar .linked.stack-switcher > .button:insensitive, + .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive { + color: rgba(207, 218, 231, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:hover, + .header-bar .linked.stack-switcher > .button:hover, + .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:first-child:hover, + .header-bar .linked.stack-switcher > .button:first-child:hover, + .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:last-child:hover, + .header-bar .linked.stack-switcher > .button:last-child:hover, + .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:hover, + .header-bar .linked.stack-switcher > .button:only-child:hover, + .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked { + box-shadow: none; } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; @@ -1155,24 +1265,25 @@ GtkComboBox { .primary-toolbar GtkComboBox.combobox-entry .button, .header-bar GtkComboBox.combobox-entry .button { color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } .primary-toolbar GtkComboBox.combobox-entry .button.image, .header-bar GtkComboBox.combobox-entry .button.image, .primary-toolbar GtkComboBox.combobox-entry .button.image:hover, .header-bar GtkComboBox.combobox-entry .button.image:hover { color: inherit; } .primary-toolbar GtkComboBox.combobox-entry .button:hover, .header-bar GtkComboBox.combobox-entry .button:hover { color: #ffffff; - border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); + box-shadow: none; } .primary-toolbar GtkComboBox.combobox-entry .button:insensitive, .header-bar GtkComboBox.combobox-entry .button:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } .primary-toolbar GtkProgressBar.trough, .header-bar GtkProgressBar.trough, .primary-toolbar .level-bar.trough, .header-bar .level-bar.trough { - background-color: rgba(207, 218, 231, 0.15); } + background-color: rgba(21, 23, 28, 0.4); } .primary-toolbar GtkProgressBar:backdrop, .header-bar GtkProgressBar:backdrop { opacity: 0.75; } @@ -1181,15 +1292,22 @@ GtkComboBox { opacity: 0.75; } .primary-toolbar .scale.trough, .header-bar .scale.trough { - background-image: linear-gradient(to bottom, rgba(207, 218, 231, 0.15)); } + background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.4)); } .primary-toolbar .scale.trough:insensitive, .header-bar .scale.trough:insensitive { - background-image: linear-gradient(to bottom, rgba(207, 218, 231, 0.1)); } + background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.3)); } .primary-toolbar .scale.slider, .header-bar .scale.slider { - background-image: linear-gradient(to bottom, #262a30); } + background-image: linear-gradient(to bottom, #454c5c); + border-color: rgba(21, 23, 28, 0.7); } + .primary-toolbar .scale.slider:hover, .header-bar .scale.slider:hover { + background-image: linear-gradient(to bottom, #50586b); + border-color: rgba(21, 23, 28, 0.7); } + .primary-toolbar .scale.slider:active, .header-bar .scale.slider:active { + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .primary-toolbar .scale.slider:insensitive, .header-bar .scale.slider:insensitive { - background-image: linear-gradient(to bottom, #2d3138); - border-color: #3d5a7e; } + background-image: linear-gradient(to bottom, #3e4553); + border-color: rgba(21, 23, 28, 0.7); } /************ * Pathbars * @@ -1289,10 +1407,10 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar { -GtkWidget-window-dragging: true; padding: 0px; - background-color: #2f343b; + background-color: #2f343f; color: rgba(207, 218, 231, 0.8); } .menubar:backdrop { - background-color: #32383f; } + background-color: #323843; } .menubar > .menuitem { padding: 6px 8px; border: solid transparent; @@ -1775,21 +1893,21 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { margin: 3px; } .scale.slider { background-clip: border-box; - background-image: linear-gradient(to bottom, #ffffff); - border: 1px solid #5294E2; + background-image: linear-gradient(to bottom, #fbfbfc); + border: 1px solid rgba(123, 142, 186, 0.5); border-radius: 50%; box-shadow: none; } .scale.slider:hover { - background-image: linear-gradient(to bottom, #5294E2); - border-color: #5294E2; } + background-image: linear-gradient(to bottom, white); + border-color: rgba(123, 142, 186, 0.5); } .scale.slider:insensitive { background-image: linear-gradient(to bottom, #fbfbfb); - border-color: #9bc0eb; } + border-color: rgba(123, 142, 186, 0.3); } .scale.slider:active { - background-image: linear-gradient(to bottom, #2679db); - border-color: #2679db; } + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .osd .scale.slider { - background-image: linear-gradient(to bottom, #2a2c33); + background-image: linear-gradient(to bottom, #353945); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1819,7 +1937,7 @@ 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, #3a3e46); + background-image: linear-gradient(to bottom, #454a59); outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; @@ -1966,18 +2084,18 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame { padding: 10px; color: #BAC3CF; - background-color: #3c4049; + background-color: #353945; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: #25272d; } + border-color: #1f2128; } .app-notification .button, .app-notification.frame .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } @@ -1985,8 +2103,8 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { @@ -1996,9 +2114,9 @@ GtkScrolledWindow GtkViewport.frame { background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } /************* * Expanders * @@ -2030,8 +2148,9 @@ GtkCalendar { border-radius: 0; } GtkCalendar.button, GtkCalendar.button:focus { color: rgba(92, 97, 108, 0.45); - box-shadow: none; - border: none; } + border-color: transparent; + background-color: transparent; + background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #5c616c; } GtkCalendar.highlight { @@ -2046,8 +2165,8 @@ GtkCalendar { .message-dialog { -GtkDialog-button-spacing: 0; } .message-dialog .titlebar { - background-color: #2f343b; - border-bottom: 1px solid #1f2227; } + background-color: #2f343f; + border-bottom: 1px solid #20232b; } .message-dialog.csd.background { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; @@ -2164,7 +2283,7 @@ GtkInfoBar { color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: #2a2c33; + background-color: #353945; background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2233,8 +2352,8 @@ GtkColorButton.button { .scale-popup .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } GtkVolumeButton.button { padding: 8px; } @@ -2245,11 +2364,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px #1f2227, 0 4px 8px 1px rgba(0, 0, 0, 0.25); + box-shadow: 0 0 0 1px #22262d, 0 8px 8px 0 rgba(0, 0, 0, 0.2); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px #1f2227, 0 4px 5px 2px rgba(0, 0, 0, 0.25); } + box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { @@ -2267,7 +2386,7 @@ GtkVolumeButton.button { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 59, 0); + background-color: rgba(47, 52, 63, 0); border-width: 0; color: transparent; background-position: center; @@ -2643,7 +2762,7 @@ PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top, Panth TerminalWindow .notebook.header.top, PantheonTerminalPantheonTerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #1f2227, inset 0 -1px #dbdfe3; } + box-shadow: inset 0 1px #262a33, inset 0 -1px #dbdfe3; } GtkHTML { background-color: #ffffff; @@ -2700,18 +2819,36 @@ NemoWindow GtkSeparator.separator.horizontal, NemoWindow GtkPlacesSidebar.sideba NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: #1d2024; - background-color: rgba(40, 44, 50, 0.9); } + border-color: rgba(21, 23, 28, 0.4); + background-color: rgba(95, 105, 127, 0.4); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { - border-color: #5294E2; } + background-color: rgba(134, 144, 165, 0.4); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive { + color: rgba(207, 218, 231, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .gedit-headerbar-paned { - color: #1f2227; } + color: #262a33; } .open-document-selector-listbox-row { border-bottom: 1px solid #e7e9ec; @@ -2786,8 +2923,8 @@ GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr), GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { padding: 0 10px; color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover, @@ -2795,25 +2932,19 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { - color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); - background-color: transparent; - border-color: #5294E2; } - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, - GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { - color: inherit; } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { color: #ffffff; - border-color: #5294E2; + border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; @@ -2853,7 +2984,7 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #2a2c33; } + background-color: #353945; } GtkBox.gb-command-bar-box GtkLabel { color: #BAC3CF; } @@ -2862,7 +2993,7 @@ GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; color: #BAC3CF; background-image: none; - background-color: #2a2c33; + background-color: #353945; padding: 6px 6px 6px 6px; border: none; } @@ -2945,7 +3076,7 @@ PanelWidget, PanelAppletFrame, PanelApplet { color: #BAC3CF; - background-image: linear-gradient(to bottom, #1f2125); } + background-image: linear-gradient(to bottom, #2b2e37); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2989,18 +3120,18 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: #1f2125; } + background-color: #2b2e37; } .xfce4-panel.panel .button.flat { color: #BAC3CF; - background-color: rgba(31, 33, 37, 0); + background-color: rgba(43, 46, 55, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: #363941; } + background-color: #414654; } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: #0f1012; } + background-color: #1b1d23; } .floating-bar { background-color: #5294E2; @@ -3043,18 +3174,18 @@ MarlinViewWindow *:selected:focus { .marlin-pathbar.pathbar { border-radius: 3px; color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } .marlin-pathbar.pathbar.image, .marlin-pathbar.pathbar.image:hover { color: inherit; } .marlin-pathbar.pathbar:focus { color: #ffffff; - border-color: #5294E2; + border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked { color: #5294E2; } @@ -3168,24 +3299,24 @@ UnityDecoration { -UnityDecoration-title-fade: 35px; -UnityDecoration-title-alignment: 0.0; } UnityDecoration.top { - border: 1px solid #1f2227; + border: 1px solid #20232b; border-bottom-width: 0; border-radius: 4px 4px 0 0; padding: 1px 6px 0 6px; - background-image: linear-gradient(to bottom, #2f343b); + background-image: linear-gradient(to bottom, #2f343f); color: rgba(207, 218, 231, 0.8); - box-shadow: inset 0 1px #363c44; } + box-shadow: inset 0 1px #363b48; } UnityDecoration.top:backdrop { border-bottom-width: 0; - background-image: linear-gradient(to bottom, #32383f); + background-image: linear-gradient(to bottom, #323843); color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { - background-image: linear-gradient(to bottom, #1f2227); } + background-image: linear-gradient(to bottom, #20232b); } UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #1f2125); + background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } @@ -3352,10 +3483,10 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: #1f2125; + background-color: #2b2e37; color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px #0f1012; + box-shadow: inset 0 -1px #1b1d23; /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { @@ -3395,12 +3526,14 @@ GtkListBox .h4 { #content_frame .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: #8f9aae; + background-color: #8f9aae; + border-color: transparent; background-color: #5294E2; } #content_frame .button:insensitive { color: rgba(92, 97, 108, 0.55); @@ -3414,32 +3547,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: #2a2c33; + background-color: #353945; 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; } + box-shadow: inset 0 1px #353945; } #buttonbox_frame .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } #buttonbox_frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } #login_window #user_combobox { color: #5c616c; @@ -3499,7 +3632,7 @@ GtkListBox .h4 { font: bold; } .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator { - color: #1f2227; } + color: #262a33; } NemoWindow GtkEventBox { background-color: #F5F6F7; } @@ -3535,7 +3668,7 @@ NautilusWindow MarlinPlacesSidebar, NemoWindow .sidebar, NemoWindow MarlinPlacesSidebar, MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, @@ -3666,16 +3799,16 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .sidebar { background-color: transparent; } @@ -3692,7 +3825,7 @@ GtkFileChooserDialog .dialog-vbox > .frame { GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: #2c2f35; } + border-color: #2a2d37; } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, @@ -3703,20 +3836,20 @@ GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: #3c4049; } + background-color: #353945; } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop { - background-color: #1f2227; } + background-color: #262a33; } .gedit-bottom-panel-paned { background-color: #ffffff; } .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .maximized .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .gedit-document-panel .list-row { color: #BAC3CF; } .gedit-document-panel .list-row { @@ -3743,9 +3876,9 @@ GeditWindow.background.csd { color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.trough { background-color: transparent; border-color: transparent; } @@ -3770,7 +3903,7 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: #2c2f35; } + border-color: #252831; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #BAC3CF; } @@ -3786,14 +3919,14 @@ GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } 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 { @@ -3803,26 +3936,29 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.4); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.4)); + background-color: transparent; } + GtkFileChooserDialog .action-bar.frame .image.entry, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry, GtkFileChooserDialog .action-bar.frame .image.entry:hover, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry:hover { + color: inherit; } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #BAC3CF; - border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @@ -3852,26 +3988,19 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { @define-color placeholder_text_color #A8A8A8; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); -@define-color wm_bg #2f343b; -@define-color wm_bg_unfocused #32383f; -@define-color wm_highlight #363c44; +@define-color wm_bg #2f343f; +@define-color wm_bg_unfocused #323843; +@define-color wm_highlight #363b48; @define-color wm_shadow alpha(black, 0.35); -@define-color wm_button_close_bg #e45e65; -@define-color wm_button_close_hover_bg #f48085; -@define-color wm_button_close_active_bg #e6262f; -@define-color wm_icon_close_bg #ffffff; -@define-color wm_icon_close_hover_bg #ffffff; -@define-color wm_icon_close_active_bg #ffffff; -@define-color wm_button_bg #272c32; -@define-color wm_button_unfocused_bg #2a3035; -@define-color wm_button_hover_bg #272c32; +@define-color wm_button_close_bg #cc575d; +@define-color wm_button_close_hover_bg #d7787d; +@define-color wm_button_close_active_bg #be3841; +@define-color wm_icon_close_bg #2f343f; +@define-color wm_button_hover_bg #454C5C; @define-color wm_button_active_bg #5294E2; -@define-color wm_button_border #191C21; -@define-color wm_button_unfocused_border #1F2328; -@define-color wm_button_hover_border #5294E2; -@define-color wm_button_active_border #5294E2; -@define-color wm_icon_bg #939ca8; -@define-color wm_icon_unfocused_bg #686f78; -@define-color wm_icon_hover_bg #afb8c5; +@define-color wm_button_hover_border #262932; +@define-color wm_icon_bg #90939B; +@define-color wm_icon_unfocused_bg #666A74; +@define-color wm_icon_hover_bg #C4C7CC; @define-color wm_icon_active_bg #ffffff; @define-color content_view_bg #ffffff; 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 3f3b35b..48870e6 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -112,7 +112,7 @@ GtkFlowBox .grid-child { .popover.osd, .osd { color: #BAC3CF; border: none; - background-color: #2a2c33; + background-color: #353945; background-clip: padding-box; outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } @@ -245,17 +245,18 @@ GtkFlowBox .grid-child { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.4); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.4)); + background-color: transparent; } + .osd .entry.image, .osd .entry.image:hover { + color: inherit; } .osd .entry:focus { - color: #BAC3CF; + color: #ffffff; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } GtkSearchEntry.entry { border-radius: 20px; } @@ -294,13 +295,15 @@ GtkSearchEntry.entry { .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; + border-color: #cfd6e6; + background-color: white; -gtk-image-effect: highlight; } .button:active, .button:checked { background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); + border-color: #8f9aae; + background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; transition-duration: 50ms; } @@ -329,31 +332,31 @@ GtkSearchEntry.entry { 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; } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); + background-color: #353945; } .button.osd.image-button { padding: 10px; } .button.osd:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); - background-color: #2a2c33; } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); + background-color: #353945; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .button.osd:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } .osd .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -375,17 +378,17 @@ GtkSearchEntry.entry { .osd .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .osd .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } .osd .button.flat { border-color: transparent; background-color: transparent; @@ -394,12 +397,12 @@ GtkSearchEntry.entry { .osd .button.flat:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .osd .button.flat:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; @@ -531,12 +534,14 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); + border-color: #8f9aae; + background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } .inline-toolbar GtkToolButton > .button:insensitive { @@ -568,7 +573,15 @@ GtkSearchEntry.entry { GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .button:hover, .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .button:hover:dir(ltr) { - box-shadow: inset 1px 0 #5294E2, inset -1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); } + .inline-toolbar GtkToolButton > .button.flat:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active, + GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .button:active, .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .button:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked, + GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .button:checked, .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .button:checked:dir(ltr) { + box-shadow: none; } .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl), .header-bar .linked.stack-switcher > .button:dir(rtl), @@ -585,7 +598,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:first-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .button:first-child:hover, .linked > GtkComboBox:first-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover, .header-bar .linked.stack-switcher > .button:first-child:hover, .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { - box-shadow: inset -1px 0 #5294E2; } + box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); } + .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active, + .inline-toolbar GtkToolButton:first-child > .button.flat:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .button:first-child:active, .linked > GtkComboBox:first-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked, + .inline-toolbar GtkToolButton:first-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .button:first-child:checked, .linked > GtkComboBox:first-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } .osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button, .primary-toolbar .linked.stack-switcher > .button:last-child, @@ -597,7 +618,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:last-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .button:last-child:hover, .linked > GtkComboBox:last-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover, .header-bar .linked.stack-switcher > .button:last-child:hover, .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { - box-shadow: inset 1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); } + .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active, + .inline-toolbar GtkToolButton:last-child > .button.flat:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .button:last-child:active, .linked > GtkComboBox:last-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked, + .inline-toolbar GtkToolButton:last-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .button:last-child:checked, .linked > GtkComboBox:last-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl), .header-bar .linked.stack-switcher > .button:last-child:dir(rtl), @@ -615,6 +644,14 @@ GtkSearchEntry.entry { .header-bar .linked.stack-switcher > .button:only-child:hover, .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { box-shadow: none; } + .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active, + .inline-toolbar GtkToolButton:only-child > .button.flat:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .button:only-child:active, .linked > GtkComboBox:only-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked, + .inline-toolbar GtkToolButton:only-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .button:only-child:checked, .linked > GtkComboBox:only-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button, .linked.vertical > .button:hover, @@ -628,7 +665,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:hover, .linked.vertical > .button:hover, .linked.vertical > GtkComboBoxText > .button:hover, .linked.vertical > GtkComboBox > .button:hover { - box-shadow: inset 0 1px #5294E2, inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4), inset 0 1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:active, .linked.vertical > .button:active, + .linked.vertical > GtkComboBoxText > .button:active, + .linked.vertical > GtkComboBox > .button:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked, + .linked.vertical > GtkComboBoxText > .button:checked, + .linked.vertical > GtkComboBox > .button:checked { + box-shadow: none; } .linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, @@ -638,7 +681,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover, .linked.vertical > GtkComboBoxText:first-child > .button:hover, .linked.vertical > GtkComboBox:first-child > .button:hover { - box-shadow: inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active, + .linked.vertical > GtkComboBoxText:first-child > .button:active, + .linked.vertical > GtkComboBox:first-child > .button:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked, + .linked.vertical > GtkComboBoxText:first-child > .button:checked, + .linked.vertical > GtkComboBox:first-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, @@ -648,7 +697,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover, .linked.vertical > GtkComboBoxText:last-child > .button:hover, .linked.vertical > GtkComboBox:last-child > .button:hover { - box-shadow: inset 0 1px #5294E2; } + box-shadow: inset 0 1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active, + .linked.vertical > GtkComboBoxText:last-child > .button:active, + .linked.vertical > GtkComboBox:last-child > .button:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked, + .linked.vertical > GtkComboBoxText:last-child > .button:checked, + .linked.vertical > GtkComboBox:last-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, @@ -659,6 +714,12 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBoxText:only-child > .button:hover, .linked.vertical > GtkComboBox:only-child > .button:hover { box-shadow: none; } + .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active, + .linked.vertical > GtkComboBoxText:only-child > .button:active, + .linked.vertical > GtkComboBox:only-child > .button:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked, + .linked.vertical > GtkComboBoxText:only-child > .button:checked, + .linked.vertical > GtkComboBox:only-child > .button:checked { + box-shadow: none; } .menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, @@ -715,8 +776,6 @@ GtkSearchEntry.entry { border-style: none solid none none; } .spinbutton .button:first-child { color: red; } - .spinbutton .button:hover { - color: #5294E2; } .spinbutton .button:insensitive { color: rgba(92, 97, 108, 0.55); } .spinbutton .button:active { @@ -730,13 +789,15 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); + border-color: #8f9aae; + background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .spinbutton.vertical .button:first-child:insensitive, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive { color: rgba(92, 97, 108, 0.55); border-color: rgba(207, 214, 230, 0.55); @@ -751,13 +812,15 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); + border-color: #8f9aae; + background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .spinbutton.vertical .button:last-child:insensitive, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive { color: rgba(92, 97, 108, 0.55); border-color: rgba(207, 214, 230, 0.55); @@ -804,11 +867,12 @@ GtkComboBox { border-color: #cfd6e6; } GtkComboBox.combobox-entry .button:hover { background-color: #e0e4ef; - border-color: #5294E2; - box-shadow: -1px 0 #5294E2; } + border-color: #e0e4ef; } GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); + border-color: #8f9aae; + background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } GtkComboBox.combobox-entry .button:insensitive { @@ -823,9 +887,9 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: 1px solid rgba(0, 0, 0, 0.6); + border: 1px solid rgba(0, 0, 0, 0.5); border-radius: 3px; - background-color: rgba(42, 44, 51, 0.9); } + background-color: rgba(53, 57, 69, 0.9); } .primary-toolbar { color: rgba(82, 93, 118, 0.8); @@ -992,12 +1056,13 @@ GtkComboBox { .primary-toolbar .entry:focus, .header-bar .entry:focus { color: #ffffff; border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-image: linear-gradient(to bottom, #5294E2); + background-clip: border-box; } .primary-toolbar .entry:focus.image, .header-bar .entry:focus.image { color: #ffffff; } .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive { color: rgba(82, 93, 118, 0.35); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus { background-color: #ffffff; color: #5294E2; } @@ -1023,7 +1088,8 @@ GtkComboBox { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-color: #5294E2; } + background-color: #5294E2; + background-clip: border-box; } .primary-toolbar .button:insensitive, .header-bar .button:insensitive { color: rgba(82, 93, 118, 0.35); background-color: rgba(231, 232, 235, 0); @@ -1052,7 +1118,7 @@ GtkComboBox { .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { - border-color: #5294E2; } + background-color: rgba(255, 255, 255, 0.9); } .primary-toolbar .linked.stack-switcher > .button:active, .header-bar .linked.stack-switcher > .button:active, .primary-toolbar .linked.stack-switcher > .button:checked, @@ -1062,6 +1128,50 @@ GtkComboBox { outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } + .primary-toolbar .linked.stack-switcher > .button:insensitive, + .header-bar .linked.stack-switcher > .button:insensitive, + .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive { + color: rgba(82, 93, 118, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:hover, + .header-bar .linked.stack-switcher > .button:hover, + .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:first-child:hover, + .header-bar .linked.stack-switcher > .button:first-child:hover, + .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:last-child:hover, + .header-bar .linked.stack-switcher > .button:last-child:hover, + .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:hover, + .header-bar .linked.stack-switcher > .button:only-child:hover, + .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked { + box-shadow: none; } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; @@ -1163,10 +1273,11 @@ GtkComboBox { .primary-toolbar GtkComboBox.combobox-entry .button:hover, .header-bar GtkComboBox.combobox-entry .button:hover { color: #ffffff; border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-image: linear-gradient(to bottom, #5294E2); + box-shadow: none; } .primary-toolbar GtkComboBox.combobox-entry .button:insensitive, .header-bar GtkComboBox.combobox-entry .button:insensitive { color: rgba(82, 93, 118, 0.35); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } @@ -1186,9 +1297,17 @@ GtkComboBox { background-image: linear-gradient(to bottom, rgba(82, 93, 118, 0.1)); } .primary-toolbar .scale.slider, .header-bar .scale.slider { - background-image: linear-gradient(to bottom, #fdfdfd); } + background-image: linear-gradient(to bottom, #fbfbfc); + border-color: rgba(82, 93, 118, 0.3); } + .primary-toolbar .scale.slider:hover, .header-bar .scale.slider:hover { + background-image: linear-gradient(to bottom, white); + border-color: rgba(82, 93, 118, 0.3); } + .primary-toolbar .scale.slider:active, .header-bar .scale.slider:active { + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .primary-toolbar .scale.slider:insensitive, .header-bar .scale.slider:insensitive { - background-image: linear-gradient(to bottom, #f1f1f3); } + background-image: linear-gradient(to bottom, #f5f5f7); + border-color: rgba(82, 93, 118, 0.3); } /************ * Pathbars * @@ -1774,21 +1893,21 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { margin: 3px; } .scale.slider { background-clip: border-box; - background-image: linear-gradient(to bottom, #ffffff); - border: 1px solid #5294E2; + background-image: linear-gradient(to bottom, #fbfbfc); + border: 1px solid rgba(123, 142, 186, 0.5); border-radius: 50%; box-shadow: none; } .scale.slider:hover { - background-image: linear-gradient(to bottom, #5294E2); - border-color: #5294E2; } + background-image: linear-gradient(to bottom, white); + border-color: rgba(123, 142, 186, 0.5); } .scale.slider:insensitive { background-image: linear-gradient(to bottom, #fbfbfb); - border-color: #9bc0eb; } + border-color: rgba(123, 142, 186, 0.3); } .scale.slider:active { - background-image: linear-gradient(to bottom, #2679db); - border-color: #2679db; } + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .osd .scale.slider { - background-image: linear-gradient(to bottom, #2a2c33); + background-image: linear-gradient(to bottom, #353945); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1818,7 +1937,7 @@ 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, #3a3e46); + background-image: linear-gradient(to bottom, #454a59); outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; @@ -1965,18 +2084,18 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame { padding: 10px; color: #BAC3CF; - background-color: #3c4049; + background-color: #353945; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: #25272d; } + border-color: #1f2128; } .app-notification .button, .app-notification.frame .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } @@ -1984,8 +2103,8 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { @@ -1995,9 +2114,9 @@ GtkScrolledWindow GtkViewport.frame { background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } /************* * Expanders * @@ -2029,8 +2148,9 @@ GtkCalendar { border-radius: 0; } GtkCalendar.button, GtkCalendar.button:focus { color: rgba(92, 97, 108, 0.45); - box-shadow: none; - border: none; } + border-color: transparent; + background-color: transparent; + background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #5c616c; } GtkCalendar.highlight { @@ -2163,7 +2283,7 @@ GtkInfoBar { color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: #2a2c33; + background-color: #353945; background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2232,8 +2352,8 @@ GtkColorButton.button { .scale-popup .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } GtkVolumeButton.button { padding: 8px; } @@ -2244,11 +2364,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 4px 4px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 4px 8px 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 8px 8px 0 rgba(0, 0, 0, 0.2); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 4px 5px 2px rgba(0, 0, 0, 0.1); } + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { @@ -2702,12 +2822,30 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { border-color: rgba(82, 93, 118, 0.1); background-color: rgba(251, 251, 252, 0.9); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { - border-color: #5294E2; } + background-color: rgba(255, 255, 255, 0.9); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive { + color: rgba(82, 93, 118, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .gedit-headerbar-paned { color: #d4d5db; } @@ -2794,15 +2932,9 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { - color: rgba(82, 93, 118, 0.8); - border-color: rgba(82, 93, 118, 0.1); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); - background-color: transparent; - border-color: #5294E2; } - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, - GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { - color: inherit; } + color: #ffffff; + border-color: #5294E2; + background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { @@ -2812,7 +2944,7 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { color: rgba(82, 93, 118, 0.35); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; @@ -2852,7 +2984,7 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #2a2c33; } + background-color: #353945; } GtkBox.gb-command-bar-box GtkLabel { color: #BAC3CF; } @@ -2861,7 +2993,7 @@ GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; color: #BAC3CF; background-image: none; - background-color: #2a2c33; + background-color: #353945; padding: 6px 6px 6px 6px; border: none; } @@ -2944,7 +3076,7 @@ PanelWidget, PanelAppletFrame, PanelApplet { color: #BAC3CF; - background-image: linear-gradient(to bottom, #1f2125); } + background-image: linear-gradient(to bottom, #2b2e37); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2988,18 +3120,18 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: #1f2125; } + background-color: #2b2e37; } .xfce4-panel.panel .button.flat { color: #BAC3CF; - background-color: rgba(31, 33, 37, 0); + background-color: rgba(43, 46, 55, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: #363941; } + background-color: #414654; } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: #0f1012; } + background-color: #1b1d23; } .floating-bar { background-color: #5294E2; @@ -3053,7 +3185,7 @@ MarlinViewWindow *:selected:focus { background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:insensitive { color: rgba(82, 93, 118, 0.35); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked { color: #5294E2; } @@ -3184,7 +3316,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #1f2125); + background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } @@ -3351,10 +3483,10 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: #1f2125; + background-color: #2b2e37; color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px #0f1012; + box-shadow: inset 0 -1px #1b1d23; /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { @@ -3394,11 +3526,13 @@ GtkListBox .h4 { #content_frame .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); + border-color: #8f9aae; + background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } #content_frame .button:insensitive { @@ -3413,32 +3547,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: #2a2c33; + background-color: #353945; 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; } + box-shadow: inset 0 1px #353945; } #buttonbox_frame .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } #buttonbox_frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } #login_window #user_combobox { color: #5c616c; @@ -3534,7 +3668,7 @@ NautilusWindow MarlinPlacesSidebar, NemoWindow .sidebar, NemoWindow MarlinPlacesSidebar, MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, @@ -3665,16 +3799,16 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .sidebar { background-color: transparent; } @@ -3691,7 +3825,7 @@ GtkFileChooserDialog .dialog-vbox > .frame { GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: #2c2f35; } + border-color: #2a2d37; } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, @@ -3702,7 +3836,7 @@ GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: #3c4049; } + background-color: #353945; } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, @@ -3713,9 +3847,9 @@ GeditWindow.background.csd { background-color: #ffffff; } .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .maximized .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .gedit-document-panel .list-row { color: #BAC3CF; } .gedit-document-panel .list-row { @@ -3742,9 +3876,9 @@ GeditWindow.background.csd { color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.trough { background-color: transparent; border-color: transparent; } @@ -3769,7 +3903,7 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: #2c2f35; } + border-color: #252831; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #BAC3CF; } @@ -3785,14 +3919,14 @@ GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } 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 { @@ -3802,26 +3936,29 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.4); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.4)); + background-color: transparent; } + GtkFileChooserDialog .action-bar.frame .image.entry, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry, GtkFileChooserDialog .action-bar.frame .image.entry:hover, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry:hover { + color: inherit; } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #BAC3CF; + color: #ffffff; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @@ -3855,22 +3992,15 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { @define-color wm_bg_unfocused #eff0f2; @define-color wm_highlight #eff0f2; @define-color wm_shadow alpha(black, 0.35); -@define-color wm_button_close_bg #f37076; -@define-color wm_button_close_hover_bg #f79da1; -@define-color wm_button_close_active_bg #ef4048; -@define-color wm_icon_close_bg #ffffff; -@define-color wm_icon_close_hover_bg #ffffff; -@define-color wm_icon_close_active_bg #ffffff; -@define-color wm_button_bg #fdfdfd; -@define-color wm_button_unfocused_bg #f6f7f8; +@define-color wm_button_close_bg #f46067; +@define-color wm_button_close_hover_bg #f68086; +@define-color wm_button_close_active_bg #f13039; +@define-color wm_icon_close_bg #F8F8F9; @define-color wm_button_hover_bg #fdfdfd; @define-color wm_button_active_bg #5294E2; -@define-color wm_button_border #d8dae0; -@define-color wm_button_unfocused_border #dddee2; -@define-color wm_button_hover_border #5294E2; -@define-color wm_button_active_border #5294E2; -@define-color wm_icon_bg #8d93a4; -@define-color wm_icon_unfocused_bg #b8bcc7; -@define-color wm_icon_hover_bg #70788d; +@define-color wm_button_hover_border #D1D3DA; +@define-color wm_icon_bg #90949E; +@define-color wm_icon_unfocused_bg #B6B8C0; +@define-color wm_icon_hover_bg #7A7F8B; @define-color wm_icon_active_bg #ffffff; @define-color content_view_bg #ffffff; diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index abe4ce9..c9a2b74 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -112,7 +112,7 @@ GtkFlowBox .grid-child { .popover.osd, .osd { color: #BAC3CF; border: none; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); background-clip: padding-box; outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } @@ -245,17 +245,18 @@ GtkFlowBox .grid-child { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.35); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.35)); + background-color: transparent; } + .osd .entry.image, .osd .entry.image:hover { + color: inherit; } .osd .entry:focus { - color: #BAC3CF; + color: #ffffff; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } GtkSearchEntry.entry { border-radius: 20px; } @@ -294,13 +295,15 @@ GtkSearchEntry.entry { .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; + border-color: #cfd6e6; + background-color: white; -gtk-image-effect: highlight; } .button:active, .button:checked { background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); + border-color: #8f9aae; + background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; transition-duration: 50ms; } @@ -329,31 +332,31 @@ GtkSearchEntry.entry { 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); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); + background-color: rgba(53, 57, 69, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); - background-color: rgba(42, 44, 51, 0.95); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); + background-color: rgba(53, 57, 69, 0.95); } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .button.osd:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .osd .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -375,17 +378,17 @@ GtkSearchEntry.entry { .osd .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .osd .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .osd .button.flat { border-color: transparent; background-color: transparent; @@ -394,12 +397,12 @@ GtkSearchEntry.entry { .osd .button.flat:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .osd .button.flat:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; @@ -531,12 +534,14 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); + border-color: #8f9aae; + background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } .inline-toolbar GtkToolButton > .button:insensitive { @@ -568,7 +573,15 @@ GtkSearchEntry.entry { GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .button:hover, .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .button:hover:dir(ltr) { - box-shadow: inset 1px 0 #5294E2, inset -1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); } + .inline-toolbar GtkToolButton > .button.flat:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active, + GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .button:active, .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .button:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked, + GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .button:checked, .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .button:checked:dir(ltr) { + box-shadow: none; } .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl), .header-bar .linked.stack-switcher > .button:dir(rtl), @@ -585,7 +598,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:first-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .button:first-child:hover, .linked > GtkComboBox:first-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover, .header-bar .linked.stack-switcher > .button:first-child:hover, .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { - box-shadow: inset -1px 0 #5294E2; } + box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); } + .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active, + .inline-toolbar GtkToolButton:first-child > .button.flat:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .button:first-child:active, .linked > GtkComboBox:first-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked, + .inline-toolbar GtkToolButton:first-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .button:first-child:checked, .linked > GtkComboBox:first-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } .osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button, .primary-toolbar .linked.stack-switcher > .button:last-child, @@ -597,7 +618,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:last-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .button:last-child:hover, .linked > GtkComboBox:last-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover, .header-bar .linked.stack-switcher > .button:last-child:hover, .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { - box-shadow: inset 1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); } + .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active, + .inline-toolbar GtkToolButton:last-child > .button.flat:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .button:last-child:active, .linked > GtkComboBox:last-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked, + .inline-toolbar GtkToolButton:last-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .button:last-child:checked, .linked > GtkComboBox:last-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl), .header-bar .linked.stack-switcher > .button:last-child:dir(rtl), @@ -615,6 +644,14 @@ GtkSearchEntry.entry { .header-bar .linked.stack-switcher > .button:only-child:hover, .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { box-shadow: none; } + .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active, + .inline-toolbar GtkToolButton:only-child > .button.flat:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .button:only-child:active, .linked > GtkComboBox:only-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked, + .inline-toolbar GtkToolButton:only-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .button:only-child:checked, .linked > GtkComboBox:only-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button, .linked.vertical > .button:hover, @@ -628,7 +665,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:hover, .linked.vertical > .button:hover, .linked.vertical > GtkComboBoxText > .button:hover, .linked.vertical > GtkComboBox > .button:hover { - box-shadow: inset 0 1px #5294E2, inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4), inset 0 1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:active, .linked.vertical > .button:active, + .linked.vertical > GtkComboBoxText > .button:active, + .linked.vertical > GtkComboBox > .button:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked, + .linked.vertical > GtkComboBoxText > .button:checked, + .linked.vertical > GtkComboBox > .button:checked { + box-shadow: none; } .linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, @@ -638,7 +681,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover, .linked.vertical > GtkComboBoxText:first-child > .button:hover, .linked.vertical > GtkComboBox:first-child > .button:hover { - box-shadow: inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active, + .linked.vertical > GtkComboBoxText:first-child > .button:active, + .linked.vertical > GtkComboBox:first-child > .button:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked, + .linked.vertical > GtkComboBoxText:first-child > .button:checked, + .linked.vertical > GtkComboBox:first-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, @@ -648,7 +697,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover, .linked.vertical > GtkComboBoxText:last-child > .button:hover, .linked.vertical > GtkComboBox:last-child > .button:hover { - box-shadow: inset 0 1px #5294E2; } + box-shadow: inset 0 1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active, + .linked.vertical > GtkComboBoxText:last-child > .button:active, + .linked.vertical > GtkComboBox:last-child > .button:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked, + .linked.vertical > GtkComboBoxText:last-child > .button:checked, + .linked.vertical > GtkComboBox:last-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, @@ -659,6 +714,12 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBoxText:only-child > .button:hover, .linked.vertical > GtkComboBox:only-child > .button:hover { box-shadow: none; } + .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active, + .linked.vertical > GtkComboBoxText:only-child > .button:active, + .linked.vertical > GtkComboBox:only-child > .button:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked, + .linked.vertical > GtkComboBoxText:only-child > .button:checked, + .linked.vertical > GtkComboBox:only-child > .button:checked { + box-shadow: none; } .menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, @@ -715,8 +776,6 @@ GtkSearchEntry.entry { border-style: none solid none none; } .spinbutton .button:first-child { color: red; } - .spinbutton .button:hover { - color: #5294E2; } .spinbutton .button:insensitive { color: rgba(92, 97, 108, 0.55); } .spinbutton .button:active { @@ -730,13 +789,15 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); + border-color: #8f9aae; + background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .spinbutton.vertical .button:first-child:insensitive, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive { color: rgba(92, 97, 108, 0.55); border-color: rgba(207, 214, 230, 0.55); @@ -751,13 +812,15 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); + border-color: #8f9aae; + background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .spinbutton.vertical .button:last-child:insensitive, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive { color: rgba(92, 97, 108, 0.55); border-color: rgba(207, 214, 230, 0.55); @@ -804,11 +867,12 @@ GtkComboBox { border-color: #cfd6e6; } GtkComboBox.combobox-entry .button:hover { background-color: #e0e4ef; - border-color: #5294E2; - box-shadow: -1px 0 #5294E2; } + border-color: #e0e4ef; } GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); + border-color: #8f9aae; + background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } GtkComboBox.combobox-entry .button:insensitive { @@ -823,9 +887,9 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: 1px solid rgba(0, 0, 0, 0.6); + border: 1px solid rgba(0, 0, 0, 0.5); border-radius: 3px; - background-color: rgba(42, 44, 51, 0.85); } + background-color: rgba(53, 57, 69, 0.85); } .primary-toolbar { color: rgba(82, 93, 118, 0.8); @@ -992,12 +1056,13 @@ GtkComboBox { .primary-toolbar .entry:focus, .header-bar .entry:focus { color: #ffffff; border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-image: linear-gradient(to bottom, #5294E2); + background-clip: border-box; } .primary-toolbar .entry:focus.image, .header-bar .entry:focus.image { color: #ffffff; } .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive { color: rgba(82, 93, 118, 0.35); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus { background-color: #ffffff; color: #5294E2; } @@ -1023,7 +1088,8 @@ GtkComboBox { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-color: #5294E2; } + background-color: #5294E2; + background-clip: border-box; } .primary-toolbar .button:insensitive, .header-bar .button:insensitive { color: rgba(82, 93, 118, 0.35); background-color: rgba(231, 232, 235, 0); @@ -1052,7 +1118,7 @@ GtkComboBox { .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { - border-color: #5294E2; } + background-color: rgba(255, 255, 255, 0.9); } .primary-toolbar .linked.stack-switcher > .button:active, .header-bar .linked.stack-switcher > .button:active, .primary-toolbar .linked.stack-switcher > .button:checked, @@ -1062,6 +1128,50 @@ GtkComboBox { outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } + .primary-toolbar .linked.stack-switcher > .button:insensitive, + .header-bar .linked.stack-switcher > .button:insensitive, + .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive { + color: rgba(82, 93, 118, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:hover, + .header-bar .linked.stack-switcher > .button:hover, + .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:first-child:hover, + .header-bar .linked.stack-switcher > .button:first-child:hover, + .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:last-child:hover, + .header-bar .linked.stack-switcher > .button:last-child:hover, + .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:hover, + .header-bar .linked.stack-switcher > .button:only-child:hover, + .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked { + box-shadow: none; } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; @@ -1163,10 +1273,11 @@ GtkComboBox { .primary-toolbar GtkComboBox.combobox-entry .button:hover, .header-bar GtkComboBox.combobox-entry .button:hover { color: #ffffff; border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-image: linear-gradient(to bottom, #5294E2); + box-shadow: none; } .primary-toolbar GtkComboBox.combobox-entry .button:insensitive, .header-bar GtkComboBox.combobox-entry .button:insensitive { color: rgba(82, 93, 118, 0.35); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } @@ -1186,9 +1297,17 @@ GtkComboBox { background-image: linear-gradient(to bottom, rgba(82, 93, 118, 0.1)); } .primary-toolbar .scale.slider, .header-bar .scale.slider { - background-image: linear-gradient(to bottom, rgba(253, 253, 253, 0.995)); } + background-image: linear-gradient(to bottom, #fbfbfc); + border-color: rgba(82, 93, 118, 0.3); } + .primary-toolbar .scale.slider:hover, .header-bar .scale.slider:hover { + background-image: linear-gradient(to bottom, white); + border-color: rgba(82, 93, 118, 0.3); } + .primary-toolbar .scale.slider:active, .header-bar .scale.slider:active { + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .primary-toolbar .scale.slider:insensitive, .header-bar .scale.slider:insensitive { - background-image: linear-gradient(to bottom, rgba(241, 242, 243, 0.97)); } + background-image: linear-gradient(to bottom, rgba(245, 246, 247, 0.985)); + border-color: rgba(82, 93, 118, 0.3); } /************ * Pathbars * @@ -1774,21 +1893,21 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { margin: 3px; } .scale.slider { background-clip: border-box; - background-image: linear-gradient(to bottom, #ffffff); - border: 1px solid #5294E2; + background-image: linear-gradient(to bottom, #fbfbfc); + border: 1px solid rgba(123, 142, 186, 0.5); border-radius: 50%; box-shadow: none; } .scale.slider:hover { - background-image: linear-gradient(to bottom, #5294E2); - border-color: #5294E2; } + background-image: linear-gradient(to bottom, white); + border-color: rgba(123, 142, 186, 0.5); } .scale.slider:insensitive { background-image: linear-gradient(to bottom, #fbfbfb); - border-color: #9bc0eb; } + border-color: rgba(123, 142, 186, 0.3); } .scale.slider:active { - background-image: linear-gradient(to bottom, #2679db); - border-color: #2679db; } + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(42, 44, 51, 0.95)); + background-image: linear-gradient(to bottom, rgba(53, 57, 69, 0.95)); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1818,7 +1937,7 @@ 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(58, 62, 70, 0.95)); + background-image: linear-gradient(to bottom, rgba(69, 74, 89, 0.95)); outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; @@ -1965,18 +2084,18 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame { padding: 10px; color: #BAC3CF; - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(53, 57, 69, 0.95); 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: rgba(31, 33, 40, 0.95); } .app-notification .button, .app-notification.frame .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } @@ -1984,8 +2103,8 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { @@ -1995,9 +2114,9 @@ GtkScrolledWindow GtkViewport.frame { background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } /************* * Expanders * @@ -2029,8 +2148,9 @@ GtkCalendar { border-radius: 0; } GtkCalendar.button, GtkCalendar.button:focus { color: rgba(92, 97, 108, 0.45); - box-shadow: none; - border: none; } + border-color: transparent; + background-color: transparent; + background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #5c616c; } GtkCalendar.highlight { @@ -2163,7 +2283,7 @@ GtkInfoBar { color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2232,8 +2352,8 @@ GtkColorButton.button { .scale-popup .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } GtkVolumeButton.button { padding: 8px; } @@ -2244,11 +2364,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 4px 4px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 4px 8px 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 8px 8px 0 rgba(0, 0, 0, 0.2); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 4px 5px 2px rgba(0, 0, 0, 0.1); } + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { @@ -2702,12 +2822,30 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { border-color: rgba(82, 93, 118, 0.1); background-color: rgba(251, 251, 252, 0.9); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { - border-color: #5294E2; } + background-color: rgba(255, 255, 255, 0.9); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive { + color: rgba(82, 93, 118, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .gedit-headerbar-paned { color: rgba(212, 213, 219, 0.95); } @@ -2794,15 +2932,9 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { - color: rgba(82, 93, 118, 0.8); - border-color: rgba(82, 93, 118, 0.1); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); - background-color: transparent; - border-color: #5294E2; } - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, - GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { - color: inherit; } + color: #ffffff; + border-color: #5294E2; + background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { @@ -2812,7 +2944,7 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { color: rgba(82, 93, 118, 0.35); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; @@ -2852,7 +2984,7 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #2a2c33; } + background-color: #353945; } GtkBox.gb-command-bar-box GtkLabel { color: #BAC3CF; } @@ -2861,7 +2993,7 @@ GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; color: #BAC3CF; background-image: none; - background-color: #2a2c33; + background-color: #353945; padding: 6px 6px 6px 6px; border: none; } @@ -2944,7 +3076,7 @@ PanelWidget, PanelAppletFrame, PanelApplet { color: #BAC3CF; - background-image: linear-gradient(to bottom, rgba(31, 33, 37, 0.95)); } + background-image: linear-gradient(to bottom, rgba(43, 46, 55, 0.95)); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2988,18 +3120,18 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(31, 33, 37, 0.95); } + background-color: rgba(43, 46, 55, 0.95); } .xfce4-panel.panel .button.flat { color: #BAC3CF; - background-color: rgba(31, 33, 37, 0); + background-color: rgba(43, 46, 55, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(54, 57, 65, 0.95); } + background-color: rgba(65, 70, 84, 0.95); } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(15, 16, 18, 0.95); } + background-color: rgba(27, 29, 35, 0.95); } .floating-bar { background-color: #5294E2; @@ -3053,7 +3185,7 @@ MarlinViewWindow *:selected:focus { background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:insensitive { color: rgba(82, 93, 118, 0.35); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked { color: #5294E2; } @@ -3184,7 +3316,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #1f2125); + background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } @@ -3351,10 +3483,10 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(31, 33, 37, 0.95); + background-color: rgba(43, 46, 55, 0.95); color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(15, 16, 18, 0.95); + box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { @@ -3394,11 +3526,13 @@ GtkListBox .h4 { #content_frame .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); + border-color: #8f9aae; + background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } #content_frame .button:insensitive { @@ -3413,32 +3547,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 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); } + box-shadow: inset 0 1px rgba(53, 57, 69, 0.95); } #buttonbox_frame .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } #buttonbox_frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } #login_window #user_combobox { color: #5c616c; @@ -3534,7 +3668,7 @@ NautilusWindow MarlinPlacesSidebar, NemoWindow .sidebar, NemoWindow MarlinPlacesSidebar, MarlinViewWindow .sidebar, MarlinViewWindow MarlinPlacesSidebar { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, @@ -3665,16 +3799,16 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog .sidebar { background-color: transparent; } @@ -3691,7 +3825,7 @@ GtkFileChooserDialog .dialog-vbox > .frame { GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: rgba(44, 47, 53, 0.95); } + border-color: rgba(42, 45, 55, 0.95); } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, @@ -3702,7 +3836,7 @@ GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, @@ -3713,9 +3847,9 @@ GeditWindow.background.csd { background-color: #ffffff; } .gedit-document-panel { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } .maximized .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .gedit-document-panel .list-row { color: #BAC3CF; } .gedit-document-panel .list-row { @@ -3742,9 +3876,9 @@ GeditWindow.background.csd { color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.trough { background-color: transparent; border-color: transparent; } @@ -3769,7 +3903,7 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: rgba(44, 47, 53, 0.95); } + border-color: rgba(37, 40, 49, 0.95); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #BAC3CF; } @@ -3785,14 +3919,14 @@ GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } 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 { @@ -3802,26 +3936,29 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.35); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.35)); + background-color: transparent; } + GtkFileChooserDialog .action-bar.frame .image.entry, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry, GtkFileChooserDialog .action-bar.frame .image.entry:hover, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry:hover { + color: inherit; } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #BAC3CF; + color: #ffffff; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @@ -3855,22 +3992,15 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { @define-color wm_bg_unfocused #eff0f2; @define-color wm_highlight #eff0f2; @define-color wm_shadow alpha(black, 0.35); -@define-color wm_button_close_bg #f37076; -@define-color wm_button_close_hover_bg #f79da1; -@define-color wm_button_close_active_bg #ef4048; -@define-color wm_icon_close_bg #ffffff; -@define-color wm_icon_close_hover_bg #ffffff; -@define-color wm_icon_close_active_bg #ffffff; -@define-color wm_button_bg #fdfdfd; -@define-color wm_button_unfocused_bg #f6f7f8; +@define-color wm_button_close_bg #f46067; +@define-color wm_button_close_hover_bg #f68086; +@define-color wm_button_close_active_bg #f13039; +@define-color wm_icon_close_bg #F8F8F9; @define-color wm_button_hover_bg #fdfdfd; @define-color wm_button_active_bg #5294E2; -@define-color wm_button_border #d8dae0; -@define-color wm_button_unfocused_border #dddee2; -@define-color wm_button_hover_border #5294E2; -@define-color wm_button_active_border #5294E2; -@define-color wm_icon_bg #8d93a4; -@define-color wm_icon_unfocused_bg #b8bcc7; -@define-color wm_icon_hover_bg #70788d; +@define-color wm_button_hover_border #D1D3DA; +@define-color wm_icon_bg #90949E; +@define-color wm_icon_unfocused_bg #B6B8C0; +@define-color wm_icon_hover_bg #7A7F8B; @define-color wm_icon_active_bg #ffffff; @define-color content_view_bg #ffffff; diff --git a/common/gtk-3.0/3.14/sass/_applications.scss b/common/gtk-3.0/3.14/sass/_applications.scss index 54833f7..beeb698 100644 --- a/common/gtk-3.0/3.14/sass/_applications.scss +++ b/common/gtk-3.0/3.14/sass/_applications.scss @@ -57,9 +57,6 @@ SushiFontWidget { // // GNOME Terminal // -$terminal_bg: #2A2F36; -$terminal_fg: white; - TerminalWindow { .background { background-color: transparent; @@ -128,12 +125,34 @@ NemoWindow GtkSeparator.separator.horizontal { } NemoWindow .primary-toolbar NemoPathBar.linked > .button { + $_linked_separator_color: $header_button_border; + @include button(header-hover); - &:hover { border-color: $selected_bg_color; } + &:hover { background-color: lighten($header_button_bg, 15%); } &:active, &:checked { @include button(header-active); } + &:insensitive { color: transparentize($header_fg, 0.4); } @extend %linked; + + &:hover { + box-shadow: inset 1px 0 $_linked_separator_color, + inset -1px 0 $_linked_separator_color; + } + &:active, &:checked { box-shadow: none; } + + &:first-child { + &:hover { box-shadow: inset -1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } + } + &:last-child { + &:hover { box-shadow: inset 1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } + } + &:only-child { + &:hover { box-shadow: none; } + &:active, &:checked { box-shadow: none; } + } } // @@ -235,7 +254,7 @@ GbSearchBox.linked { @include entry(header-normal); - &:hover { @include entry(header-normal); border-color: $selected_bg_color; } + &:hover { @include entry(header-focus); } &:active, &:checked { @include entry(header-focus); } &:insensitive { @include entry(header-insensitive); } } diff --git a/common/gtk-3.0/3.14/sass/_colors-public.scss b/common/gtk-3.0/3.14/sass/_colors-public.scss index 60d3cbf..accfee4 100644 --- a/common/gtk-3.0/3.14/sass/_colors-public.scss +++ b/common/gtk-3.0/3.14/sass/_colors-public.scss @@ -51,19 +51,12 @@ $wm_bg_unfocused: opacify($header_bg_backdrop, 1); @define-color wm_button_close_active_bg #{"" + $wm_button_close_active_bg}; @define-color wm_icon_close_bg #{"" + $wm_icon_close_bg}; -@define-color wm_icon_close_hover_bg #{"" + $wm_icon_close_hover_bg}; -@define-color wm_icon_close_active_bg #{"" + $wm_icon_close_active_bg}; // Minimize, Maximize -@define-color wm_button_bg #{"" + $wm_button_bg}; -@define-color wm_button_unfocused_bg #{"" + $wm_button_unfocused_bg}; @define-color wm_button_hover_bg #{"" + $wm_button_hover_bg}; @define-color wm_button_active_bg #{"" + $wm_button_active_bg}; -@define-color wm_button_border #{"" + $wm_button_border}; -@define-color wm_button_unfocused_border #{"" + $wm_button_unfocused_border}; @define-color wm_button_hover_border #{"" + $wm_button_hover_border}; -@define-color wm_button_active_border #{"" + $wm_button_active_border}; @define-color wm_icon_bg #{"" + $wm_icon_bg}; @define-color wm_icon_unfocused_bg #{"" + $wm_icon_unfocused_bg}; diff --git a/common/gtk-3.0/3.14/sass/_colors.scss b/common/gtk-3.0/3.14/sass/_colors.scss index 9c51858..47daa0f 100644 --- a/common/gtk-3.0/3.14/sass/_colors.scss +++ b/common/gtk-3.0/3.14/sass/_colors.scss @@ -2,15 +2,15 @@ // it gets @if ed depending on $variant -$base_color: if($variant =='light', #ffffff, #383C45); +$base_color: if($variant =='light', #ffffff, #404552); $text_color: if($variant == 'light', #5c616c, #D3DAE3); -$bg_color: if($variant =='light', #F5F6F7, #444852); +$bg_color: if($variant =='light', #F5F6F7, #383C4A); $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%)); +$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%)); $link_color: if($variant == 'light', darken($selected_bg_color,10%), lighten($selected_bg_color,20%)); @@ -28,63 +28,67 @@ $suggested_color: #4DADD4; $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; } +@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343f, 0.03); } +@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343f; } $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_border: if($variant == 'light' and $darker=='false', darken($header_bg, 7%), darken($header_bg, 4%)); $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_bg: if($transparency == 'true', transparentize(#353945, 0.05), #353945); $dark_sidebar_fg: #BAC3CF; -$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 10%)); +$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 5%)); $osd_fg_color: $dark_sidebar_fg; -$osd_bg_color: darken($dark_sidebar_bg, 8%); +$osd_bg_color: $dark_sidebar_bg; + +$osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_button_border: transparentize(darken($osd_bg_color, 12%), 0.6); + +$osd_entry_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_entry_border: transparentize(darken($osd_bg_color, 12%), 0.6); $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; +$panel_bg: darken($dark_sidebar_bg, 4.7%); +$panel_fg: $dark_sidebar_fg; + +$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); +$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); + +$header_entry_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($base_color, 0.1)); +$header_entry_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); + +$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); +$button_border: $entry_border; + +$header_button_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($button_bg, 0.1)); +$header_button_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); //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_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #cc575d); +$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #d7787d); +$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #be3841); -$wm_icon_close_bg: $selected_fg_color; -$wm_icon_close_hover_bg: $selected_fg_color; -$wm_icon_close_active_bg: $selected_fg_color; +$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #2f343f); // 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_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #454C5C); $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_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #262932); -$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_bg: if($variant == 'light' and $darker == 'false', #90949E, #90939B); +$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #666A74); +$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #C4C7CC); $wm_icon_active_bg: $selected_fg_color; diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index d7ca6fe..576eb9d 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -415,7 +415,7 @@ $_dot_color: $selected_bg_color; -gtk-image-effect: highlight; } &:active, &:checked { - background-clip: border-box; + background-clip: if($variant=='light', border-box, padding-box); @include button(active); transition-duration: 50ms; } @@ -651,14 +651,18 @@ $_dot_color: $selected_bg_color; &:only-child > .button.flat { @extend %linked:only-child; } } +$_linked_separator_color: if($variant=='light', transparentize($button_border, 0.6), transparentize($button_border, 0.5)); + %linked_middle { border-radius: 0; border-left-style: none; border-right-style: none; &:hover { - box-shadow: inset 1px 0 $selected_bg_color, inset -1px 0 $selected_bg_color; + box-shadow: inset 1px 0 $_linked_separator_color, + inset -1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } &:dir(rtl) { border-radius: 0; // needed when including %linked_middle:dir(rtl) @@ -672,13 +676,15 @@ $_dot_color: $selected_bg_color; border-radius: 3px 0 0 3px; border-left-style: solid; - &:hover { box-shadow: inset -1px 0 $selected_bg_color; } + &:hover { box-shadow: inset -1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } } &:last-child { border-radius: 0 3px 3px 0; border-right-style: solid; - &:hover { box-shadow: inset 1px 0 $selected_bg_color; } + &:hover { box-shadow: inset 1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } &:dir(rtl) { border-bottom-left-radius: 0; } @@ -688,6 +694,7 @@ $_dot_color: $selected_bg_color; border-style: solid; &:hover { box-shadow: none; } + &:active, &:checked { box-shadow: none; } } } @@ -697,7 +704,11 @@ $_dot_color: $selected_bg_color; border-top-style: none; border-radius: 0; - &:hover { box-shadow: inset 0 1px $selected_bg_color, inset 0 -1px $selected_bg_color; } + &:hover { + box-shadow: inset 0 -1px $_linked_separator_color, + inset 0 1px $_linked_separator_color; + } + &:active, &:checked { box-shadow: none; } } %linked_vertical{ @@ -707,19 +718,22 @@ $_dot_color: $selected_bg_color; border-radius: 3px 3px 0 0; border-top-style: solid; - &:hover { box-shadow: inset 0 -1px $selected_bg_color; } + &:hover { box-shadow: inset 0 -1px $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } } &:last-child { border-radius: 0 0 3px 3px; border-bottom-style: solid; - &:hover { box-shadow: inset 0 1px $selected_bg_color; } + &:hover { box-shadow: inset 0 1px $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } } &:only-child { border-radius: 3px; border-style: solid; &:hover { box-shadow: none; } + &:active, &:checked { box-shadow: none; } } } @@ -737,7 +751,7 @@ $_dot_color: $selected_bg_color; outline-offset: -1px; border-radius: 2px; - &:hover { background-color: mix($fg_color,$bg_color,5%); } + &:hover { background-color: if($variant=='light', mix($fg_color,$bg_color,5%), mix($fg_color,$bg_color,10%)); } &:active, &:selected { @extend %selected_items; } @@ -793,9 +807,7 @@ $_dot_color: $selected_bg_color; // padding-right: 6px; &:dir(rtl) { border-style: none solid none none; } &:first-child { color: red; } - &:hover { - color: $selected_bg_color; - } + &:insensitive { color: $insensitive_fg_color; } @@ -929,8 +941,7 @@ GtkComboBox { &:hover { background-color: lighten($button_border, 5%); - border-color: $selected_bg_color; - box-shadow: -1px 0 $selected_bg_color; + border-color: lighten($button_border, 5%); } &:active, &:checked { @include button(active); } @@ -973,7 +984,7 @@ GtkComboBox { background-color: $bg_color; .osd &, &.osd { padding: 7px; - border: 1px solid transparentize(black, 0.4); + border: 1px solid transparentize(black, 0.5); border-radius: 3px; background-color: transparentize($osd_bg_color, 0.1); } @@ -1182,6 +1193,7 @@ GtkComboBox { &:focus { @include entry(header-focus); + background-clip: if($darker=='false' and $variant=='light', border-box, padding-box); &.image { color: $selected_fg_color; } } @@ -1207,7 +1219,10 @@ GtkComboBox { &:backdrop { opacity: 0.7; } &:hover { @include button(header-hover); } - &:active, &:checked { @include button(header-active); } + &:active, &:checked { + @include button(header-active); + background-clip: if($darker=='false' and $variant=='light', border-box, padding-box); + } &:insensitive { @include button(header-insensitive); } &:insensitive:active, &:insensitive:checked { @include button(header-insensitive-active); } } @@ -1218,12 +1233,35 @@ GtkComboBox { .linked.stack-switcher > .button, .linked.path-bar > .button { + + $_linked_separator_color: $header_button_border; + @include button(header-hover); - &:hover { border-color: $selected_bg_color; } + &:hover { background-color: lighten($header_button_bg, 15%); } &:active, &:checked { @include button(header-active); } + &:insensitive { color: transparentize($header_fg, 0.4); } @extend %linked; + + &:hover { + box-shadow: inset 1px 0 $_linked_separator_color, + inset -1px 0 $_linked_separator_color; + } + &:active, &:checked { box-shadow: none; } + + &:first-child { + &:hover { box-shadow: inset -1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } + } + &:last-child { + &:hover { box-shadow: inset 1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } + } + &:only-child { + &:hover { box-shadow: none; } + &:active, &:checked { box-shadow: none; } + } } // Header-bar Suggested and Destructive Action buttons @@ -1276,7 +1314,7 @@ GtkComboBox { &.combobox-entry .button { @include entry(header-normal); - &:hover { @include entry(header-focus); } + &:hover { @include entry(header-focus); box-shadow: none; } &:insensitive { @include entry(header-insensitive); } } } @@ -1288,7 +1326,7 @@ GtkComboBox { GtkProgressBar { - &.trough { background-color: transparentize($header_fg, 0.65); } + &.trough { background-color: if($variant=='light' and $darker=='false', opacify($header_button_border, 0.05), $header_button_border); } &:backdrop { opacity: 0.75; } } @@ -1299,17 +1337,29 @@ GtkComboBox { &:backdrop { opacity: 0.75; } &.trough { - background-image: linear-gradient(to bottom, transparentize($header_fg, 0.65)); + $_trough_bg: if($variant=='light' and $darker=='false', opacify($header_button_border, 0.05), $header_button_border); + background-image: linear-gradient(to bottom, $_trough_bg); - &:insensitive { background-image: linear-gradient(to bottom, transparentize($header_fg, 0.7)); } + &:insensitive { background-image: linear-gradient(to bottom, if($variant=='light' and $darker=='false', transparentize($_trough_bg, 0.05), transparentize($_trough_bg, 0.1))); } } &.slider { - background-image: linear-gradient(to bottom, if($darker == 'false', mix($base_color, $header_bg, 90%), darken($header_bg, 4%))); + $_slider_border: if($variant=='light' and $darker=='false', opacify($header_button_border, 0.2), opacify($header_button_border, 0.3)); + $_slider_bg: if($variant=='light' and $darker=='false', opacify($header_button_bg,1), lighten(opacify($header_bg,1), 10%)); - &:insensitive { - background-image: linear-gradient(to bottom, if($darker == 'false', mix($base_color, $header_bg, 40%), darken($header_bg, 1%))); + background-image: linear-gradient(to bottom, $_slider_bg); + border-color: $_slider_border; - @if $darker=='true' { border-color: mix($header_bg, $selected_bg_color, 60%); } + &:hover { + background-image: linear-gradient(to bottom, lighten($_slider_bg, 5%)); + border-color: $_slider_border; + } + &:active { + background-image: linear-gradient(to bottom, $selected_bg_color); + border-color: $selected_bg_color; + } + &:insensitive { + background-image: linear-gradient(to bottom, mix($_slider_bg, $header_bg, 70%)); + border-color: $_slider_border; } } } @@ -1477,7 +1527,7 @@ column-header.button.dnd { // for treeview-like derive widgets margin: 4px; padding: 0; border-radius: 0; - background-color: $base_color; + background-color: if($variant=='light', $base_color, $bg_color); border: 1px solid $borders_color; .csd & { @@ -1531,7 +1581,7 @@ column-header.button.dnd { // for treeview-like derive widgets border: 1px solid darken($borders_color, 5%); border-radius: 3px; background-clip: border-box; - background-color: $base_color; + background-color: if($variant=='light', $base_color, $bg_color); box-shadow: 0 2px 6px 1px if($variant=='light', transparentize(black, 0.93), transparentize(black, 0.65)); @@ -1903,30 +1953,31 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { -GtkRange-trough-border: 0; outline-offset: -1px; outline-radius: 2px; - //@include _shadows(_button_shadow(normal)); &.trough { margin: 5px; } &.fine-tune { &.trough { border-radius: 5px; margin: 3px; } } &.slider { + $_slider_border: if($variant=='light', transparentize(darken($button_border,25%), 0.5), darken($button_border,2%)); + background-clip: border-box; - background-image: linear-gradient(to bottom, $entry_bg); - border: 1px solid $selected_bg_color; + background-image: linear-gradient(to bottom, $button_bg); + border: 1px solid $_slider_border; border-radius: 50%; box-shadow: none; &:hover { - background-image: linear-gradient(to bottom, $selected_bg_color); - border-color: $selected_bg_color; + background-image: linear-gradient(to bottom, lighten($button_bg, 5%)); + border-color: $_slider_border; } &:insensitive { background-image: linear-gradient(to bottom, mix($entry_bg, $bg_color, 55%)); - border-color: mix($selected_bg_color, $bg_color, 55%); + border-color: transparentize($_slider_border, 0.2); } &:active { - background-image: linear-gradient(to bottom, darken($selected_bg_color, 10%)); - border-color: darken($selected_bg_color, 10%); + background-image: linear-gradient(to bottom, $selected_bg_color); + border-color: $selected_bg_color; } //OSD sliders .osd & { @@ -1960,7 +2011,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } &.trough { - $_scale_trough_bg: if($variant == 'light', $button_border, darken($base_color, 4%)); + $_scale_trough_bg: if($variant == 'light', $button_border, darken($bg_color, 5%)); border: none; border-radius: 2.5px; @@ -2039,7 +2090,7 @@ GtkProgressBar { GtkProgressBar.trough { border: none; border-radius: 3px; - background-color: if($variant == 'light', $button_border, darken($base_color, 4%)); + background-color: if($variant == 'light', $button_border, darken($bg_color, 5%)); &.osd { border-style: none; @@ -2089,8 +2140,8 @@ GtkLevelBar.vertical { background-color: $warning_color; } &.empty-fill-block { - background-color: transparentize($fg_color,0.8); - border-color: transparentize($fg_color,0.8); + background-color: if($variant=='light', transparentize($fg_color,0.8), $base_color); + border-color: if($variant=='light', transparentize($fg_color,0.8), $base_color); } } } @@ -2241,8 +2292,8 @@ GtkCalendar { } &.button, &.button:focus { color: transparentize($fg_color,0.55); - box-shadow: none; - border: none; + @include button(undecorated); + &:hover { color: $fg_color; } @@ -2573,15 +2624,15 @@ GtkVolumeButton.button { padding: 8px; } // see bug #722563 $_wm_border: if($variant=='light', transparentize(black, 0.9), transparentize(black, 0.45)); - box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), $_wm_border), - 0 4px 8px 1px if($darker == 'false', opacify($_wm_border, 0.1), opacify($_wm_border, 0.15)); + box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', darken($header_bg, 6%), $_wm_border), + 0 8px 8px 0 if($variant == 'light', opacify($_wm_border, 0.1), transparentize($_wm_border, 0.2)); /* this is used for the resize cursor area */ margin: 10px; &:backdrop { - box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), $_wm_border), - 0 4px 5px 2px if($darker == 'false', $_wm_border, opacify($_wm_border, 0.15)); + box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', transparentize(darken($header_bg, 6%), 0.1), $_wm_border), + 0 5px 5px 0 if($variant == 'light', opacify($_wm_border, 0.1), transparentize($_wm_border, 0.2)); } &.tiled { border-radius: 0; @@ -2590,7 +2641,7 @@ GtkVolumeButton.button { padding: 8px; } &.popup, &.menu { 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%)); + 0 0 0 1px if($variant == 'light', $_wm_border, darken($bg_color, 10%)); } &.tooltip { border-radius: 2px; diff --git a/common/gtk-3.0/3.14/sass/_drawing.scss b/common/gtk-3.0/3.14/sass/_drawing.scss index 2cb08e1..73c4962 100644 --- a/common/gtk-3.0/3.14/sass/_drawing.scss +++ b/common/gtk-3.0/3.14/sass/_drawing.scss @@ -52,17 +52,14 @@ background-image: linear-gradient(to bottom, transparentize($entry_bg, 0.45)); } - $_header_entry_bg: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 4%), 0.1), transparentize($base_color, 0.1)); - $_header_entry_border: if($darker == 'true' or $variant == 'dark', darken($header_bg, 10%), transparentize($header_fg, 0.7)); - @if $t==header-normal { // // normal header-bar entry // color: $header_fg; - border-color: $_header_entry_border; - background-image: linear-gradient(to bottom, $_header_entry_bg); + border-color: $header_entry_border; + background-image: linear-gradient(to bottom, $header_entry_bg); background-color: transparent; &.image, &.image:hover { color: inherit; } @@ -73,7 +70,7 @@ // focused header-bar entry // color: $selected_fg_color; - border-color: $selected_bg_color; + border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent); background-image: linear-gradient(to bottom, $selected_bg_color); } @@ -82,7 +79,7 @@ // insensitive header-bar entry // color: transparentize($header_fg, 0.45); - background-image: linear-gradient(to bottom, transparentize($_header_entry_bg, 0.35)); + background-image: linear-gradient(to bottom, transparentize($header_entry_bg, 0.15)); } @else if $t==osd { @@ -90,27 +87,28 @@ // normal osd entry // color: $osd_fg_color; - border-color: transparentize(black, 0.6); + border-color: $osd_entry_border; + background-image: linear-gradient(to bottom, $osd_entry_bg); background-color: transparent; - background-image: linear-gradient(to bottom, transparentize(black, 0.8)); + + &.image, &.image:hover { color: inherit; } } @else if $t==osd-focus { // // active osd entry // - color: $osd_fg_color; - border-color: $selected_bg_color; - background-image: linear-gradient(to bottom, transparentize(black, 0.8)); + color: $selected_fg_color; + border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent); + background-image: linear-gradient(to bottom, $selected_bg_color); } @else if $t==osd-insensitive { // // insensitive osd entry // - color: $osd_insensitive_fg_color; - border-color: transparentize(black, 0.6); - background-image: linear-gradient(to bottom, transparentize(black, 0.9)); + color: transparentize($osd_fg_color, 0.45); + background-image: linear-gradient(to bottom, transparentize($osd_entry_bg, 0.15)); } } @@ -139,8 +137,8 @@ // color: $fg_color; outline-color: transparentize($fg_color, 0.7); - border-color: $selected_bg_color; - background-color: $button_bg; + border-color: $button_border; + background-color: lighten($button_bg, 5%); } @else if $t==active { @@ -149,7 +147,13 @@ // color: $selected_fg_color; outline-color: transparentize($selected_fg_color, 0.7); - border-color: $selected_bg_color; + border-color: saturate(mix($fg_color, $bg_color, 60%), 10%); + background-color: saturate(mix($fg_color, $bg_color, 60%), 10%); + + //border-color: if($variant=='light', saturate(mix($fg_color, $bg_color, 60%), 10%), transparent); + //background-color: if($variant=='light', saturate(mix($fg_color, $bg_color, 60%), 10%), darken($button_bg, 10%)); + + border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent); background-color: $selected_bg_color; } @@ -177,9 +181,6 @@ > GtkLabel { color: inherit; } } - $_header_button_bg: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 3%), 0.1), transparentize($button_bg, 0.1)); - $_header_button_border: if($darker == 'true' or $variant == 'dark', darken($header_bg, 8%), transparentize($header_fg, 0.7)); - @if $t==header-normal { // // normal header-bar button @@ -197,8 +198,8 @@ // color: $header_fg; outline-color: transparentize($header_fg, 0.7); - border-color: $_header_button_border; - background-color: $_header_button_bg; + border-color: $header_button_border; + background-color: $header_button_bg; } @else if $t==header-active { @@ -207,7 +208,7 @@ // color: $selected_fg_color; outline-color: transparentize($selected_fg_color, 0.7); - border-color: $selected_bg_color; + border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent); background-color: $selected_bg_color; } @@ -237,8 +238,8 @@ // color: $osd_fg_color; outline-color: transparentize($osd_fg_color, 0.7); - border-color: transparentize(black, 0.55); - background-color: transparentize(black, 0.7); + border-color: $osd_button_border; + background-color: $osd_button_bg; } @else if $t==osd-hover { @@ -247,8 +248,8 @@ // color: $osd_fg_color; outline-color: transparentize($osd_fg_color, 0.7); - border-color: $selected_bg_color; - background-color: transparentize(black, 0.7); + border-color: $osd_button_border; + background-color: opacify(lighten($osd_button_bg, 7%), 0.1); } @else if $t==osd-active { @@ -266,8 +267,8 @@ // insensitive osd button // color: $osd_insensitive_fg_color; - border-color: transparentize(black, 0.55); - background-color: transparentize(black, 0.85); + border-color: $osd_button_border; + background-color: transparentize($osd_button_bg, 0.15); } @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 9b2fa76..0879a5a 100644 --- a/common/gtk-3.0/3.14/sass/_lightdm.scss +++ b/common/gtk-3.0/3.14/sass/_lightdm.scss @@ -34,7 +34,7 @@ /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: if($variant == 'light', $bg_color, $base_color); + background-color: $bg_color; border-top-left-radius: 2px; border-top-right-radius: 2px; border: solid transparentize(black, 0.9); @@ -54,12 +54,12 @@ padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: $osd_bg_color; + background-color: if($variant=='light', $osd_bg_color, $header_bg); 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%); + box-shadow: inset 0 1px if($variant=="light", $dark_sidebar_border, $header_border); } #buttonbox_frame .button{ 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 d9c2c99..7d3155a 100644 --- a/common/gtk-3.0/3.14/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.14/sass/_transparent_widgets.scss @@ -100,7 +100,7 @@ GtkFileChooserDialog { } .action-bar.frame { background-color: transparent; - border-color: if($variant =='light', darken($dark_sidebar_bg, 7%), darken($dark_sidebar_bg, 15%)); + border-color: if($variant =='light', darken($dark_sidebar_bg, 5%), darken($dark_sidebar_bg, 10%)); } .action-bar.frame, @@ -224,7 +224,7 @@ GeditWindow.background.csd GeditFileBrowserView.view { %dark_sidebar_button { @include button(osd); - &:hover { @include button(osd-hover) } + &:hover { @include button(osd-hover); } &:active, &:checked { @include button(osd-active); } &:insensitive { @include button(osd-insensitive); } } @@ -232,6 +232,6 @@ GeditWindow.background.csd GeditFileBrowserView.view { %dark_sidebar_entry { @include entry(osd); - &:focus { @include entry(osd-focus) } + &:focus { @include entry(osd-focus); } &:insensitive { @include entry(osd-insensitive); } } diff --git a/common/gtk-3.0/3.16/assets.svg b/common/gtk-3.0/3.16/assets.svg index 49d3928..126a618 100644 --- a/common/gtk-3.0/3.16/assets.svg +++ b/common/gtk-3.0/3.16/assets.svg @@ -25,8 +25,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="432.53015" - inkscape:cy="241.46841" + inkscape:cx="394.75543" + inkscape:cy="181.91127" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -1762,7 +1762,7 @@ id="g5400-2-0"> - + transform="translate(-471,-43)" + style="opacity:0.8"> - - @@ -2633,13 +2621,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> + - - + transform="translate(-480,-43)" + style="opacity:0.8"> @@ -2724,11 +2700,10 @@ id="g4092-0-2-3" style="display:inline" transform="translate(58,0)"> - @@ -2759,13 +2734,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> + @@ -2863,7 +2837,7 @@ sodipodi:nodetypes="csscccsscc" inkscape:connector-curvature="0" d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384" - style="opacity:0.99999999;fill:#70788d;fill-opacity:1;fill-rule:evenodd;stroke:none" + style="opacity:0.99999999;fill:#7a7f8b;fill-opacity:1;fill-rule:evenodd;stroke:none" id="path4293-6" /> @@ -2887,12 +2861,12 @@ @@ -2947,7 +2921,7 @@ id="layer12-45-6"> @@ -2982,7 +2956,7 @@ r="7" cy="255" cx="1376" - style="fill:#ef4048;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="fill:#f13039;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path4068-7-5-4-9" /> @@ -3224,102 +3198,11 @@ x="383" y="-185.63782" /> - - - - - - - - - - - - - - - - - - - - - - - - @@ -3351,20 +3234,8 @@ - - + style="fill:#2b303b;fill-opacity:1;stroke:none" /> + style="fill:#2b303b;fill-opacity:1;stroke:none" /> @@ -3766,7 +3637,7 @@ ry="11" rx="11" /> + style="display:inline;opacity:1;fill:#353a47;fill-opacity:1;stroke:none" /> + style="display:inline;opacity:1;fill:#353a47;fill-opacity:1;stroke:none" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#353a47;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="display:inline;opacity:1;fill:#353a47;fill-opacity:1;stroke:none" /> + style="display:inline;opacity:1;fill:#353a47;fill-opacity:1;stroke:none" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#353a47;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="fill:#2b303b;fill-opacity:1;stroke:none" /> + style="fill:#2b303b;fill-opacity:1;stroke:none" /> + id="sdsd-0-3-0" + style=""> + transform="translate(0,-30)" + style=""> + id="g5428-8-1-4-0-0-65-4-7" + style="" /> + id="g5400-2-4-7" + style=""> + id="g10964-4-8-3" + style=""> + id="g7025-3-8-9" + style=""> + id="g5428-8-1-7-83-9-6" + style=""> @@ -4510,7 +4388,7 @@ height="31" width="30.999969" id="rect13851-8-3" - style="fill:#32363d;fill-opacity:1;stroke:#26282d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="fill:#2d323d;fill-opacity:1;stroke:#262934;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" rx="2" /> + style="display:inline;opacity:1;fill:#2d323f;fill-opacity:1;stroke:none" /> + style="display:inline;opacity:1;fill:#2d323f;fill-opacity:1;stroke:none" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#2d323f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="display:inline;opacity:1;fill:#2d323f;fill-opacity:1;stroke:none" /> + style="display:inline;opacity:1;fill:#2d323f;fill-opacity:1;stroke:none" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#2d323f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> - - - @@ -4865,13 +4730,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> - - @@ -4958,11 +4805,10 @@ id="g4092-0-2-3-4-6" style="display:inline" transform="translate(58,0)"> - @@ -4993,13 +4839,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> @@ -5098,7 +4938,7 @@ sodipodi:nodetypes="csscccsscc" inkscape:connector-curvature="0" d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384" - style="opacity:1;fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:none" + style="opacity:1;fill:#c4c7cc;fill-opacity:1;fill-rule:evenodd;stroke:none" id="path4293-6-7-1" /> @@ -5123,12 +4963,12 @@ @@ -5183,7 +5023,7 @@ id="layer12-45-6-2-7"> @@ -5215,11 +5055,10 @@ id="g4092-0-2-2-1-7-2" style="display:inline" transform="translate(58,0)"> - @@ -5250,13 +5089,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> - - - - - - - - - - - - - - - - - - - - - - - - @@ -5590,20 +5332,8 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gtk-3.0/3.16/assets/checkbox-checked-dark.png b/common/gtk-3.0/3.16/assets/checkbox-checked-dark.png index 0c22603..7fa191b 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-checked-dark.png and b/common/gtk-3.0/3.16/assets/checkbox-checked-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-checked-dark@2.png b/common/gtk-3.0/3.16/assets/checkbox-checked-dark@2.png index e9816ec..ca01544 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-checked-dark@2.png and b/common/gtk-3.0/3.16/assets/checkbox-checked-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-checked-insensitive-dark.png b/common/gtk-3.0/3.16/assets/checkbox-checked-insensitive-dark.png index 3f48d1e..0897a31 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-checked-insensitive-dark.png and b/common/gtk-3.0/3.16/assets/checkbox-checked-insensitive-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-checked-insensitive-dark@2.png b/common/gtk-3.0/3.16/assets/checkbox-checked-insensitive-dark@2.png index e4226d5..45e5af7 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-checked-insensitive-dark@2.png and b/common/gtk-3.0/3.16/assets/checkbox-checked-insensitive-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-checked-selectionmode-dark.png b/common/gtk-3.0/3.16/assets/checkbox-checked-selectionmode-dark.png index 6f6517f..1046141 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-checked-selectionmode-dark.png and b/common/gtk-3.0/3.16/assets/checkbox-checked-selectionmode-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-checked-selectionmode-dark@2.png b/common/gtk-3.0/3.16/assets/checkbox-checked-selectionmode-dark@2.png index 60487bf..0539eb5 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-checked-selectionmode-dark@2.png and b/common/gtk-3.0/3.16/assets/checkbox-checked-selectionmode-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-mixed-dark.png b/common/gtk-3.0/3.16/assets/checkbox-mixed-dark.png index 6abc474..2391076 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-mixed-dark.png and b/common/gtk-3.0/3.16/assets/checkbox-mixed-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-mixed-dark@2.png b/common/gtk-3.0/3.16/assets/checkbox-mixed-dark@2.png index ac02f2c..7fcaed4 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-mixed-dark@2.png and b/common/gtk-3.0/3.16/assets/checkbox-mixed-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-mixed-insensitive-dark.png b/common/gtk-3.0/3.16/assets/checkbox-mixed-insensitive-dark.png index f7c61c6..8ee4970 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-mixed-insensitive-dark.png and b/common/gtk-3.0/3.16/assets/checkbox-mixed-insensitive-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-mixed-insensitive-dark@2.png b/common/gtk-3.0/3.16/assets/checkbox-mixed-insensitive-dark@2.png index 52ab429..6131a2a 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-mixed-insensitive-dark@2.png and b/common/gtk-3.0/3.16/assets/checkbox-mixed-insensitive-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-selectionmode-dark.png b/common/gtk-3.0/3.16/assets/checkbox-selectionmode-dark.png index 3bea14f..72dccd6 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-selectionmode-dark.png and b/common/gtk-3.0/3.16/assets/checkbox-selectionmode-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-selectionmode-dark@2.png b/common/gtk-3.0/3.16/assets/checkbox-selectionmode-dark@2.png index 839d1da..7ca9156 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-selectionmode-dark@2.png and b/common/gtk-3.0/3.16/assets/checkbox-selectionmode-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-unchecked-dark.png b/common/gtk-3.0/3.16/assets/checkbox-unchecked-dark.png index 01eac8d..400df98 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-unchecked-dark.png and b/common/gtk-3.0/3.16/assets/checkbox-unchecked-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-unchecked-dark@2.png b/common/gtk-3.0/3.16/assets/checkbox-unchecked-dark@2.png index cc62ffd..8f69327 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-unchecked-dark@2.png and b/common/gtk-3.0/3.16/assets/checkbox-unchecked-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-unchecked-insensitive-dark.png b/common/gtk-3.0/3.16/assets/checkbox-unchecked-insensitive-dark.png index 0a4c5ef..e41a2b1 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-unchecked-insensitive-dark.png and b/common/gtk-3.0/3.16/assets/checkbox-unchecked-insensitive-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-unchecked-insensitive-dark@2.png b/common/gtk-3.0/3.16/assets/checkbox-unchecked-insensitive-dark@2.png index fc2fed0..4436c3b 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-unchecked-insensitive-dark@2.png and b/common/gtk-3.0/3.16/assets/checkbox-unchecked-insensitive-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-unchecked-insensitive-selected.png b/common/gtk-3.0/3.16/assets/checkbox-unchecked-insensitive-selected.png index e937146..9fa3fcb 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-unchecked-insensitive-selected.png and b/common/gtk-3.0/3.16/assets/checkbox-unchecked-insensitive-selected.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-unchecked-insensitive-selected@2.png b/common/gtk-3.0/3.16/assets/checkbox-unchecked-insensitive-selected@2.png index 9a0e07a..884ee7d 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-unchecked-insensitive-selected@2.png and b/common/gtk-3.0/3.16/assets/checkbox-unchecked-insensitive-selected@2.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-unchecked-selected.png b/common/gtk-3.0/3.16/assets/checkbox-unchecked-selected.png index 53ef897..3c79a87 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-unchecked-selected.png and b/common/gtk-3.0/3.16/assets/checkbox-unchecked-selected.png differ diff --git a/common/gtk-3.0/3.16/assets/checkbox-unchecked-selected@2.png b/common/gtk-3.0/3.16/assets/checkbox-unchecked-selected@2.png index 191ff32..0178b79 100644 Binary files a/common/gtk-3.0/3.16/assets/checkbox-unchecked-selected@2.png and b/common/gtk-3.0/3.16/assets/checkbox-unchecked-selected@2.png differ diff --git a/common/gtk-3.0/3.16/assets/radio-checked-dark.png b/common/gtk-3.0/3.16/assets/radio-checked-dark.png index 84fb0c6..8ec2267 100644 Binary files a/common/gtk-3.0/3.16/assets/radio-checked-dark.png and b/common/gtk-3.0/3.16/assets/radio-checked-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/radio-checked-dark@2.png b/common/gtk-3.0/3.16/assets/radio-checked-dark@2.png index 7ebd4ad..4ce4fd8 100644 Binary files a/common/gtk-3.0/3.16/assets/radio-checked-dark@2.png and b/common/gtk-3.0/3.16/assets/radio-checked-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/radio-checked-insensitive-dark.png b/common/gtk-3.0/3.16/assets/radio-checked-insensitive-dark.png index 04e54f9..b97a676 100644 Binary files a/common/gtk-3.0/3.16/assets/radio-checked-insensitive-dark.png and b/common/gtk-3.0/3.16/assets/radio-checked-insensitive-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/radio-checked-insensitive-dark@2.png b/common/gtk-3.0/3.16/assets/radio-checked-insensitive-dark@2.png index 084470a..a6cf164 100644 Binary files a/common/gtk-3.0/3.16/assets/radio-checked-insensitive-dark@2.png and b/common/gtk-3.0/3.16/assets/radio-checked-insensitive-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/radio-mixed-dark.png b/common/gtk-3.0/3.16/assets/radio-mixed-dark.png index 2df6c2a..fedb1ea 100644 Binary files a/common/gtk-3.0/3.16/assets/radio-mixed-dark.png and b/common/gtk-3.0/3.16/assets/radio-mixed-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/radio-mixed-dark@2.png b/common/gtk-3.0/3.16/assets/radio-mixed-dark@2.png index ae121a3..de7cd2d 100644 Binary files a/common/gtk-3.0/3.16/assets/radio-mixed-dark@2.png and b/common/gtk-3.0/3.16/assets/radio-mixed-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/radio-mixed-insensitive-dark.png b/common/gtk-3.0/3.16/assets/radio-mixed-insensitive-dark.png index d7c512b..e5227c5 100644 Binary files a/common/gtk-3.0/3.16/assets/radio-mixed-insensitive-dark.png and b/common/gtk-3.0/3.16/assets/radio-mixed-insensitive-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/radio-mixed-insensitive-dark@2.png b/common/gtk-3.0/3.16/assets/radio-mixed-insensitive-dark@2.png index d8a7c95..d0e3bcc 100644 Binary files a/common/gtk-3.0/3.16/assets/radio-mixed-insensitive-dark@2.png and b/common/gtk-3.0/3.16/assets/radio-mixed-insensitive-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/radio-unchecked-dark.png b/common/gtk-3.0/3.16/assets/radio-unchecked-dark.png index 6f46a61..b91e016 100644 Binary files a/common/gtk-3.0/3.16/assets/radio-unchecked-dark.png and b/common/gtk-3.0/3.16/assets/radio-unchecked-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/radio-unchecked-dark@2.png b/common/gtk-3.0/3.16/assets/radio-unchecked-dark@2.png index cd741d3..cbc4046 100644 Binary files a/common/gtk-3.0/3.16/assets/radio-unchecked-dark@2.png and b/common/gtk-3.0/3.16/assets/radio-unchecked-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/radio-unchecked-insensitive-dark.png b/common/gtk-3.0/3.16/assets/radio-unchecked-insensitive-dark.png index 4d7905a..1810955 100644 Binary files a/common/gtk-3.0/3.16/assets/radio-unchecked-insensitive-dark.png and b/common/gtk-3.0/3.16/assets/radio-unchecked-insensitive-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/radio-unchecked-insensitive-dark@2.png b/common/gtk-3.0/3.16/assets/radio-unchecked-insensitive-dark@2.png index 089b4d0..fe6d921 100644 Binary files a/common/gtk-3.0/3.16/assets/radio-unchecked-insensitive-dark@2.png and b/common/gtk-3.0/3.16/assets/radio-unchecked-insensitive-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/radio-unchecked-insensitive-selected.png b/common/gtk-3.0/3.16/assets/radio-unchecked-insensitive-selected.png index 0e5cb21..7e5c6e3 100644 Binary files a/common/gtk-3.0/3.16/assets/radio-unchecked-insensitive-selected.png and b/common/gtk-3.0/3.16/assets/radio-unchecked-insensitive-selected.png differ diff --git a/common/gtk-3.0/3.16/assets/radio-unchecked-insensitive-selected@2.png b/common/gtk-3.0/3.16/assets/radio-unchecked-insensitive-selected@2.png index 030e403..40d3fd8 100644 Binary files a/common/gtk-3.0/3.16/assets/radio-unchecked-insensitive-selected@2.png and b/common/gtk-3.0/3.16/assets/radio-unchecked-insensitive-selected@2.png differ diff --git a/common/gtk-3.0/3.16/assets/radio-unchecked-selected.png b/common/gtk-3.0/3.16/assets/radio-unchecked-selected.png index 09cf922..aba589e 100644 Binary files a/common/gtk-3.0/3.16/assets/radio-unchecked-selected.png and b/common/gtk-3.0/3.16/assets/radio-unchecked-selected.png differ diff --git a/common/gtk-3.0/3.16/assets/radio-unchecked-selected@2.png b/common/gtk-3.0/3.16/assets/radio-unchecked-selected@2.png index facb20e..12da542 100644 Binary files a/common/gtk-3.0/3.16/assets/radio-unchecked-selected@2.png and b/common/gtk-3.0/3.16/assets/radio-unchecked-selected@2.png differ diff --git a/common/gtk-3.0/3.16/assets/switch-active-dark.png b/common/gtk-3.0/3.16/assets/switch-active-dark.png index dc16b48..8ff3d4e 100644 Binary files a/common/gtk-3.0/3.16/assets/switch-active-dark.png and b/common/gtk-3.0/3.16/assets/switch-active-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/switch-active-dark@2.png b/common/gtk-3.0/3.16/assets/switch-active-dark@2.png index b992e86..e3f1f94 100644 Binary files a/common/gtk-3.0/3.16/assets/switch-active-dark@2.png and b/common/gtk-3.0/3.16/assets/switch-active-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/switch-active-header-dark.png b/common/gtk-3.0/3.16/assets/switch-active-header-dark.png index 7cab70f..d94d6b6 100644 Binary files a/common/gtk-3.0/3.16/assets/switch-active-header-dark.png and b/common/gtk-3.0/3.16/assets/switch-active-header-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/switch-active-header-dark@2.png b/common/gtk-3.0/3.16/assets/switch-active-header-dark@2.png index e727c33..58d3906 100644 Binary files a/common/gtk-3.0/3.16/assets/switch-active-header-dark@2.png and b/common/gtk-3.0/3.16/assets/switch-active-header-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/switch-active-insensitive-dark.png b/common/gtk-3.0/3.16/assets/switch-active-insensitive-dark.png index 216f8f9..bbd235d 100644 Binary files a/common/gtk-3.0/3.16/assets/switch-active-insensitive-dark.png and b/common/gtk-3.0/3.16/assets/switch-active-insensitive-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/switch-active-insensitive-dark@2.png b/common/gtk-3.0/3.16/assets/switch-active-insensitive-dark@2.png index 2386907..1f3eae9 100644 Binary files a/common/gtk-3.0/3.16/assets/switch-active-insensitive-dark@2.png and b/common/gtk-3.0/3.16/assets/switch-active-insensitive-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/switch-active-insensitive-header-dark.png b/common/gtk-3.0/3.16/assets/switch-active-insensitive-header-dark.png index 7856149..d9d90dd 100644 Binary files a/common/gtk-3.0/3.16/assets/switch-active-insensitive-header-dark.png and b/common/gtk-3.0/3.16/assets/switch-active-insensitive-header-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/switch-active-insensitive-header-dark@2.png b/common/gtk-3.0/3.16/assets/switch-active-insensitive-header-dark@2.png index e1ed561..d274111 100644 Binary files a/common/gtk-3.0/3.16/assets/switch-active-insensitive-header-dark@2.png and b/common/gtk-3.0/3.16/assets/switch-active-insensitive-header-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/switch-dark.png b/common/gtk-3.0/3.16/assets/switch-dark.png index e100e5c..f7bab5d 100644 Binary files a/common/gtk-3.0/3.16/assets/switch-dark.png and b/common/gtk-3.0/3.16/assets/switch-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/switch-dark@2.png b/common/gtk-3.0/3.16/assets/switch-dark@2.png index 59be7d1..895935d 100644 Binary files a/common/gtk-3.0/3.16/assets/switch-dark@2.png and b/common/gtk-3.0/3.16/assets/switch-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/switch-header-dark.png b/common/gtk-3.0/3.16/assets/switch-header-dark.png index eb37281..bda59c1 100644 Binary files a/common/gtk-3.0/3.16/assets/switch-header-dark.png and b/common/gtk-3.0/3.16/assets/switch-header-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/switch-header-dark@2.png b/common/gtk-3.0/3.16/assets/switch-header-dark@2.png index 87ef62e..9011949 100644 Binary files a/common/gtk-3.0/3.16/assets/switch-header-dark@2.png and b/common/gtk-3.0/3.16/assets/switch-header-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/switch-insensitive-dark.png b/common/gtk-3.0/3.16/assets/switch-insensitive-dark.png index 6ea40d6..f81426f 100644 Binary files a/common/gtk-3.0/3.16/assets/switch-insensitive-dark.png and b/common/gtk-3.0/3.16/assets/switch-insensitive-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/switch-insensitive-dark@2.png b/common/gtk-3.0/3.16/assets/switch-insensitive-dark@2.png index 6348480..3fea8f9 100644 Binary files a/common/gtk-3.0/3.16/assets/switch-insensitive-dark@2.png and b/common/gtk-3.0/3.16/assets/switch-insensitive-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/switch-insensitive-header-dark.png b/common/gtk-3.0/3.16/assets/switch-insensitive-header-dark.png index 3091579..2e2a14f 100644 Binary files a/common/gtk-3.0/3.16/assets/switch-insensitive-header-dark.png and b/common/gtk-3.0/3.16/assets/switch-insensitive-header-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/switch-insensitive-header-dark@2.png b/common/gtk-3.0/3.16/assets/switch-insensitive-header-dark@2.png index 22e6449..1cad2eb 100644 Binary files a/common/gtk-3.0/3.16/assets/switch-insensitive-header-dark@2.png and b/common/gtk-3.0/3.16/assets/switch-insensitive-header-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close-active-dark.png b/common/gtk-3.0/3.16/assets/titlebutton-close-active-dark.png index 4df4c2f..4ee7416 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-active-dark.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-active-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close-active-dark@2.png b/common/gtk-3.0/3.16/assets/titlebutton-close-active-dark@2.png index 1882b92..5defeda 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-active-dark@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-active-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close-active.png b/common/gtk-3.0/3.16/assets/titlebutton-close-active.png index 6d2fc72..59fb3fb 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-active.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-active.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close-active@2.png b/common/gtk-3.0/3.16/assets/titlebutton-close-active@2.png index 4e4b471..42838b3 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-active@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-active@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop-dark.png b/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop-dark.png index bf5cba7..969ad86 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop-dark.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop-dark@2.png b/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop-dark@2.png index 6c3d5e3..2edc75e 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop-dark@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop.png b/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop.png index 54690f3..6fc80b5 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop@2.png b/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop@2.png index 01f61f0..f18aee8 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close-dark.png b/common/gtk-3.0/3.16/assets/titlebutton-close-dark.png index d471b6d..f6e901c 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-dark.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close-dark@2.png b/common/gtk-3.0/3.16/assets/titlebutton-close-dark@2.png index 5c5eddf..e73ce97 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-dark@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close-hover-dark.png b/common/gtk-3.0/3.16/assets/titlebutton-close-hover-dark.png index 3349844..4d51bb4 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-hover-dark.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-hover-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close-hover-dark@2.png b/common/gtk-3.0/3.16/assets/titlebutton-close-hover-dark@2.png index 2c7366a..265bc4c 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-hover-dark@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-hover-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close-hover.png b/common/gtk-3.0/3.16/assets/titlebutton-close-hover.png index 157eaac..d076cad 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-hover.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-hover.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close-hover@2.png b/common/gtk-3.0/3.16/assets/titlebutton-close-hover@2.png index 6eb2d20..8c90967 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-hover@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-hover@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close.png b/common/gtk-3.0/3.16/assets/titlebutton-close.png index 4ac9243..1769dc6 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close.png and b/common/gtk-3.0/3.16/assets/titlebutton-close.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close@2.png b/common/gtk-3.0/3.16/assets/titlebutton-close@2.png index e1c4b76..97bf6cf 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-close@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop-dark.png b/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop-dark.png index d4f7166..2b3ceb4 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop-dark.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop-dark@2.png b/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop-dark@2.png index 1945796..1638d56 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop-dark@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop.png b/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop.png index 9440671..c80d889 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop@2.png b/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop@2.png index 523fffc..ff24e85 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-dark.png b/common/gtk-3.0/3.16/assets/titlebutton-max-dark.png index dccb307..ebba44c 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-dark.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-dark@2.png b/common/gtk-3.0/3.16/assets/titlebutton-max-dark@2.png index 225ca11..dc9869a 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-dark@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-hover-dark.png b/common/gtk-3.0/3.16/assets/titlebutton-max-hover-dark.png index 4504709..78561bf 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-hover-dark.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-hover-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-hover-dark@2.png b/common/gtk-3.0/3.16/assets/titlebutton-max-hover-dark@2.png index e910d0b..cfc6075 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-hover-dark@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-hover-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-hover.png b/common/gtk-3.0/3.16/assets/titlebutton-max-hover.png index 1610b34..f333106 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-hover.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-hover.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-hover@2.png b/common/gtk-3.0/3.16/assets/titlebutton-max-hover@2.png index 6a467da..5f7d90a 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-hover@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-hover@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max.png b/common/gtk-3.0/3.16/assets/titlebutton-max.png index d54043f..3112108 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max.png and b/common/gtk-3.0/3.16/assets/titlebutton-max.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max@2.png b/common/gtk-3.0/3.16/assets/titlebutton-max@2.png index 3e9373e..b360efb 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-max@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop-dark.png b/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop-dark.png index 751f194..b04db91 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop-dark.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop-dark@2.png b/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop-dark@2.png index 20bf7c4..d841da2 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop-dark@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop.png b/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop.png index de62aa1..b83cb7d 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop@2.png b/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop@2.png index 434b817..c3f8564 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-dark.png b/common/gtk-3.0/3.16/assets/titlebutton-min-dark.png index b4ab5f7..b5c9732 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-dark.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-dark@2.png b/common/gtk-3.0/3.16/assets/titlebutton-min-dark@2.png index 7cc4467..80d53fe 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-dark@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-hover-dark.png b/common/gtk-3.0/3.16/assets/titlebutton-min-hover-dark.png index a7859cc..2fc70a6 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-hover-dark.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-hover-dark.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-hover-dark@2.png b/common/gtk-3.0/3.16/assets/titlebutton-min-hover-dark@2.png index 57bf18e..ab18607 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-hover-dark@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-hover-dark@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-hover.png b/common/gtk-3.0/3.16/assets/titlebutton-min-hover.png index 8d6b6c3..54858db 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-hover.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-hover.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-hover@2.png b/common/gtk-3.0/3.16/assets/titlebutton-min-hover@2.png index f122bb3..c345277 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-hover@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-hover@2.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min.png b/common/gtk-3.0/3.16/assets/titlebutton-min.png index 029627d..f4b6db0 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min.png and b/common/gtk-3.0/3.16/assets/titlebutton-min.png differ diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min@2.png b/common/gtk-3.0/3.16/assets/titlebutton-min@2.png index 2febb1e..bab2bf2 100644 Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-min@2.png differ 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 d738b0f..cd560eb 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -33,7 +33,7 @@ ***************/ .background { color: #D3DAE3; - background-color: rgba(68, 72, 82, 0.999); } + background-color: rgba(56, 60, 74, 0.999); } /* These wildcard seems unavoidable, need to investigate. @@ -45,16 +45,16 @@ -gtk-image-effect: dim; } .gtkstyle-fallback { - background-color: #444852; + background-color: #383C4A; color: #D3DAE3; } .gtkstyle-fallback:prelight { - background-color: #5b606e; + background-color: #4e5467; color: #D3DAE3; } .gtkstyle-fallback:active { - background-color: #2d3036; + background-color: #22242d; color: #D3DAE3; } .gtkstyle-fallback:insensitive { - background-color: #494d58; + background-color: #3c4150; color: rgba(211, 218, 227, 0.45); } .gtkstyle-fallback:selected { background-color: #5294E2; @@ -62,7 +62,7 @@ .view { color: #D3DAE3; - background-color: #383C45; } + background-color: #404552; } .view.dim-label, .view.label.separator, GtkPlacesSidebar.sidebar .view.label.separator, .header-bar .view.subtitle { color: rgba(211, 218, 227, 0.55); } .view.dim-label:selected, .view.label.separator:selected, .header-bar .view.subtitle:selected, .view.dim-label:selected:focus, .view.label.separator:selected:focus, .header-bar .view.subtitle:selected:focus { @@ -83,12 +83,12 @@ opacity: 0.55; } GtkAssistant .sidebar { - background-color: #383C45; - border-top: 1px solid #2d3036; } + background-color: #404552; + border-top: 1px solid #2b2e39; } GtkAssistant .sidebar:dir(ltr) { - border-right: 1px solid #2d3036; } + border-right: 1px solid #2b2e39; } GtkAssistant .sidebar:dir(rtl) { - border-left: 1px solid #2d3036; } + border-left: 1px solid #2b2e39; } GtkAssistant.csd .sidebar { border-top-style: none; } @@ -101,7 +101,7 @@ GtkAssistant .sidebar .label.highlight { color: #ffffff; } GtkTextView { - background-color: #3e424c; } + background-color: #3c414e; } .grid-child { padding: 3px; @@ -112,7 +112,7 @@ GtkTextView { .popover.osd, .osd { color: #BAC3CF; border: none; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); background-clip: padding-box; outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } @@ -144,9 +144,9 @@ GtkTextView { border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #D3DAE3; - border-color: #2d3036; - background-color: #383c45; - background-image: linear-gradient(to bottom, #383c45); } + border-color: #2b2e39; + background-color: #404552; + background-image: linear-gradient(to bottom, #404552); } .header-bar .entry { padding: 6px; } .entry.image { @@ -155,22 +155,22 @@ GtkTextView { .entry.flat, .entry.flat:focus { padding: 2px; color: #D3DAE3; - border-color: #2d3036; - background-color: #383c45; - background-image: linear-gradient(to bottom, #383c45); + border-color: #2b2e39; + background-color: #404552; + background-image: linear-gradient(to bottom, #404552); border: none; border-radius: 0; } .entry:focus { background-clip: border-box; color: #D3DAE3; border-color: #5294E2; - background-color: #383c45; - background-image: linear-gradient(to bottom, #383c45); } + background-color: #404552; + background-image: linear-gradient(to bottom, #404552); } .entry:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(56, 60, 69, 0.55); - background-image: linear-gradient(to bottom, rgba(56, 60, 69, 0.55)); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(64, 69, 82, 0.55); + background-image: linear-gradient(to bottom, rgba(64, 69, 82, 0.55)); } .entry:selected, .entry:selected:focus { background-color: #5294E2; @@ -198,7 +198,7 @@ GtkTextView { .entry.error { color: white; border-color: #FC4138; - background-image: linear-gradient(to bottom, #d5403b); } + background-image: linear-gradient(to bottom, #d6423d); } .entry.error:focus { background-image: linear-gradient(to bottom, #FC4138); color: white; } @@ -208,7 +208,7 @@ GtkTextView { .entry.warning { color: white; border-color: #F27835; - background-image: linear-gradient(to bottom, #cd6c38); } + background-image: linear-gradient(to bottom, #ce6e3b); } .entry.warning:focus { background-image: linear-gradient(to bottom, #F27835); color: white; } @@ -216,26 +216,26 @@ GtkTextView { background-color: white; color: #F27835; } .entry.image { - color: #b4bac3; } + color: #b6bcc6; } .entry.image:hover { color: #D3DAE3; } .entry.image:active { color: #5294E2; } .linked.vertical > .entry { - border-bottom-color: #353841; + border-bottom-color: #3a3e4a; box-shadow: none; } .linked.vertical > .entry:focus { border-color: #5294E2; box-shadow: 0 -1px 0 0 #5294E2; } .linked.vertical > .entry:insensitive { - border-bottom-color: #353841; } + border-bottom-color: #3a3e4a; } .linked.vertical > .entry:first-child { - border-bottom-color: #353841; } + border-bottom-color: #3a3e4a; } .linked.vertical > .entry:first-child:focus { border-bottom-color: #5294E2; box-shadow: none; } .linked.vertical > .entry:first-child:insensitive { - border-bottom-color: #353841; } + border-bottom-color: #3a3e4a; } .linked.vertical > .entry:last-child { border-bottom-color: rgba(0, 0, 0, 0.14); } .linked.vertical > .entry:last-child:focus { @@ -245,17 +245,18 @@ GtkTextView { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.35); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.35)); + background-color: transparent; } + .osd .entry.image, .osd .entry.image:hover { + color: inherit; } .osd .entry:focus { - color: #BAC3CF; - border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } GtkSearchEntry.entry { border-radius: 20px; } @@ -276,15 +277,15 @@ GtkSearchEntry.entry { padding: 5px 8px; color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } .header-bar .button { padding: 6px 11px; } .button.flat { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(68, 72, 82, 0); + background-color: rgba(56, 60, 74, 0); transition: none; } .button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); @@ -294,14 +295,14 @@ GtkSearchEntry.entry { .button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; + border-color: #2b2e39; + background-color: #505666; -gtk-image-effect: highlight; } .button:active, .button:checked { - background-clip: border-box; + background-clip: padding-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; transition-duration: 50ms; } .button:active { @@ -314,8 +315,8 @@ GtkSearchEntry.entry { background-image: none; } .button:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } .button:insensitive > GtkLabel { color: inherit; } .button:insensitive:active, .button:insensitive:checked { @@ -329,31 +330,31 @@ GtkSearchEntry.entry { 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); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); + background-color: rgba(53, 57, 69, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); - background-color: rgba(42, 44, 51, 0.95); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); + background-color: rgba(53, 57, 69, 0.95); } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .button.osd:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .osd .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -375,17 +376,17 @@ GtkSearchEntry.entry { .osd .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .osd .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .osd .button.flat { border-color: transparent; background-color: transparent; @@ -394,12 +395,12 @@ GtkSearchEntry.entry { .osd .button.flat:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .osd .button.flat:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; @@ -526,23 +527,23 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } .inline-toolbar GtkToolButton > .button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } .inline-toolbar GtkToolButton > .button:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } .inline-toolbar GtkToolButton > .button:insensitive > GtkLabel { color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active, @@ -568,7 +569,15 @@ GtkSearchEntry.entry { GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .button:hover, .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .button:hover:dir(ltr) { - box-shadow: inset 1px 0 #5294E2, inset -1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5), inset -1px 0 rgba(43, 46, 57, 0.5); } + .inline-toolbar GtkToolButton > .button.flat:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active, + GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .button:active, .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .button:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked, + GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .button:checked, .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .button:checked:dir(ltr) { + box-shadow: none; } .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl), .header-bar .linked.stack-switcher > .button:dir(rtl), @@ -585,7 +594,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:first-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .button:first-child:hover, .linked > GtkComboBox:first-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover, .header-bar .linked.stack-switcher > .button:first-child:hover, .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { - box-shadow: inset -1px 0 #5294E2; } + box-shadow: inset -1px 0 rgba(43, 46, 57, 0.5); } + .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active, + .inline-toolbar GtkToolButton:first-child > .button.flat:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .button:first-child:active, .linked > GtkComboBox:first-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked, + .inline-toolbar GtkToolButton:first-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .button:first-child:checked, .linked > GtkComboBox:first-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } .osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button, .primary-toolbar .linked.stack-switcher > .button:last-child, @@ -597,7 +614,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:last-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .button:last-child:hover, .linked > GtkComboBox:last-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover, .header-bar .linked.stack-switcher > .button:last-child:hover, .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { - box-shadow: inset 1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5); } + .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active, + .inline-toolbar GtkToolButton:last-child > .button.flat:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .button:last-child:active, .linked > GtkComboBox:last-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked, + .inline-toolbar GtkToolButton:last-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .button:last-child:checked, .linked > GtkComboBox:last-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl), .header-bar .linked.stack-switcher > .button:last-child:dir(rtl), @@ -615,6 +640,14 @@ GtkSearchEntry.entry { .header-bar .linked.stack-switcher > .button:only-child:hover, .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { box-shadow: none; } + .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active, + .inline-toolbar GtkToolButton:only-child > .button.flat:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .button:only-child:active, .linked > GtkComboBox:only-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked, + .inline-toolbar GtkToolButton:only-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .button:only-child:checked, .linked > GtkComboBox:only-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button, .linked.vertical > .button:hover, @@ -628,7 +661,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:hover, .linked.vertical > .button:hover, .linked.vertical > GtkComboBoxText > .button:hover, .linked.vertical > GtkComboBox > .button:hover { - box-shadow: inset 0 1px #5294E2, inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(43, 46, 57, 0.5), inset 0 1px rgba(43, 46, 57, 0.5); } + .linked.vertical > .entry:active, .linked.vertical > .button:active, + .linked.vertical > GtkComboBoxText > .button:active, + .linked.vertical > GtkComboBox > .button:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked, + .linked.vertical > GtkComboBoxText > .button:checked, + .linked.vertical > GtkComboBox > .button:checked { + box-shadow: none; } .linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, @@ -638,7 +677,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover, .linked.vertical > GtkComboBoxText:first-child > .button:hover, .linked.vertical > GtkComboBox:first-child > .button:hover { - box-shadow: inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(43, 46, 57, 0.5); } + .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active, + .linked.vertical > GtkComboBoxText:first-child > .button:active, + .linked.vertical > GtkComboBox:first-child > .button:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked, + .linked.vertical > GtkComboBoxText:first-child > .button:checked, + .linked.vertical > GtkComboBox:first-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, @@ -648,7 +693,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover, .linked.vertical > GtkComboBoxText:last-child > .button:hover, .linked.vertical > GtkComboBox:last-child > .button:hover { - box-shadow: inset 0 1px #5294E2; } + box-shadow: inset 0 1px rgba(43, 46, 57, 0.5); } + .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active, + .linked.vertical > GtkComboBoxText:last-child > .button:active, + .linked.vertical > GtkComboBox:last-child > .button:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked, + .linked.vertical > GtkComboBoxText:last-child > .button:checked, + .linked.vertical > GtkComboBox:last-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, @@ -659,6 +710,12 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBoxText:only-child > .button:hover, .linked.vertical > GtkComboBox:only-child > .button:hover { box-shadow: none; } + .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active, + .linked.vertical > GtkComboBoxText:only-child > .button:active, + .linked.vertical > GtkComboBox:only-child > .button:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked, + .linked.vertical > GtkComboBoxText:only-child > .button:checked, + .linked.vertical > GtkComboBox:only-child > .button:checked { + box-shadow: none; } .menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, @@ -674,7 +731,7 @@ GtkSearchEntry.entry { outline-offset: -1px; border-radius: 2px; } .menuitem.button.flat:hover { - background-color: #4b4f59; } + background-color: #484c59; } .menuitem.button.flat:checked { color: #D3DAE3; } @@ -706,17 +763,15 @@ GtkSearchEntry.entry { border-radius: 3px; } .spinbutton .button { background-image: none; - border: 1px solid rgba(45, 48, 54, 0.6); + border: 1px solid rgba(43, 46, 57, 0.6); border-style: none none none solid; - color: #cbd2db; + color: #ccd3dc; border-radius: 0; box-shadow: none; } .spinbutton .button:dir(rtl) { border-style: none solid none none; } .spinbutton .button:first-child { color: red; } - .spinbutton .button:hover { - color: #5294E2; } .spinbutton .button:insensitive { color: rgba(211, 218, 227, 0.45); } .spinbutton .button:active { @@ -725,43 +780,43 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child, .spinbutton.vertical:dir(rtl) .button:first-child { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } .spinbutton.vertical .button:first-child:insensitive, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } .spinbutton.vertical .button:first-child:insensitive > GtkLabel, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive > GtkLabel { color: inherit; } .spinbutton.vertical .button:last-child, .spinbutton.vertical:dir(rtl) .button:last-child { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } .spinbutton.vertical .button:last-child:insensitive, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } .spinbutton.vertical .button:last-child:insensitive > GtkLabel, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive > GtkLabel { color: inherit; } .spinbutton.vertical.entry, .spinbutton.vertical:dir(rtl).entry { @@ -800,16 +855,15 @@ GtkComboBox { border-left-style: none; } GtkComboBox.combobox-entry .button { color: rgba(211, 218, 227, 0.6); - background-color: #2d3036; - border-color: #2d3036; } + background-color: #2b2e39; + border-color: #2b2e39; } GtkComboBox.combobox-entry .button:hover { - background-color: #383c44; - border-color: #5294E2; - box-shadow: -1px 0 #5294E2; } + background-color: #363a47; + border-color: #363a47; } GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } GtkComboBox.combobox-entry .button:insensitive { opacity: 0.5; } @@ -820,40 +874,40 @@ GtkComboBox { .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; - background-color: #444852; } + background-color: #383C4A; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: 1px solid rgba(0, 0, 0, 0.6); + border: 1px solid rgba(0, 0, 0, 0.5); border-radius: 3px; - background-color: rgba(42, 44, 51, 0.85); } + background-color: rgba(53, 57, 69, 0.85); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; + background-color: #2f343f; box-shadow: none; border-width: 0 0 1px 0; border-style: solid; - border-image: linear-gradient(to bottom, #2f343b, rgba(31, 34, 39, 0.97)) 1 0 1 0; } + border-image: linear-gradient(to bottom, #2f343f, rgba(32, 35, 43, 0.97)) 1 0 1 0; } .primary-toolbar:backdrop { - background-color: #32383f; } + background-color: #323843; } .inline-toolbar { - background-color: #3d414a; + background-color: #313541; border-style: solid; - border-color: #2d3036; + border-color: #2b2e39; border-width: 0 1px 1px; padding: 3px; border-radius: 0 0 3px 3px; } .search-bar { - background-color: #444852; + background-color: #383C4A; border-style: solid; - border-color: #2d3036; + border-color: #2b2e39; border-width: 0 0 1px; padding: 3px; } .action-bar { - background-color: #3d414a; } + background-color: #313541; } /*************** * Header bars * @@ -863,16 +917,16 @@ GtkComboBox { border-width: 0 0 1px; border-style: solid; border-radius: 0; - border-color: rgba(36, 39, 45, 0.97); + border-color: rgba(38, 42, 51, 0.97); color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; } + background-color: #2f343f; } .csd .header-bar { - background-color: rgba(47, 52, 59, 0.97); } + background-color: rgba(47, 52, 63, 0.97); } .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); - background-color: #32383f; } + background-color: #323843; } .csd .header-bar:backdrop { - background-color: rgba(50, 56, 63, 0.97); } + background-color: rgba(50, 56, 67, 0.97); } .header-bar .title { padding: 0px 12px; } .header-bar .subtitle { @@ -943,35 +997,35 @@ GtkComboBox { .maximized .header-bar, .maximized .header-bar:backdrop { border-radius: 0; } .maximized .header-bar { - background-color: #2f343b; } + background-color: #2f343f; } .maximized .header-bar:backdrop { - background-color: #32383f; } + background-color: #323843; } .header-bar.default-decoration { padding-top: 5px; padding-bottom: 5px; - background-color: #2f343b; + background-color: #2f343f; border-bottom-width: 0; } .header-bar.default-decoration:backdrop { - background-color: #32383f; } + background-color: #323843; } .titlebar { padding-left: 7px; padding-right: 7px; border-radius: 3px 3px 0 0; color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; - box-shadow: inset 0 1px rgba(54, 60, 68, 0.97); } + background-color: #2f343f; + box-shadow: inset 0 1px rgba(54, 59, 72, 0.97); } .csd .titlebar { - background-color: rgba(47, 52, 59, 0.97); } + background-color: rgba(47, 52, 63, 0.97); } .titlebar:backdrop { color: rgba(207, 218, 231, 0.5); - background-color: #32383f; } + background-color: #323843; } .csd .titlebar:backdrop { - background-color: rgba(50, 56, 63, 0.97); } + background-color: rgba(50, 56, 67, 0.97); } .maximized .titlebar { - background-color: #2f343b; } + background-color: #2f343f; } .maximized .titlebar:backdrop { - background-color: #32383f; } + background-color: #323843; } .titlebar .titlebar, .titlebar .titlebar:backdrop { @@ -989,8 +1043,8 @@ GtkComboBox { .primary-toolbar .entry, .header-bar .entry { color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } .primary-toolbar .entry.image, .header-bar .entry.image, .primary-toolbar .entry.image:hover, .header-bar .entry.image:hover { color: inherit; } @@ -998,13 +1052,14 @@ GtkComboBox { opacity: 0.85; } .primary-toolbar .entry:focus, .header-bar .entry:focus { color: #ffffff; - border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); + background-clip: padding-box; } .primary-toolbar .entry:focus.image, .header-bar .entry:focus.image { color: #ffffff; } .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus { background-color: #ffffff; color: #5294E2; } @@ -1017,24 +1072,25 @@ GtkComboBox { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); outline-offset: -3px; - background-color: rgba(47, 52, 59, 0); - border-color: rgba(47, 52, 59, 0); } + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .primary-toolbar .button:backdrop, .header-bar .button:backdrop { opacity: 0.7; } .primary-toolbar .button:hover, .header-bar .button:hover { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: rgba(29, 32, 36, 0.97); - background-color: rgba(40, 44, 50, 0.87); } + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } .primary-toolbar .button:active, .header-bar .button:active, .primary-toolbar .button:checked, .header-bar .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; - background-color: #5294E2; } + border-color: transparent; + background-color: #5294E2; + background-clip: padding-box; } .primary-toolbar .button:insensitive, .header-bar .button:insensitive { color: rgba(207, 218, 231, 0.35); - background-color: rgba(47, 52, 59, 0); - border-color: rgba(47, 52, 59, 0); } + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .primary-toolbar .button:insensitive > GtkLabel, .header-bar .button:insensitive > GtkLabel { color: inherit; } .primary-toolbar .button:insensitive:active, .header-bar .button:insensitive:active, .primary-toolbar .button:insensitive:checked, .header-bar .button:insensitive:checked { @@ -1054,12 +1110,12 @@ GtkComboBox { .primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: rgba(29, 32, 36, 0.97); - background-color: rgba(40, 44, 50, 0.87); } + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { - border-color: #5294E2; } + background-color: rgba(134, 144, 165, 0.37); } .primary-toolbar .linked.stack-switcher > .button:active, .header-bar .linked.stack-switcher > .button:active, .primary-toolbar .linked.stack-switcher > .button:checked, @@ -1067,8 +1123,52 @@ GtkComboBox { .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } + .primary-toolbar .linked.stack-switcher > .button:insensitive, + .header-bar .linked.stack-switcher > .button:insensitive, + .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive { + color: rgba(207, 218, 231, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:hover, + .header-bar .linked.stack-switcher > .button:hover, + .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:first-child:hover, + .header-bar .linked.stack-switcher > .button:first-child:hover, + .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:last-child:hover, + .header-bar .linked.stack-switcher > .button:last-child:hover, + .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:hover, + .header-bar .linked.stack-switcher > .button:only-child:hover, + .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked { + box-shadow: none; } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; @@ -1162,24 +1262,25 @@ GtkComboBox { .primary-toolbar GtkComboBox.combobox-entry .button, .header-bar GtkComboBox.combobox-entry .button { color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } .primary-toolbar GtkComboBox.combobox-entry .button.image, .header-bar GtkComboBox.combobox-entry .button.image, .primary-toolbar GtkComboBox.combobox-entry .button.image:hover, .header-bar GtkComboBox.combobox-entry .button.image:hover { color: inherit; } .primary-toolbar GtkComboBox.combobox-entry .button:hover, .header-bar GtkComboBox.combobox-entry .button:hover { color: #ffffff; - border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); + box-shadow: none; } .primary-toolbar GtkComboBox.combobox-entry .button:insensitive, .header-bar GtkComboBox.combobox-entry .button:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } .primary-toolbar GtkProgressBar.trough, .header-bar GtkProgressBar.trough, .primary-toolbar .level-bar.trough, .header-bar .level-bar.trough { - background-color: rgba(207, 218, 231, 0.15); } + background-color: rgba(21, 23, 28, 0.37); } .primary-toolbar GtkProgressBar:backdrop, .header-bar GtkProgressBar:backdrop { opacity: 0.75; } @@ -1188,14 +1289,22 @@ GtkComboBox { opacity: 0.75; } .primary-toolbar .scale.trough, .header-bar .scale.trough { - background-image: linear-gradient(to bottom, rgba(207, 218, 231, 0.15)); } + background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.37)); } .primary-toolbar .scale.trough:insensitive, .header-bar .scale.trough:insensitive { - background-image: linear-gradient(to bottom, rgba(207, 218, 231, 0.1)); } + background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.27)); } .primary-toolbar .scale.slider, .header-bar .scale.slider { - background-image: linear-gradient(to bottom, rgba(55, 59, 68, 0.997)); } + background-image: linear-gradient(to bottom, #454c5c); + border-color: rgba(21, 23, 28, 0.67); } + .primary-toolbar .scale.slider:hover, .header-bar .scale.slider:hover { + background-image: linear-gradient(to bottom, #50586b); + border-color: rgba(21, 23, 28, 0.67); } + .primary-toolbar .scale.slider:active, .header-bar .scale.slider:active { + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .primary-toolbar .scale.slider:insensitive, .header-bar .scale.slider:insensitive { - background-image: linear-gradient(to bottom, rgba(51, 55, 63, 0.982)); } + background-image: linear-gradient(to bottom, rgba(63, 69, 84, 0.991)); + border-color: rgba(21, 23, 28, 0.67); } /************ * Pathbars * @@ -1239,7 +1348,7 @@ GtkTreeView.view { border-color: #93b7e3; } GtkTreeView.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); - color: #868b94; } + color: #8a909b; } GtkTreeView.view.expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } GtkTreeView.view.expander:hover { @@ -1259,13 +1368,13 @@ GtkTreeView.view { background-color: #ffffff; } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #D3DAE3; - background-color: #2d3036; + background-color: #2b2e39; border-radius: 3px; border-width: 0; } column-header .button { - color: #b4bac3; - background-color: #383C45; } + color: #b6bcc6; + background-color: #404552; } column-header .button:hover { color: #5294E2; box-shadow: none; @@ -1282,7 +1391,7 @@ column-header:last-child.button { column-header.button.dnd, column-header .button.dnd, column-header.button.dnd:active, column-header.button.dnd:selected, column-header.button.dnd:hover { transition: none; color: #5294E2; - box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #383C45, inset -1px 0 #383C45; } + box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #404552, inset -1px 0 #404552; } column-header .button, column-header .button:hover, column-header .button:active { padding: 3px 6px; @@ -1291,11 +1400,11 @@ column-header .button, column-header .button:hover, column-header .button:active border-radius: 0; border-image: linear-gradient(to bottom, rgba(255, 255, 255, 0) 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, rgba(255, 255, 255, 0) 80%) 0 1 0 0/0 1px 0 0 stretch; } column-header .button:active, column-header .button:hover { - background-color: #383C45; } + background-color: #404552; } column-header .button:active:hover { color: #D3DAE3; } column-header .button:insensitive { - border-color: #444852; + border-color: #383C4A; background-image: none; } /********* @@ -1304,10 +1413,10 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar { -GtkWidget-window-dragging: true; padding: 0px; - background-color: #2f343b; + background-color: #2f343f; color: rgba(207, 218, 231, 0.8); } .menubar:backdrop { - background-color: #32383f; } + background-color: #323843; } .menubar > .menuitem { padding: 6px 8px; border: solid transparent; @@ -1323,8 +1432,8 @@ column-header .button, column-header .button:hover, column-header .button:active margin: 4px; padding: 0; border-radius: 0; - background-color: #383C45; - border: 1px solid #2d3036; } + background-color: #383C4A; + border: 1px solid #2b2e39; } .csd .menu, .csd .popup { padding: 4px 0px; border-radius: 2px; @@ -1339,7 +1448,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem:insensitive, .popup .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { - color: rgba(56, 60, 69, 0); } + color: rgba(64, 69, 82, 0); } .menu .menuitem.arrow, .popup .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { @@ -1348,11 +1457,11 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none; border-radius: 0; } .menu.button.top, .popup.button.top { - border-bottom: 1px solid #484c55; } + border-bottom: 1px solid #4f5461; } .menu.button.bottom, .popup.button.bottom { - border-top: 1px solid #484c55; } + border-top: 1px solid #4f5461; } .menu.button:hover, .popup.button:hover { - background-color: #484c55; } + background-color: #4f5461; } .menu.button:insensitive, .popup.button:insensitive { color: transparent; background-color: transparent; @@ -1366,13 +1475,13 @@ column-header .button, column-header .button:hover, column-header .button:active ************/ .popover { padding: 2px; - border: 1px solid #212328; + border: 1px solid #20222a; border-radius: 3px; background-clip: border-box; - background-color: #383C45; + background-color: #383C4A; box-shadow: 0 2px 6px 1px rgba(0, 0, 0, 0.35); } .popover .separator, .popover GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .popover .view.separator { - color: rgba(56, 60, 69, 0); } + color: rgba(64, 69, 82, 0); } .popover > .list, .popover > .view, .popover > .toolbar, @@ -1400,7 +1509,7 @@ column-header .button, column-header .button:hover, column-header .button:active *****************/ .notebook { padding: 0; - background-color: #383C45; + background-color: #404552; -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; @@ -1410,7 +1519,7 @@ column-header .button, column-header .button:hover, column-header .button:active -GtkWidget-focus-line-width: 0; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } .notebook.frame { - border: 1px solid #2d3036; } + border: 1px solid #2b2e39; } .notebook.frame.top { border-top-width: 0; } .notebook.frame.bottom { @@ -1420,9 +1529,9 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.frame.left { border-left-width: 0; } .notebook.header { - background-color: #444852; } + background-color: #383C4A; } .notebook.header.frame { - border: 0px solid #2d3036; } + border: 0px solid #2b2e39; } .notebook.header.frame.top { border-bottom-width: 0; } .notebook.header.frame.bottom { @@ -1432,13 +1541,13 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.header.frame.left { border-right-width: 0; } .notebook.header.top { - box-shadow: inset 0 -1px #2d3036; } + box-shadow: inset 0 -1px #2b2e39; } .notebook.header.bottom { - box-shadow: inset 0 1px #2d3036; } + box-shadow: inset 0 1px #2b2e39; } .notebook.header.right { - box-shadow: inset 1px 0 #2d3036; } + box-shadow: inset 1px 0 #2b2e39; } .notebook.header.left { - box-shadow: inset -1px 0 #2d3036; } + box-shadow: inset -1px 0 #2b2e39; } .notebook tab { border-width: 0; border-style: solid; @@ -1459,52 +1568,52 @@ column-header .button, column-header .button:hover, column-header .button:active border-width: 0; border-top-width: 2px; border-color: transparent; - background-color: rgba(56, 60, 69, 0); } + background-color: rgba(64, 69, 82, 0); } .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page, .notebook tab.top:hover, .notebook tab.top.prelight-page { - background-color: rgba(56, 60, 69, 0.5); - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: rgba(64, 69, 82, 0.5); + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.top:active, .notebook tab.top.active-page, .notebook tab.top.active-page:hover { - background-color: #383C45; - box-shadow: inset 0 1px #2d3036, inset 0 -1px #383C45, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: #404552; + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #404552, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.bottom, .notebook tab.bottom { padding-bottom: 6px; border-radius: 0 0 2px 3.5px; border-width: 0; border-bottom-width: 2px; border-color: transparent; - background-color: rgba(56, 60, 69, 0); } + background-color: rgba(64, 69, 82, 0); } .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page { - background-color: rgba(56, 60, 69, 0.5); - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: rgba(64, 69, 82, 0.5); + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.bottom:active, .notebook tab.bottom.active-page, .notebook tab.bottom.active-page:hover { - background-color: #383C45; - box-shadow: inset 0 -1px #383C45, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: #404552; + box-shadow: inset 0 -1px #404552, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.right, .notebook tab.right { padding-right: 17px; border-radius: 0 3.5px 3.5px 0; border-width: 0; border-right-width: 2px; border-color: transparent; - background-color: rgba(56, 60, 69, 0); } + background-color: rgba(64, 69, 82, 0); } .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page { - background-color: rgba(56, 60, 69, 0.5); - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: rgba(64, 69, 82, 0.5); + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.right:active, .notebook tab.right.active-page, .notebook tab.right.active-page:hover { - background-color: #383C45; - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #383C45, inset -1px 0 #2d3036; } + background-color: #404552; + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #404552, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.left, .notebook tab.left { padding-left: 17px; border-radius: 3.5px 0 0 3.5px; border-width: 0; border-left-width: 2px; border-color: transparent; - background-color: rgba(56, 60, 69, 0); } + background-color: rgba(64, 69, 82, 0); } .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page { - background-color: rgba(56, 60, 69, 0.5); - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: rgba(64, 69, 82, 0.5); + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.left:active, .notebook tab.left.active-page, .notebook tab.left.active-page:hover { - background-color: #383C45; - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #383C45; } + background-color: #404552; + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #404552; } .notebook tab GtkLabel { padding: 0 2px; color: rgba(211, 218, 227, 0.45); } @@ -1514,7 +1623,7 @@ column-header .button, column-header .button:hover, column-header .button:active color: #D3DAE3; } .notebook tab .button { padding: 0; - color: #a1a7b0; } + color: #9da3ad; } .notebook tab .button:hover { color: #ff4d4d; } .notebook tab .button:active { @@ -1548,7 +1657,7 @@ column-header .button, column-header .button:hover, column-header .button:active -GtkRange-slider-width: 6px; } .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { margin: 0; - background-color: #a8aeb7; + background-color: #a5abb5; border: 1px solid rgba(0, 0, 0, 0.3); background-clip: padding-box; } .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .trough { @@ -1564,12 +1673,12 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbar.overlay-indicator.hovering { opacity: 0.99; } .scrollbar .trough { - background-color: #363a42; - border: 1px none #2d3036; } + background-color: #3e434f; + border: 1px none #2b2e39; } .scrollbar .slider { - background-color: #7d828c; } + background-color: #767b87; } .scrollbar .slider:hover { - background-color: #6f747e; } + background-color: #676b78; } .scrollbar .slider:prelight:active { background-color: #5294E2; } .scrollbar .slider:insensitive { @@ -1604,8 +1713,8 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbars-junction, .scrollbars-junction.frame { border-color: transparent; - border-image: linear-gradient(to bottom, #2d3036 1px, transparent 1px) 0 0 0 1/0 1px stretch; - background-color: #363a42; } + border-image: linear-gradient(to bottom, #2b2e39 1px, transparent 1px) 0 0 0 1/0 1px stretch; + background-color: #3e434f; } .scrollbars-junction:dir(rtl), .scrollbars-junction.frame:dir(rtl) { border-image-slice: 0 1 0 0; } @@ -1832,21 +1941,21 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { margin: 3px; } .scale.slider { background-clip: border-box; - background-image: linear-gradient(to bottom, #383c45); - border: 1px solid #5294E2; + background-image: linear-gradient(to bottom, #444a58); + border: 1px solid #262933; border-radius: 50%; box-shadow: none; } .scale.slider:hover { - background-image: linear-gradient(to bottom, #5294E2); - border-color: #5294E2; } + background-image: linear-gradient(to bottom, #505666); + border-color: #262933; } .scale.slider:insensitive { - background-image: linear-gradient(to bottom, #3d414b); - border-color: #4c72a1; } + background-image: linear-gradient(to bottom, #3c414e); + border-color: rgba(38, 41, 51, 0.8); } .scale.slider:active { - background-image: linear-gradient(to bottom, #2679db); - border-color: #2679db; } + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(42, 44, 51, 0.95)); + background-image: linear-gradient(to bottom, rgba(53, 57, 69, 0.95)); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1868,15 +1977,15 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough { border: none; border-radius: 2.5px; - background-image: linear-gradient(to bottom, #2f323a); } + background-image: linear-gradient(to bottom, #2d303b); } .scale.trough.highlight { background-image: linear-gradient(to bottom, #5294E2); } .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, rgba(82, 148, 226, 0.55)); } .scale.trough:insensitive { - background-image: linear-gradient(to bottom, rgba(47, 50, 58, 0.55)); } + background-image: linear-gradient(to bottom, rgba(45, 48, 59, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, rgba(58, 62, 70, 0.95)); + background-image: linear-gradient(to bottom, rgba(69, 74, 89, 0.95)); outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; @@ -1916,7 +2025,7 @@ GtkProgressBar { GtkProgressBar.trough, .level-bar.trough { border: none; border-radius: 3px; - background-color: #2f323a; } + background-color: #2d303b; } GtkProgressBar.trough.osd, .osd.level-bar.trough { border-style: none; background-color: transparent; @@ -1952,14 +2061,14 @@ GtkLevelBar.vertical { border-color: #F27835; background-color: #F27835; } .level-bar.fill-block.empty-fill-block { - background-color: rgba(211, 218, 227, 0.2); - border-color: rgba(211, 218, 227, 0.2); } + background-color: #404552; + border-color: #404552; } /********** * Frames * **********/ .frame { - border: 1px solid #2d3036; + border: 1px solid #2b2e39; padding: 0; } .frame.flat { border-style: none; } @@ -1985,8 +2094,8 @@ GtkScrolledWindow GtkViewport.frame { * Lists * *********/ .list, .list-row { - background-color: #383C45; - border-color: #2d3036; } + background-color: #404552; + border-color: #2b2e39; } .list-row, .grid-child { @@ -2023,18 +2132,18 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame { padding: 10px; color: #BAC3CF; - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(53, 57, 69, 0.95); 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: rgba(31, 33, 40, 0.95); } .app-notification .button, .app-notification.frame .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } @@ -2042,8 +2151,8 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { @@ -2053,9 +2162,9 @@ GtkScrolledWindow GtkViewport.frame { background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } /************* * Expanders * @@ -2074,7 +2183,7 @@ GtkScrolledWindow GtkViewport.frame { ***********/ GtkCalendar { color: #D3DAE3; - border: 1px solid #2d3036; + border: 1px solid #2b2e39; border-radius: 3px; padding: 2px; } GtkCalendar:selected { @@ -2087,8 +2196,9 @@ GtkCalendar { border-radius: 0; } GtkCalendar.button, GtkCalendar.button:focus { color: rgba(211, 218, 227, 0.45); - box-shadow: none; - border: none; } + border-color: transparent; + background-color: transparent; + background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #D3DAE3; } GtkCalendar.highlight { @@ -2103,8 +2213,8 @@ GtkCalendar { .message-dialog { -GtkDialog-button-spacing: 0; } .message-dialog .titlebar { - background-color: rgba(47, 52, 59, 0.97); - border-bottom: 1px solid rgba(31, 34, 39, 0.97); } + background-color: rgba(47, 52, 63, 0.97); + border-bottom: 1px solid rgba(32, 35, 43, 0.97); } .message-dialog.csd.background { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; @@ -2126,19 +2236,19 @@ GtkCalendar { border-bottom-left-radius: 3px; } GtkFileChooserDialog .search-bar { - background-color: #444852; - border-color: #2d3036; + background-color: #383C4A; + border-color: #2b2e39; box-shadow: none; } GtkFileChooserDialog .dialog-action-box { - border-top: 1px solid #2d3036; } + border-top: 1px solid #2b2e39; } /*********** * Sidebar * ***********/ .sidebar { border: none; - background-color: #444852; } + background-color: #383C4A; } .sidebar:selected { background-color: #5294E2; } @@ -2165,7 +2275,7 @@ GtkPaned { margin-right: 0; margin-left: 8px; } GtkPaned .pane-separator { - background-color: #2d3036; } + background-color: #2b2e39; } GtkPaned.wide { -GtkPaned-handle-size: 5; @@ -2173,7 +2283,7 @@ GtkPaned.wide { GtkPaned.wide .pane-separator { background-color: transparent; border-style: none solid; - border-color: #2d3036; + border-color: #2b2e39; border-width: 1px; } GtkPaned.wide.vertical .pane-separator { border-style: solid none; } @@ -2229,7 +2339,7 @@ GtkInfoBar { color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2295,13 +2405,13 @@ GtkColorSwatch#add-color-button { border-width: 1px; color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } GtkColorSwatch#add-color-button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } GtkColorSwatch#add-color-button .overlay { border-color: transparent; background-color: transparent; @@ -2320,8 +2430,8 @@ GtkColorButton.button { .scale-popup .button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } GtkVolumeButton.button { padding: 8px; } @@ -2332,11 +2442,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px rgba(31, 34, 39, 0.97), 0 4px 8px 1px rgba(0, 0, 0, 0.65); + box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.35); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px rgba(31, 34, 39, 0.97), 0 4px 5px 2px rgba(0, 0, 0, 0.55); } + box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } .window-frame.ssd { @@ -2346,7 +2456,7 @@ GtkVolumeButton.button { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; - box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #212429; } + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } .window-frame.csd.tooltip { border-radius: 2px; box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.55); } @@ -2355,7 +2465,7 @@ GtkVolumeButton.button { .window-frame.solid-csd { border-radius: 0; margin: 1px; - background-color: rgba(47, 52, 59, 0.97); + background-color: rgba(47, 52, 63, 0.97); box-shadow: none; } .header-bar.default-decoration .button.titlebutton, @@ -2369,20 +2479,20 @@ GtkVolumeButton.button { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 59, 0); + background-color: rgba(47, 52, 63, 0); border-width: 0; } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: rgba(29, 32, 36, 0.97); - background-color: rgba(40, 44, 50, 0.87); } + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } .header-bar .button.titlebutton:active, .header-bar .button.titlebutton:checked, .titlebar .button.titlebutton:active, .titlebar .button.titlebutton:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } .header-bar .button.titlebutton.close, .header-bar .button.titlebutton.maximize, @@ -2556,7 +2666,7 @@ TerminalWindow .notebook tab.top:active, TerminalWindow .notebook tab.top.active-page, TerminalWindow .notebook tab.top.active-page:hover, PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top:active, PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top.active-page, PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top.active-page:hover, PantheonTerminalPantheonTerminalWindow .notebook tab.top:active, PantheonTerminalPantheonTerminalWindow .notebook tab.top.active-page, PantheonTerminalPantheonTerminalWindow .notebook tab.top.active-page:hover { - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } TerminalWindow .notebook tab.reorderable-page.top, TerminalWindow .notebook tab.top, @@ -2566,10 +2676,10 @@ PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top, Panth TerminalWindow .notebook.header.top, PantheonTerminalPantheonTerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #24272d, inset 0 -1px #2d3036; } + box-shadow: inset 0 1px #262a33, inset 0 -1px #2b2e39; } GtkHTML { - background-color: #383C45; + background-color: #404552; color: #D3DAE3; } GtkHTML:active { color: #ffffff; @@ -2605,7 +2715,7 @@ NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { .nautilus-canvas-item.label.separator, GtkPlacesSidebar.sidebar .nautilus-canvas-item.label.view.separator, .header-bar .nautilus-canvas-item.subtitle, .nautilus-list-dim-label { - color: #8c919b; } + color: #868b97; } .nautilus-canvas-item.dim-label:selected, .nautilus-canvas-item.label.separator:selected, .header-bar .nautilus-canvas-item.subtitle:selected, @@ -2616,7 +2726,7 @@ GtkPlacesSidebar.sidebar .nautilus-canvas-item.label.view.separator, .header-bar color: #dceaf9; } NautilusNotebook.notebook { - background-color: #383C45; } + background-color: #404552; } NautilusNotebook.notebook tab { border-width: 0; border-style: solid; @@ -2626,7 +2736,7 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar { padding: 5px; box-shadow: none; - background-color: #383C45; } + background-color: #404552; } .nautilus-circular-button { border-radius: 50%; @@ -2642,34 +2752,52 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: rgba(82, 148, 226, 0.8); border-color: rgba(38, 121, 219, 0.8); } .disk-space-display.free { - background-color: #3d414a; - border-color: #26282e; } + background-color: #313541; + border-color: #1b1d24; } NemoWindow .sidebar .frame { border-width: 0; } NemoWindow GtkSeparator.separator.horizontal, NemoWindow GtkPlacesSidebar.sidebar GtkSeparator.horizontal.view.separator, GtkPlacesSidebar.sidebar NemoWindow GtkSeparator.horizontal.view.separator { - color: #2d3036; } + color: #2b2e39; } NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: rgba(29, 32, 36, 0.97); - background-color: rgba(40, 44, 50, 0.87); } + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { - border-color: #5294E2; } + background-color: rgba(134, 144, 165, 0.37); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive { + color: rgba(207, 218, 231, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .gedit-headerbar-paned { - color: rgba(36, 39, 45, 0.97); } + color: rgba(38, 42, 51, 0.97); } .open-document-selector-treeview.view { padding: 3px 6px 3px 6px; - border-color: #383C45; } + border-color: #404552; } .open-document-selector-treeview.view:prelight { background-color: rgba(0, 0, 0, 0.05); } .open-document-selector-treeview.view:prelight:selected { @@ -2682,7 +2810,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { /* Only normal state is handle */ .open-document-selector-path-label { - color: #868b94; + color: #8a909b; font-size: smaller; } .open-document-selector-path-label:selected { color: rgba(255, 255, 255, 0.9); } @@ -2698,7 +2826,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: inherit; } .gedit-document-panel .prelight-row .button { - color: #a1a7b0; } + color: #9da3ad; } .gedit-document-panel .list-row .button:hover, .gedit-document-panel .prelight-row .button:hover { @@ -2717,13 +2845,13 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: #D3DAE3; } .gedit-document-panel-dragged-row { - border: 1px solid #2d3036; - background-color: #2d3036; + border: 1px solid #2b2e39; + background-color: #22242d; color: #D3DAE3; } GeditStatusbar { - border-top: 1px solid #2d3036; - background-color: #444852; } + border-top: 1px solid #2b2e39; + background-color: #383C4A; } GeditStatusMenuButton.button.flat, GeditStatusMenuButton:prelight.button.flat, @@ -2732,7 +2860,7 @@ GeditStatusMenuButton:checked.button.flat { border-radius: 0; } GeditFileBrowserWidget .toolbar, GeditFileBrowserWidget .inline-toolbar { - border-bottom: 1px solid #2d3036; } + border-bottom: 1px solid #2b2e39; } .gedit-search-entry-occurrences-tag, .gb-search-entry-occurrences-tag { color: rgba(211, 218, 227, 0.6); @@ -2740,9 +2868,9 @@ GeditFileBrowserWidget .toolbar, GeditFileBrowserWidget .inline-toolbar { padding: 2px; } GeditViewFrame .gedit-search-slider, GbEditorFrame .gb-search-slider { - background-color: #494d58; + background-color: #3c4150; padding: 6px; - border-color: #2d3036; + border-color: #2b2e39; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; } @@ -2751,8 +2879,8 @@ GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr), GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { padding: 0 10px; color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover, @@ -2760,25 +2888,19 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { - color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); - background-color: transparent; - border-color: #5294E2; } - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, - GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { - color: inherit; } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { color: #ffffff; - border-color: #5294E2; + border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; @@ -2804,7 +2926,7 @@ GdTaggedEntry { border: none; } .preferences.sidebar GtkListBox { - background-color: #444852; } + background-color: #383C4A; } .preferences.sidebar GtkListBoxRow { padding: 10px; } @@ -2818,7 +2940,7 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #2a2c33; } + background-color: #353945; } GtkBox.gb-command-bar-box GtkLabel { color: #BAC3CF; } @@ -2827,7 +2949,7 @@ GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; color: #BAC3CF; background-image: none; - background-color: #2a2c33; + background-color: #353945; padding: 6px 6px 6px 6px; border: none; } @@ -2842,10 +2964,10 @@ GbSearchDisplayGroup GtkListBox .list-row, GbDocumentStack .button { GbViewStack GtkBox.header.notebook, GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { - border-bottom: 1px solid #2d3036; } + border-bottom: 1px solid #2b2e39; } GbViewStack.focused GtkBox.header.notebook { - background-color: #383C45; } + background-color: #404552; } GbViewStack.focused GtkBox.header.notebook .button.dim-label, GbViewStack.focused GtkBox.header.notebook .button.label.separator, GbViewStack.focused GtkBox.header.notebook .header-bar .button.subtitle, .header-bar GbViewStack.focused GtkBox.header.notebook .button.subtitle { opacity: 1; } @@ -2910,7 +3032,7 @@ PanelWidget, PanelAppletFrame, PanelApplet { color: #BAC3CF; - background-image: linear-gradient(to bottom, rgba(31, 33, 37, 0.95)); } + background-image: linear-gradient(to bottom, rgba(43, 46, 55, 0.95)); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2954,18 +3076,18 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(31, 33, 37, 0.95); } + background-color: rgba(43, 46, 55, 0.95); } .xfce4-panel.panel .button.flat { color: #BAC3CF; - background-color: rgba(31, 33, 37, 0); + background-color: rgba(43, 46, 55, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(54, 57, 65, 0.95); } + background-color: rgba(65, 70, 84, 0.95); } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(15, 16, 18, 0.95); } + background-color: rgba(27, 29, 35, 0.95); } .floating-bar { background-color: #5294E2; @@ -3008,26 +3130,26 @@ MarlinViewWindow *:selected:focus { .marlin-pathbar.pathbar { border-radius: 3px; color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } .marlin-pathbar.pathbar.image, .marlin-pathbar.pathbar.image:hover { color: inherit; } .marlin-pathbar.pathbar:focus { color: #ffffff; - border-color: #5294E2; + border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked { color: #5294E2; } .gala-notification { - border: 1px solid #2d3036; + border: 1px solid #2b2e39; border-radius: 3px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); - background-image: linear-gradient(to bottom, #383C45); + background-image: linear-gradient(to bottom, #404552); background-color: transparent; } .gala-notification .title, .gala-notification .label { color: #D3DAE3; } @@ -3133,24 +3255,24 @@ UnityDecoration { -UnityDecoration-title-fade: 35px; -UnityDecoration-title-alignment: 0.0; } UnityDecoration.top { - border: 1px solid rgba(31, 34, 39, 0.97); + border: 1px solid rgba(32, 35, 43, 0.97); border-bottom-width: 0; border-radius: 4px 4px 0 0; padding: 1px 6px 0 6px; - background-image: linear-gradient(to bottom, #2f343b); + background-image: linear-gradient(to bottom, #2f343f); color: rgba(207, 218, 231, 0.8); - box-shadow: inset 0 1px rgba(54, 60, 68, 0.97); } + box-shadow: inset 0 1px rgba(54, 59, 72, 0.97); } UnityDecoration.top:backdrop { border-bottom-width: 0; - background-image: linear-gradient(to bottom, #32383f); + background-image: linear-gradient(to bottom, #323843); color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { - background-image: linear-gradient(to bottom, rgba(31, 34, 39, 0.97)); } + background-image: linear-gradient(to bottom, rgba(32, 35, 43, 0.97)); } UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #1f2125); + background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } @@ -3173,8 +3295,8 @@ GraniteWidgetsThinPaned { background-color: transparent; background-image: none; margin: 0; - border-left: 1px solid #2d3036; - border-right: 1px solid #2d3036; } + border-left: 1px solid #2b2e39; + border-right: 1px solid #2b2e39; } GraniteWidgetsPopOver .frame, GraniteWidgetsStaticNotebook .frame { @@ -3186,7 +3308,7 @@ GraniteWidgetsStaticNotebook .frame { .secondary-toolbar.toolbar, .secondary-toolbar.inline-toolbar { padding: 3px; - border-bottom: 1px solid #2d3036; } + border-bottom: 1px solid #2b2e39; } .secondary-toolbar.toolbar .button, .secondary-toolbar.inline-toolbar .button { padding: 0 3px 0 3px; } @@ -3194,8 +3316,8 @@ GraniteWidgetsStaticNotebook .frame { padding: 5px; border-width: 1px 0 0 0; border-style: solid; - border-color: #2d3036; - background-color: #444852; } + border-color: #2b2e39; + background-color: #383C4A; } .bottom-toolbar.toolbar .button, .bottom-toolbar.inline-toolbar .button { padding: 2px 3px 2px 3px; } @@ -3205,7 +3327,7 @@ GraniteWidgetsStaticNotebook .frame { .source-list, .source-list.view { - background-color: #444852; + background-color: #383C4A; color: #D3DAE3; -gtk-icon-style: regular; } @@ -3213,7 +3335,7 @@ GraniteWidgetsStaticNotebook .frame { color: transparent; } .source-list.view:prelight { - background-color: #505460; } + background-color: #434859; } .source-list.view:selected, .source-list.view:prelight:selected, @@ -3226,7 +3348,7 @@ GraniteWidgetsStaticNotebook .frame { .source-list .scrollbars-junction { border-image: none; border-color: transparent; - background-color: #444852; + background-color: #383C4A; background-image: none; } .source-list.badge, @@ -3262,10 +3384,10 @@ GraniteWidgetsStaticNotebook .frame { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GraniteWidgetsWelcome { - background-color: #383C45; } + background-color: #404552; } GraniteWidgetsWelcome GtkLabel { - color: #8c919b; + color: #868b97; font: open sans 11; text-shadow: none; } @@ -3286,7 +3408,7 @@ GraniteWidgetsPopOver { margin: 0; } .popover_bg { - background-image: linear-gradient(to bottom, #383C45); + background-image: linear-gradient(to bottom, #404552); border: 1px solid rgba(0, 0, 0, 0.3); } GraniteWidgetsPopOver .sidebar.view, @@ -3304,7 +3426,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { - color: #a8aeb7; + color: #a5abb5; font-weight: 600; text-shadow: 0 1px rgba(255, 255, 255, 0.6); } @@ -3317,10 +3439,10 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(31, 33, 37, 0.95); + background-color: rgba(43, 46, 55, 0.95); color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(15, 16, 18, 0.95); + box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { @@ -3346,7 +3468,7 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: #383C45; + background-color: #383C4A; border-top-left-radius: 2px; border-top-right-radius: 2px; border: solid rgba(0, 0, 0, 0.1); @@ -3355,22 +3477,22 @@ GtkListBox .h4 { #content_frame .button { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } #content_frame .button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } #content_frame .button:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } #content_frame .button:insensitive > GtkLabel { color: inherit; } @@ -3379,32 +3501,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(47, 52, 63, 0.97); 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); } + box-shadow: inset 0 1px rgba(38, 42, 51, 0.97); } #buttonbox_frame .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } #buttonbox_frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } #login_window #user_combobox { color: #D3DAE3; @@ -3464,10 +3586,10 @@ GtkListBox .h4 { font: bold; } .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator { - color: rgba(36, 39, 45, 0.97); } + color: rgba(38, 42, 51, 0.97); } NemoWindow GtkEventBox { - background-color: #444852; } + background-color: #383C4A; } GtkFileChooserDialog *, NautilusWindow *, @@ -3477,12 +3599,12 @@ NemoWindow { GtkFileChooserDialog .sidebar, NautilusWindow .sidebar, NemoWindow .sidebar { - border-right: 1px solid rgba(37, 39, 45, 0.95); } + border-right: 1px solid rgba(42, 45, 55, 0.95); } GtkFileChooserDialog .sidebar:dir(rtl), NautilusWindow .sidebar:dir(rtl), NemoWindow .sidebar:dir(rtl) { - border-left: 1px solid rgba(37, 39, 45, 0.95); } + border-left: 1px solid rgba(42, 45, 55, 0.95); } GtkFileChooserDialog.csd.background, GtkFileChooserDialog .source-list, @@ -3507,7 +3629,7 @@ NautilusWindow .source-list.sidebar.view, NemoWindow .sidebar, NemoWindow .source-list.sidebar.view, MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar row, GtkFileChooserDialog .source-list.sidebar.view .view, @@ -3626,25 +3748,25 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: rgba(37, 39, 45, 0.95); } + background-color: rgba(42, 45, 55, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog .sidebar { background-color: transparent; } GtkFileChooserDialog GtkPaned > .vertical > .horizontal { - background-color: #444852; } + background-color: #383C4A; } GtkFileChooserDialog .dialog-action-box { - background-color: #444852; } + background-color: #383C4A; } GtkFileChooserDialog .dialog-vbox > .frame { color: #BAC3CF; @@ -3652,7 +3774,7 @@ GtkFileChooserDialog .dialog-vbox > .frame { GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: rgba(25, 27, 31, 0.95); } + border-color: rgba(31, 33, 40, 0.95); } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, @@ -3663,20 +3785,20 @@ GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: rgba(37, 39, 45, 0.95); } + background-color: rgba(42, 45, 55, 0.95); } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop { - background-color: rgba(36, 39, 45, 0.97); } + background-color: rgba(38, 42, 51, 0.97); } .gedit-bottom-panel-paned { - background-color: #383C45; } + background-color: #404552; } .gedit-document-panel { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } .maximized .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .gedit-document-panel .list-row { color: #BAC3CF; } .gedit-document-panel .list-row { @@ -3703,9 +3825,9 @@ GeditWindow.background.csd { color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } @@ -3722,7 +3844,7 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: rgba(44, 47, 53, 0.95); } + border-color: rgba(37, 40, 49, 0.95); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #BAC3CF; } @@ -3738,14 +3860,14 @@ GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } 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 { @@ -3755,75 +3877,71 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.35); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.35)); + background-color: transparent; } + GtkFileChooserDialog .action-bar.frame .image.entry, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry, GtkFileChooserDialog .action-bar.frame .image.entry:hover, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry:hover { + color: inherit; } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #BAC3CF; - border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #D3DAE3; @define-color theme_text_color #D3DAE3; -@define-color theme_bg_color #444852; -@define-color theme_base_color #383C45; +@define-color theme_bg_color #383C4A; +@define-color theme_base_color #404552; @define-color theme_selected_bg_color #5294E2; @define-color theme_selected_fg_color #ffffff; @define-color fg_color #D3DAE3; @define-color text_color #D3DAE3; -@define-color bg_color #444852; -@define-color base_color #383C45; +@define-color bg_color #383C4A; +@define-color base_color #404552; @define-color selected_bg_color #5294E2; @define-color selected_fg_color #ffffff; -@define-color insensitive_bg_color #494d58; +@define-color insensitive_bg_color #3c4150; @define-color insensitive_fg_color alpha(#d3dae3, 0.5); -@define-color insensitive_base_color #383C45; +@define-color insensitive_base_color #404552; @define-color theme_unfocused_fg_color #D3DAE3; @define-color theme_unfocused_text_color #D3DAE3; -@define-color theme_unfocused_bg_color #444852; -@define-color theme_unfocused_base_color #383C45; -@define-color borders #2d3036; -@define-color unfocused_borders #2d3036; +@define-color theme_unfocused_bg_color #383C4A; +@define-color theme_unfocused_base_color #404552; +@define-color borders #2b2e39; +@define-color unfocused_borders #2b2e39; @define-color warning_color #F27835; @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); -@define-color wm_bg #2f343b; -@define-color wm_bg_unfocused #32383f; -@define-color wm_highlight #363c44; +@define-color wm_bg #2f343f; +@define-color wm_bg_unfocused #323843; +@define-color wm_highlight #363b48; @define-color wm_shadow alpha(black, 0.35); -@define-color wm_button_close_bg #e45e65; -@define-color wm_button_close_hover_bg #f48085; -@define-color wm_button_close_active_bg #e6262f; -@define-color wm_icon_close_bg #ffffff; -@define-color wm_icon_close_hover_bg #ffffff; -@define-color wm_icon_close_active_bg #ffffff; -@define-color wm_button_bg #272c32; -@define-color wm_button_unfocused_bg #2a3035; -@define-color wm_button_hover_bg #272c32; +@define-color wm_button_close_bg #cc575d; +@define-color wm_button_close_hover_bg #d7787d; +@define-color wm_button_close_active_bg #be3841; +@define-color wm_icon_close_bg #2f343f; +@define-color wm_button_hover_bg #454C5C; @define-color wm_button_active_bg #5294E2; -@define-color wm_button_border #191C21; -@define-color wm_button_unfocused_border #1F2328; -@define-color wm_button_hover_border #5294E2; -@define-color wm_button_active_border #5294E2; -@define-color wm_icon_bg #939ca8; -@define-color wm_icon_unfocused_bg #686f78; -@define-color wm_icon_hover_bg #afb8c5; +@define-color wm_button_hover_border #262932; +@define-color wm_icon_bg #90939B; +@define-color wm_icon_unfocused_bg #666A74; +@define-color wm_icon_hover_bg #C4C7CC; @define-color wm_icon_active_bg #ffffff; -@define-color content_view_bg #383C45; +@define-color content_view_bg #404552; 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 794cbdc..7350ce8 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -112,7 +112,7 @@ GtkTextView { .popover.osd, .osd { color: #BAC3CF; border: none; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); background-clip: padding-box; outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } @@ -245,17 +245,18 @@ GtkTextView { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.35); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.35)); + background-color: transparent; } + .osd .entry.image, .osd .entry.image:hover { + color: inherit; } .osd .entry:focus { - color: #BAC3CF; - border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } GtkSearchEntry.entry { border-radius: 20px; } @@ -294,14 +295,14 @@ GtkSearchEntry.entry { .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; + border-color: #cfd6e6; + background-color: white; -gtk-image-effect: highlight; } .button:active, .button:checked { background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; transition-duration: 50ms; } .button:active { @@ -329,31 +330,31 @@ GtkSearchEntry.entry { 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); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); + background-color: rgba(53, 57, 69, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); - background-color: rgba(42, 44, 51, 0.95); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); + background-color: rgba(53, 57, 69, 0.95); } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .button.osd:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .osd .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -375,17 +376,17 @@ GtkSearchEntry.entry { .osd .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .osd .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .osd .button.flat { border-color: transparent; background-color: transparent; @@ -394,12 +395,12 @@ GtkSearchEntry.entry { .osd .button.flat:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .osd .button.flat:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; @@ -531,13 +532,13 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } .inline-toolbar GtkToolButton > .button:insensitive { color: rgba(92, 97, 108, 0.55); @@ -568,7 +569,15 @@ GtkSearchEntry.entry { GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .button:hover, .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .button:hover:dir(ltr) { - box-shadow: inset 1px 0 #5294E2, inset -1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); } + .inline-toolbar GtkToolButton > .button.flat:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active, + GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .button:active, .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .button:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked, + GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .button:checked, .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .button:checked:dir(ltr) { + box-shadow: none; } .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl), .header-bar .linked.stack-switcher > .button:dir(rtl), @@ -585,7 +594,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:first-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .button:first-child:hover, .linked > GtkComboBox:first-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover, .header-bar .linked.stack-switcher > .button:first-child:hover, .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { - box-shadow: inset -1px 0 #5294E2; } + box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); } + .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active, + .inline-toolbar GtkToolButton:first-child > .button.flat:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .button:first-child:active, .linked > GtkComboBox:first-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked, + .inline-toolbar GtkToolButton:first-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .button:first-child:checked, .linked > GtkComboBox:first-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } .osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button, .primary-toolbar .linked.stack-switcher > .button:last-child, @@ -597,7 +614,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:last-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .button:last-child:hover, .linked > GtkComboBox:last-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover, .header-bar .linked.stack-switcher > .button:last-child:hover, .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { - box-shadow: inset 1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); } + .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active, + .inline-toolbar GtkToolButton:last-child > .button.flat:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .button:last-child:active, .linked > GtkComboBox:last-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked, + .inline-toolbar GtkToolButton:last-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .button:last-child:checked, .linked > GtkComboBox:last-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl), .header-bar .linked.stack-switcher > .button:last-child:dir(rtl), @@ -615,6 +640,14 @@ GtkSearchEntry.entry { .header-bar .linked.stack-switcher > .button:only-child:hover, .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { box-shadow: none; } + .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active, + .inline-toolbar GtkToolButton:only-child > .button.flat:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .button:only-child:active, .linked > GtkComboBox:only-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked, + .inline-toolbar GtkToolButton:only-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .button:only-child:checked, .linked > GtkComboBox:only-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button, .linked.vertical > .button:hover, @@ -628,7 +661,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:hover, .linked.vertical > .button:hover, .linked.vertical > GtkComboBoxText > .button:hover, .linked.vertical > GtkComboBox > .button:hover { - box-shadow: inset 0 1px #5294E2, inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4), inset 0 1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:active, .linked.vertical > .button:active, + .linked.vertical > GtkComboBoxText > .button:active, + .linked.vertical > GtkComboBox > .button:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked, + .linked.vertical > GtkComboBoxText > .button:checked, + .linked.vertical > GtkComboBox > .button:checked { + box-shadow: none; } .linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, @@ -638,7 +677,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover, .linked.vertical > GtkComboBoxText:first-child > .button:hover, .linked.vertical > GtkComboBox:first-child > .button:hover { - box-shadow: inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active, + .linked.vertical > GtkComboBoxText:first-child > .button:active, + .linked.vertical > GtkComboBox:first-child > .button:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked, + .linked.vertical > GtkComboBoxText:first-child > .button:checked, + .linked.vertical > GtkComboBox:first-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, @@ -648,7 +693,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover, .linked.vertical > GtkComboBoxText:last-child > .button:hover, .linked.vertical > GtkComboBox:last-child > .button:hover { - box-shadow: inset 0 1px #5294E2; } + box-shadow: inset 0 1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active, + .linked.vertical > GtkComboBoxText:last-child > .button:active, + .linked.vertical > GtkComboBox:last-child > .button:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked, + .linked.vertical > GtkComboBoxText:last-child > .button:checked, + .linked.vertical > GtkComboBox:last-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, @@ -659,6 +710,12 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBoxText:only-child > .button:hover, .linked.vertical > GtkComboBox:only-child > .button:hover { box-shadow: none; } + .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active, + .linked.vertical > GtkComboBoxText:only-child > .button:active, + .linked.vertical > GtkComboBox:only-child > .button:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked, + .linked.vertical > GtkComboBoxText:only-child > .button:checked, + .linked.vertical > GtkComboBox:only-child > .button:checked { + box-shadow: none; } .menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, @@ -715,8 +772,6 @@ GtkSearchEntry.entry { border-style: none solid none none; } .spinbutton .button:first-child { color: red; } - .spinbutton .button:hover { - color: #5294E2; } .spinbutton .button:insensitive { color: rgba(92, 97, 108, 0.55); } .spinbutton .button:active { @@ -730,13 +785,13 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .spinbutton.vertical .button:first-child:insensitive, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive { color: rgba(92, 97, 108, 0.55); border-color: rgba(207, 214, 230, 0.55); @@ -751,13 +806,13 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .spinbutton.vertical .button:last-child:insensitive, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive { color: rgba(92, 97, 108, 0.55); border-color: rgba(207, 214, 230, 0.55); @@ -804,12 +859,11 @@ GtkComboBox { border-color: #cfd6e6; } GtkComboBox.combobox-entry .button:hover { background-color: #e0e4ef; - border-color: #5294E2; - box-shadow: -1px 0 #5294E2; } + border-color: #e0e4ef; } GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } GtkComboBox.combobox-entry .button:insensitive { opacity: 0.5; } @@ -823,19 +877,19 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: 1px solid rgba(0, 0, 0, 0.6); + border: 1px solid rgba(0, 0, 0, 0.5); border-radius: 3px; - background-color: rgba(42, 44, 51, 0.85); } + background-color: rgba(53, 57, 69, 0.85); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; + background-color: #2f343f; box-shadow: none; border-width: 0 0 1px 0; border-style: solid; - border-image: linear-gradient(to bottom, #2f343b, rgba(31, 34, 39, 0.97)) 1 0 1 0; } + border-image: linear-gradient(to bottom, #2f343f, rgba(32, 35, 43, 0.97)) 1 0 1 0; } .primary-toolbar:backdrop { - background-color: #32383f; } + background-color: #323843; } .inline-toolbar { background-color: #edeef0; @@ -863,16 +917,16 @@ GtkComboBox { border-width: 0 0 1px; border-style: solid; border-radius: 0; - border-color: rgba(31, 34, 39, 0.97); + border-color: rgba(38, 42, 51, 0.97); color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; } + background-color: #2f343f; } .csd .header-bar { - background-color: rgba(47, 52, 59, 0.97); } + background-color: rgba(47, 52, 63, 0.97); } .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); - background-color: #32383f; } + background-color: #323843; } .csd .header-bar:backdrop { - background-color: rgba(50, 56, 63, 0.97); } + background-color: rgba(50, 56, 67, 0.97); } .header-bar .title { padding: 0px 12px; } .header-bar .subtitle { @@ -943,35 +997,35 @@ GtkComboBox { .maximized .header-bar, .maximized .header-bar:backdrop { border-radius: 0; } .maximized .header-bar { - background-color: #2f343b; } + background-color: #2f343f; } .maximized .header-bar:backdrop { - background-color: #32383f; } + background-color: #323843; } .header-bar.default-decoration { padding-top: 5px; padding-bottom: 5px; - background-color: #2f343b; + background-color: #2f343f; border-bottom-width: 0; } .header-bar.default-decoration:backdrop { - background-color: #32383f; } + background-color: #323843; } .titlebar { padding-left: 7px; padding-right: 7px; border-radius: 3px 3px 0 0; color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; - box-shadow: inset 0 1px rgba(54, 60, 68, 0.97); } + background-color: #2f343f; + box-shadow: inset 0 1px rgba(54, 59, 72, 0.97); } .csd .titlebar { - background-color: rgba(47, 52, 59, 0.97); } + background-color: rgba(47, 52, 63, 0.97); } .titlebar:backdrop { color: rgba(207, 218, 231, 0.5); - background-color: #32383f; } + background-color: #323843; } .csd .titlebar:backdrop { - background-color: rgba(50, 56, 63, 0.97); } + background-color: rgba(50, 56, 67, 0.97); } .maximized .titlebar { - background-color: #2f343b; } + background-color: #2f343f; } .maximized .titlebar:backdrop { - background-color: #32383f; } + background-color: #323843; } .titlebar .titlebar, .titlebar .titlebar:backdrop { @@ -989,8 +1043,8 @@ GtkComboBox { .primary-toolbar .entry, .header-bar .entry { color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } .primary-toolbar .entry.image, .header-bar .entry.image, .primary-toolbar .entry.image:hover, .header-bar .entry.image:hover { color: inherit; } @@ -998,13 +1052,14 @@ GtkComboBox { opacity: 0.85; } .primary-toolbar .entry:focus, .header-bar .entry:focus { color: #ffffff; - border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); + background-clip: padding-box; } .primary-toolbar .entry:focus.image, .header-bar .entry:focus.image { color: #ffffff; } .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus { background-color: #ffffff; color: #5294E2; } @@ -1017,24 +1072,25 @@ GtkComboBox { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); outline-offset: -3px; - background-color: rgba(47, 52, 59, 0); - border-color: rgba(47, 52, 59, 0); } + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .primary-toolbar .button:backdrop, .header-bar .button:backdrop { opacity: 0.7; } .primary-toolbar .button:hover, .header-bar .button:hover { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: rgba(29, 32, 36, 0.97); - background-color: rgba(40, 44, 50, 0.87); } + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } .primary-toolbar .button:active, .header-bar .button:active, .primary-toolbar .button:checked, .header-bar .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; - background-color: #5294E2; } + border-color: transparent; + background-color: #5294E2; + background-clip: padding-box; } .primary-toolbar .button:insensitive, .header-bar .button:insensitive { color: rgba(207, 218, 231, 0.35); - background-color: rgba(47, 52, 59, 0); - border-color: rgba(47, 52, 59, 0); } + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .primary-toolbar .button:insensitive > GtkLabel, .header-bar .button:insensitive > GtkLabel { color: inherit; } .primary-toolbar .button:insensitive:active, .header-bar .button:insensitive:active, .primary-toolbar .button:insensitive:checked, .header-bar .button:insensitive:checked { @@ -1054,12 +1110,12 @@ GtkComboBox { .primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: rgba(29, 32, 36, 0.97); - background-color: rgba(40, 44, 50, 0.87); } + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { - border-color: #5294E2; } + background-color: rgba(134, 144, 165, 0.37); } .primary-toolbar .linked.stack-switcher > .button:active, .header-bar .linked.stack-switcher > .button:active, .primary-toolbar .linked.stack-switcher > .button:checked, @@ -1067,8 +1123,52 @@ GtkComboBox { .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } + .primary-toolbar .linked.stack-switcher > .button:insensitive, + .header-bar .linked.stack-switcher > .button:insensitive, + .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive { + color: rgba(207, 218, 231, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:hover, + .header-bar .linked.stack-switcher > .button:hover, + .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:first-child:hover, + .header-bar .linked.stack-switcher > .button:first-child:hover, + .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:last-child:hover, + .header-bar .linked.stack-switcher > .button:last-child:hover, + .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:hover, + .header-bar .linked.stack-switcher > .button:only-child:hover, + .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked { + box-shadow: none; } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; @@ -1162,24 +1262,25 @@ GtkComboBox { .primary-toolbar GtkComboBox.combobox-entry .button, .header-bar GtkComboBox.combobox-entry .button { color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } .primary-toolbar GtkComboBox.combobox-entry .button.image, .header-bar GtkComboBox.combobox-entry .button.image, .primary-toolbar GtkComboBox.combobox-entry .button.image:hover, .header-bar GtkComboBox.combobox-entry .button.image:hover { color: inherit; } .primary-toolbar GtkComboBox.combobox-entry .button:hover, .header-bar GtkComboBox.combobox-entry .button:hover { color: #ffffff; - border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); + box-shadow: none; } .primary-toolbar GtkComboBox.combobox-entry .button:insensitive, .header-bar GtkComboBox.combobox-entry .button:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } .primary-toolbar GtkProgressBar.trough, .header-bar GtkProgressBar.trough, .primary-toolbar .level-bar.trough, .header-bar .level-bar.trough { - background-color: rgba(207, 218, 231, 0.15); } + background-color: rgba(21, 23, 28, 0.37); } .primary-toolbar GtkProgressBar:backdrop, .header-bar GtkProgressBar:backdrop { opacity: 0.75; } @@ -1188,15 +1289,22 @@ GtkComboBox { opacity: 0.75; } .primary-toolbar .scale.trough, .header-bar .scale.trough { - background-image: linear-gradient(to bottom, rgba(207, 218, 231, 0.15)); } + background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.37)); } .primary-toolbar .scale.trough:insensitive, .header-bar .scale.trough:insensitive { - background-image: linear-gradient(to bottom, rgba(207, 218, 231, 0.1)); } + background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.27)); } .primary-toolbar .scale.slider, .header-bar .scale.slider { - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.97)); } + background-image: linear-gradient(to bottom, #454c5c); + border-color: rgba(21, 23, 28, 0.67); } + .primary-toolbar .scale.slider:hover, .header-bar .scale.slider:hover { + background-image: linear-gradient(to bottom, #50586b); + border-color: rgba(21, 23, 28, 0.67); } + .primary-toolbar .scale.slider:active, .header-bar .scale.slider:active { + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .primary-toolbar .scale.slider:insensitive, .header-bar .scale.slider:insensitive { - background-image: linear-gradient(to bottom, rgba(45, 49, 56, 0.97)); - border-color: rgba(62, 92, 128, 0.982); } + background-image: linear-gradient(to bottom, rgba(63, 69, 84, 0.991)); + border-color: rgba(21, 23, 28, 0.67); } /************ * Pathbars * @@ -1305,10 +1413,10 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar { -GtkWidget-window-dragging: true; padding: 0px; - background-color: #2f343b; + background-color: #2f343f; color: rgba(207, 218, 231, 0.8); } .menubar:backdrop { - background-color: #32383f; } + background-color: #323843; } .menubar > .menuitem { padding: 6px 8px; border: solid transparent; @@ -1833,21 +1941,21 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { margin: 3px; } .scale.slider { background-clip: border-box; - background-image: linear-gradient(to bottom, #ffffff); - border: 1px solid #5294E2; + background-image: linear-gradient(to bottom, #fbfbfc); + border: 1px solid rgba(123, 142, 186, 0.5); border-radius: 50%; box-shadow: none; } .scale.slider:hover { - background-image: linear-gradient(to bottom, #5294E2); - border-color: #5294E2; } + background-image: linear-gradient(to bottom, white); + border-color: rgba(123, 142, 186, 0.5); } .scale.slider:insensitive { background-image: linear-gradient(to bottom, #fbfbfb); - border-color: #9bc0eb; } + border-color: rgba(123, 142, 186, 0.3); } .scale.slider:active { - background-image: linear-gradient(to bottom, #2679db); - border-color: #2679db; } + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(42, 44, 51, 0.95)); + background-image: linear-gradient(to bottom, rgba(53, 57, 69, 0.95)); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1877,7 +1985,7 @@ 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(58, 62, 70, 0.95)); + background-image: linear-gradient(to bottom, rgba(69, 74, 89, 0.95)); outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; @@ -2024,18 +2132,18 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame { padding: 10px; color: #BAC3CF; - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(53, 57, 69, 0.95); 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: rgba(31, 33, 40, 0.95); } .app-notification .button, .app-notification.frame .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } @@ -2043,8 +2151,8 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { @@ -2054,9 +2162,9 @@ GtkScrolledWindow GtkViewport.frame { background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } /************* * Expanders * @@ -2088,8 +2196,9 @@ GtkCalendar { border-radius: 0; } GtkCalendar.button, GtkCalendar.button:focus { color: rgba(92, 97, 108, 0.45); - box-shadow: none; - border: none; } + border-color: transparent; + background-color: transparent; + background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #5c616c; } GtkCalendar.highlight { @@ -2104,8 +2213,8 @@ GtkCalendar { .message-dialog { -GtkDialog-button-spacing: 0; } .message-dialog .titlebar { - background-color: rgba(47, 52, 59, 0.97); - border-bottom: 1px solid rgba(31, 34, 39, 0.97); } + background-color: rgba(47, 52, 63, 0.97); + border-bottom: 1px solid rgba(32, 35, 43, 0.97); } .message-dialog.csd.background { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; @@ -2230,7 +2339,7 @@ GtkInfoBar { color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2301,8 +2410,8 @@ GtkColorSwatch#add-color-button { GtkColorSwatch#add-color-button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } GtkColorSwatch#add-color-button .overlay { border-color: transparent; background-color: transparent; @@ -2321,8 +2430,8 @@ GtkColorButton.button { .scale-popup .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } GtkVolumeButton.button { padding: 8px; } @@ -2333,11 +2442,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px rgba(31, 34, 39, 0.97), 0 4px 8px 1px rgba(0, 0, 0, 0.25); + box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.2); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px rgba(31, 34, 39, 0.97), 0 4px 5px 2px rgba(0, 0, 0, 0.25); } + box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } .window-frame.ssd { @@ -2356,7 +2465,7 @@ GtkVolumeButton.button { .window-frame.solid-csd { border-radius: 0; margin: 1px; - background-color: rgba(47, 52, 59, 0.97); + background-color: rgba(47, 52, 63, 0.97); box-shadow: none; } .header-bar.default-decoration .button.titlebutton, @@ -2370,20 +2479,20 @@ GtkVolumeButton.button { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 59, 0); + background-color: rgba(47, 52, 63, 0); border-width: 0; } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: rgba(29, 32, 36, 0.97); - background-color: rgba(40, 44, 50, 0.87); } + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } .header-bar .button.titlebutton:active, .header-bar .button.titlebutton:checked, .titlebar .button.titlebutton:active, .titlebar .button.titlebutton:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } .header-bar .button.titlebutton.close, .header-bar .button.titlebutton.maximize, @@ -2567,7 +2676,7 @@ PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top, Panth TerminalWindow .notebook.header.top, PantheonTerminalPantheonTerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #1f2227, inset 0 -1px #dbdfe3; } + box-shadow: inset 0 1px #262a33, inset 0 -1px #dbdfe3; } GtkHTML { background-color: #ffffff; @@ -2655,18 +2764,36 @@ NemoWindow GtkSeparator.separator.horizontal, NemoWindow GtkPlacesSidebar.sideba NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: rgba(29, 32, 36, 0.97); - background-color: rgba(40, 44, 50, 0.87); } + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { - border-color: #5294E2; } + background-color: rgba(134, 144, 165, 0.37); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive { + color: rgba(207, 218, 231, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .gedit-headerbar-paned { - color: rgba(31, 34, 39, 0.97); } + color: rgba(38, 42, 51, 0.97); } .open-document-selector-treeview.view { padding: 3px 6px 3px 6px; @@ -2752,8 +2879,8 @@ GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr), GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { padding: 0 10px; color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover, @@ -2761,25 +2888,19 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { - color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); - background-color: transparent; - border-color: #5294E2; } - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, - GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { - color: inherit; } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { color: #ffffff; - border-color: #5294E2; + border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; @@ -2819,7 +2940,7 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #2a2c33; } + background-color: #353945; } GtkBox.gb-command-bar-box GtkLabel { color: #BAC3CF; } @@ -2828,7 +2949,7 @@ GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; color: #BAC3CF; background-image: none; - background-color: #2a2c33; + background-color: #353945; padding: 6px 6px 6px 6px; border: none; } @@ -2911,7 +3032,7 @@ PanelWidget, PanelAppletFrame, PanelApplet { color: #BAC3CF; - background-image: linear-gradient(to bottom, rgba(31, 33, 37, 0.95)); } + background-image: linear-gradient(to bottom, rgba(43, 46, 55, 0.95)); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2955,18 +3076,18 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(31, 33, 37, 0.95); } + background-color: rgba(43, 46, 55, 0.95); } .xfce4-panel.panel .button.flat { color: #BAC3CF; - background-color: rgba(31, 33, 37, 0); + background-color: rgba(43, 46, 55, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(54, 57, 65, 0.95); } + background-color: rgba(65, 70, 84, 0.95); } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(15, 16, 18, 0.95); } + background-color: rgba(27, 29, 35, 0.95); } .floating-bar { background-color: #5294E2; @@ -3009,18 +3130,18 @@ MarlinViewWindow *:selected:focus { .marlin-pathbar.pathbar { border-radius: 3px; color: rgba(207, 218, 231, 0.8); - border-color: rgba(24, 27, 31, 0.97); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + border-color: rgba(21, 23, 28, 0.37); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } .marlin-pathbar.pathbar.image, .marlin-pathbar.pathbar.image:hover { color: inherit; } .marlin-pathbar.pathbar:focus { color: #ffffff; - border-color: #5294E2; + border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked { color: #5294E2; } @@ -3134,24 +3255,24 @@ UnityDecoration { -UnityDecoration-title-fade: 35px; -UnityDecoration-title-alignment: 0.0; } UnityDecoration.top { - border: 1px solid rgba(31, 34, 39, 0.97); + border: 1px solid rgba(32, 35, 43, 0.97); border-bottom-width: 0; border-radius: 4px 4px 0 0; padding: 1px 6px 0 6px; - background-image: linear-gradient(to bottom, #2f343b); + background-image: linear-gradient(to bottom, #2f343f); color: rgba(207, 218, 231, 0.8); - box-shadow: inset 0 1px rgba(54, 60, 68, 0.97); } + box-shadow: inset 0 1px rgba(54, 59, 72, 0.97); } UnityDecoration.top:backdrop { border-bottom-width: 0; - background-image: linear-gradient(to bottom, #32383f); + background-image: linear-gradient(to bottom, #323843); color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { - background-image: linear-gradient(to bottom, rgba(31, 34, 39, 0.97)); } + background-image: linear-gradient(to bottom, rgba(32, 35, 43, 0.97)); } UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #1f2125); + background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } @@ -3318,10 +3439,10 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(31, 33, 37, 0.95); + background-color: rgba(43, 46, 55, 0.95); color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(15, 16, 18, 0.95); + box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { @@ -3361,12 +3482,12 @@ GtkListBox .h4 { #content_frame .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } #content_frame .button:insensitive { color: rgba(92, 97, 108, 0.55); @@ -3380,32 +3501,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 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); } + box-shadow: inset 0 1px rgba(53, 57, 69, 0.95); } #buttonbox_frame .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } #buttonbox_frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } #login_window #user_combobox { color: #5c616c; @@ -3465,7 +3586,7 @@ GtkListBox .h4 { font: bold; } .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator { - color: rgba(31, 34, 39, 0.97); } + color: rgba(38, 42, 51, 0.97); } NemoWindow GtkEventBox { background-color: #F5F6F7; } @@ -3498,7 +3619,7 @@ NautilusWindow .source-list.sidebar.view, NemoWindow .sidebar, NemoWindow .source-list.sidebar.view, MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar row, GtkFileChooserDialog .source-list.sidebar.view .view, @@ -3617,16 +3738,16 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog .sidebar { background-color: transparent; } @@ -3643,7 +3764,7 @@ GtkFileChooserDialog .dialog-vbox > .frame { GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: rgba(44, 47, 53, 0.95); } + border-color: rgba(42, 45, 55, 0.95); } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, @@ -3654,20 +3775,20 @@ GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop { - background-color: rgba(31, 34, 39, 0.97); } + background-color: rgba(38, 42, 51, 0.97); } .gedit-bottom-panel-paned { background-color: #ffffff; } .gedit-document-panel { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } .maximized .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .gedit-document-panel .list-row { color: #BAC3CF; } .gedit-document-panel .list-row { @@ -3694,9 +3815,9 @@ GeditWindow.background.csd { color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } @@ -3713,7 +3834,7 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: rgba(44, 47, 53, 0.95); } + border-color: rgba(37, 40, 49, 0.95); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #BAC3CF; } @@ -3729,14 +3850,14 @@ GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } 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 { @@ -3746,26 +3867,29 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.35); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.35)); + background-color: transparent; } + GtkFileChooserDialog .action-bar.frame .image.entry, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry, GtkFileChooserDialog .action-bar.frame .image.entry:hover, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry:hover { + color: inherit; } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #BAC3CF; - border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @@ -3795,26 +3919,19 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { @define-color placeholder_text_color #A8A8A8; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); -@define-color wm_bg #2f343b; -@define-color wm_bg_unfocused #32383f; -@define-color wm_highlight #363c44; +@define-color wm_bg #2f343f; +@define-color wm_bg_unfocused #323843; +@define-color wm_highlight #363b48; @define-color wm_shadow alpha(black, 0.35); -@define-color wm_button_close_bg #e45e65; -@define-color wm_button_close_hover_bg #f48085; -@define-color wm_button_close_active_bg #e6262f; -@define-color wm_icon_close_bg #ffffff; -@define-color wm_icon_close_hover_bg #ffffff; -@define-color wm_icon_close_active_bg #ffffff; -@define-color wm_button_bg #272c32; -@define-color wm_button_unfocused_bg #2a3035; -@define-color wm_button_hover_bg #272c32; +@define-color wm_button_close_bg #cc575d; +@define-color wm_button_close_hover_bg #d7787d; +@define-color wm_button_close_active_bg #be3841; +@define-color wm_icon_close_bg #2f343f; +@define-color wm_button_hover_bg #454C5C; @define-color wm_button_active_bg #5294E2; -@define-color wm_button_border #191C21; -@define-color wm_button_unfocused_border #1F2328; -@define-color wm_button_hover_border #5294E2; -@define-color wm_button_active_border #5294E2; -@define-color wm_icon_bg #939ca8; -@define-color wm_icon_unfocused_bg #686f78; -@define-color wm_icon_hover_bg #afb8c5; +@define-color wm_button_hover_border #262932; +@define-color wm_icon_bg #90939B; +@define-color wm_icon_unfocused_bg #666A74; +@define-color wm_icon_hover_bg #C4C7CC; @define-color wm_icon_active_bg #ffffff; @define-color content_view_bg #ffffff; 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 b0ab6a2..e05a091 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 @@ -33,7 +33,7 @@ ***************/ .background { color: #D3DAE3; - background-color: #444852; } + background-color: #383C4A; } /* These wildcard seems unavoidable, need to investigate. @@ -45,16 +45,16 @@ -gtk-image-effect: dim; } .gtkstyle-fallback { - background-color: #444852; + background-color: #383C4A; color: #D3DAE3; } .gtkstyle-fallback:prelight { - background-color: #5b606e; + background-color: #4e5467; color: #D3DAE3; } .gtkstyle-fallback:active { - background-color: #2d3036; + background-color: #22242d; color: #D3DAE3; } .gtkstyle-fallback:insensitive { - background-color: #494d58; + background-color: #3c4150; color: rgba(211, 218, 227, 0.45); } .gtkstyle-fallback:selected { background-color: #5294E2; @@ -62,7 +62,7 @@ .view { color: #D3DAE3; - background-color: #383C45; } + background-color: #404552; } .view.dim-label, .view.label.separator, GtkPlacesSidebar.sidebar .view.label.separator, .header-bar .view.subtitle { color: rgba(211, 218, 227, 0.55); } .view.dim-label:selected, .view.label.separator:selected, .header-bar .view.subtitle:selected, .view.dim-label:selected:focus, .view.label.separator:selected:focus, .header-bar .view.subtitle:selected:focus { @@ -83,12 +83,12 @@ opacity: 0.55; } GtkAssistant .sidebar { - background-color: #383C45; - border-top: 1px solid #2d3036; } + background-color: #404552; + border-top: 1px solid #2b2e39; } GtkAssistant .sidebar:dir(ltr) { - border-right: 1px solid #2d3036; } + border-right: 1px solid #2b2e39; } GtkAssistant .sidebar:dir(rtl) { - border-left: 1px solid #2d3036; } + border-left: 1px solid #2b2e39; } GtkAssistant.csd .sidebar { border-top-style: none; } @@ -101,7 +101,7 @@ GtkAssistant .sidebar .label.highlight { color: #ffffff; } GtkTextView { - background-color: #3e424c; } + background-color: #3c414e; } .grid-child { padding: 3px; @@ -112,7 +112,7 @@ GtkTextView { .popover.osd, .osd { color: #BAC3CF; border: none; - background-color: #2a2c33; + background-color: #353945; background-clip: padding-box; outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } @@ -144,9 +144,9 @@ GtkTextView { border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #D3DAE3; - border-color: #2d3036; - background-color: #383c45; - background-image: linear-gradient(to bottom, #383c45); } + border-color: #2b2e39; + background-color: #404552; + background-image: linear-gradient(to bottom, #404552); } .header-bar .entry { padding: 6px; } .entry.image { @@ -155,22 +155,22 @@ GtkTextView { .entry.flat, .entry.flat:focus { padding: 2px; color: #D3DAE3; - border-color: #2d3036; - background-color: #383c45; - background-image: linear-gradient(to bottom, #383c45); + border-color: #2b2e39; + background-color: #404552; + background-image: linear-gradient(to bottom, #404552); border: none; border-radius: 0; } .entry:focus { background-clip: border-box; color: #D3DAE3; border-color: #5294E2; - background-color: #383c45; - background-image: linear-gradient(to bottom, #383c45); } + background-color: #404552; + background-image: linear-gradient(to bottom, #404552); } .entry:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(56, 60, 69, 0.55); - background-image: linear-gradient(to bottom, rgba(56, 60, 69, 0.55)); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(64, 69, 82, 0.55); + background-image: linear-gradient(to bottom, rgba(64, 69, 82, 0.55)); } .entry:selected, .entry:selected:focus { background-color: #5294E2; @@ -198,7 +198,7 @@ GtkTextView { .entry.error { color: white; border-color: #FC4138; - background-image: linear-gradient(to bottom, #d5403b); } + background-image: linear-gradient(to bottom, #d6423d); } .entry.error:focus { background-image: linear-gradient(to bottom, #FC4138); color: white; } @@ -208,7 +208,7 @@ GtkTextView { .entry.warning { color: white; border-color: #F27835; - background-image: linear-gradient(to bottom, #cd6c38); } + background-image: linear-gradient(to bottom, #ce6e3b); } .entry.warning:focus { background-image: linear-gradient(to bottom, #F27835); color: white; } @@ -216,26 +216,26 @@ GtkTextView { background-color: white; color: #F27835; } .entry.image { - color: #b4bac3; } + color: #b6bcc6; } .entry.image:hover { color: #D3DAE3; } .entry.image:active { color: #5294E2; } .linked.vertical > .entry { - border-bottom-color: #353841; + border-bottom-color: #3a3e4a; box-shadow: none; } .linked.vertical > .entry:focus { border-color: #5294E2; box-shadow: 0 -1px 0 0 #5294E2; } .linked.vertical > .entry:insensitive { - border-bottom-color: #353841; } + border-bottom-color: #3a3e4a; } .linked.vertical > .entry:first-child { - border-bottom-color: #353841; } + border-bottom-color: #3a3e4a; } .linked.vertical > .entry:first-child:focus { border-bottom-color: #5294E2; box-shadow: none; } .linked.vertical > .entry:first-child:insensitive { - border-bottom-color: #353841; } + border-bottom-color: #3a3e4a; } .linked.vertical > .entry:last-child { border-bottom-color: rgba(0, 0, 0, 0.14); } .linked.vertical > .entry:last-child:focus { @@ -245,17 +245,18 @@ GtkTextView { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.4); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.4)); + background-color: transparent; } + .osd .entry.image, .osd .entry.image:hover { + color: inherit; } .osd .entry:focus { - color: #BAC3CF; - border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } GtkSearchEntry.entry { border-radius: 20px; } @@ -276,15 +277,15 @@ GtkSearchEntry.entry { padding: 5px 8px; color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } .header-bar .button { padding: 6px 11px; } .button.flat { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(68, 72, 82, 0); + background-color: rgba(56, 60, 74, 0); transition: none; } .button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); @@ -294,14 +295,14 @@ GtkSearchEntry.entry { .button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; + border-color: #2b2e39; + background-color: #505666; -gtk-image-effect: highlight; } .button:active, .button:checked { - background-clip: border-box; + background-clip: padding-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; transition-duration: 50ms; } .button:active { @@ -314,8 +315,8 @@ GtkSearchEntry.entry { background-image: none; } .button:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } .button:insensitive > GtkLabel { color: inherit; } .button:insensitive:active, .button:insensitive:checked { @@ -329,31 +330,31 @@ GtkSearchEntry.entry { 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; } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); + background-color: #353945; } .button.osd.image-button { padding: 10px; } .button.osd:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); - background-color: #2a2c33; } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); + background-color: #353945; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .button.osd:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } .osd .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -375,17 +376,17 @@ GtkSearchEntry.entry { .osd .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .osd .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } .osd .button.flat { border-color: transparent; background-color: transparent; @@ -394,12 +395,12 @@ GtkSearchEntry.entry { .osd .button.flat:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .osd .button.flat:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; @@ -526,23 +527,23 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } .inline-toolbar GtkToolButton > .button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } .inline-toolbar GtkToolButton > .button:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } .inline-toolbar GtkToolButton > .button:insensitive > GtkLabel { color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active, @@ -568,7 +569,15 @@ GtkSearchEntry.entry { GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .button:hover, .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .button:hover:dir(ltr) { - box-shadow: inset 1px 0 #5294E2, inset -1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5), inset -1px 0 rgba(43, 46, 57, 0.5); } + .inline-toolbar GtkToolButton > .button.flat:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active, + GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .button:active, .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .button:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked, + GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .button:checked, .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .button:checked:dir(ltr) { + box-shadow: none; } .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl), .header-bar .linked.stack-switcher > .button:dir(rtl), @@ -585,7 +594,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:first-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .button:first-child:hover, .linked > GtkComboBox:first-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover, .header-bar .linked.stack-switcher > .button:first-child:hover, .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { - box-shadow: inset -1px 0 #5294E2; } + box-shadow: inset -1px 0 rgba(43, 46, 57, 0.5); } + .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active, + .inline-toolbar GtkToolButton:first-child > .button.flat:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .button:first-child:active, .linked > GtkComboBox:first-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked, + .inline-toolbar GtkToolButton:first-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .button:first-child:checked, .linked > GtkComboBox:first-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } .osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button, .primary-toolbar .linked.stack-switcher > .button:last-child, @@ -597,7 +614,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:last-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .button:last-child:hover, .linked > GtkComboBox:last-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover, .header-bar .linked.stack-switcher > .button:last-child:hover, .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { - box-shadow: inset 1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5); } + .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active, + .inline-toolbar GtkToolButton:last-child > .button.flat:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .button:last-child:active, .linked > GtkComboBox:last-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked, + .inline-toolbar GtkToolButton:last-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .button:last-child:checked, .linked > GtkComboBox:last-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl), .header-bar .linked.stack-switcher > .button:last-child:dir(rtl), @@ -615,6 +640,14 @@ GtkSearchEntry.entry { .header-bar .linked.stack-switcher > .button:only-child:hover, .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { box-shadow: none; } + .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active, + .inline-toolbar GtkToolButton:only-child > .button.flat:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .button:only-child:active, .linked > GtkComboBox:only-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked, + .inline-toolbar GtkToolButton:only-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .button:only-child:checked, .linked > GtkComboBox:only-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button, .linked.vertical > .button:hover, @@ -628,7 +661,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:hover, .linked.vertical > .button:hover, .linked.vertical > GtkComboBoxText > .button:hover, .linked.vertical > GtkComboBox > .button:hover { - box-shadow: inset 0 1px #5294E2, inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(43, 46, 57, 0.5), inset 0 1px rgba(43, 46, 57, 0.5); } + .linked.vertical > .entry:active, .linked.vertical > .button:active, + .linked.vertical > GtkComboBoxText > .button:active, + .linked.vertical > GtkComboBox > .button:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked, + .linked.vertical > GtkComboBoxText > .button:checked, + .linked.vertical > GtkComboBox > .button:checked { + box-shadow: none; } .linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, @@ -638,7 +677,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover, .linked.vertical > GtkComboBoxText:first-child > .button:hover, .linked.vertical > GtkComboBox:first-child > .button:hover { - box-shadow: inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(43, 46, 57, 0.5); } + .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active, + .linked.vertical > GtkComboBoxText:first-child > .button:active, + .linked.vertical > GtkComboBox:first-child > .button:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked, + .linked.vertical > GtkComboBoxText:first-child > .button:checked, + .linked.vertical > GtkComboBox:first-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, @@ -648,7 +693,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover, .linked.vertical > GtkComboBoxText:last-child > .button:hover, .linked.vertical > GtkComboBox:last-child > .button:hover { - box-shadow: inset 0 1px #5294E2; } + box-shadow: inset 0 1px rgba(43, 46, 57, 0.5); } + .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active, + .linked.vertical > GtkComboBoxText:last-child > .button:active, + .linked.vertical > GtkComboBox:last-child > .button:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked, + .linked.vertical > GtkComboBoxText:last-child > .button:checked, + .linked.vertical > GtkComboBox:last-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, @@ -659,6 +710,12 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBoxText:only-child > .button:hover, .linked.vertical > GtkComboBox:only-child > .button:hover { box-shadow: none; } + .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active, + .linked.vertical > GtkComboBoxText:only-child > .button:active, + .linked.vertical > GtkComboBox:only-child > .button:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked, + .linked.vertical > GtkComboBoxText:only-child > .button:checked, + .linked.vertical > GtkComboBox:only-child > .button:checked { + box-shadow: none; } .menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, @@ -674,7 +731,7 @@ GtkSearchEntry.entry { outline-offset: -1px; border-radius: 2px; } .menuitem.button.flat:hover { - background-color: #4b4f59; } + background-color: #484c59; } .menuitem.button.flat:checked { color: #D3DAE3; } @@ -706,17 +763,15 @@ GtkSearchEntry.entry { border-radius: 3px; } .spinbutton .button { background-image: none; - border: 1px solid rgba(45, 48, 54, 0.6); + border: 1px solid rgba(43, 46, 57, 0.6); border-style: none none none solid; - color: #cbd2db; + color: #ccd3dc; border-radius: 0; box-shadow: none; } .spinbutton .button:dir(rtl) { border-style: none solid none none; } .spinbutton .button:first-child { color: red; } - .spinbutton .button:hover { - color: #5294E2; } .spinbutton .button:insensitive { color: rgba(211, 218, 227, 0.45); } .spinbutton .button:active { @@ -725,43 +780,43 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child, .spinbutton.vertical:dir(rtl) .button:first-child { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } .spinbutton.vertical .button:first-child:insensitive, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } .spinbutton.vertical .button:first-child:insensitive > GtkLabel, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive > GtkLabel { color: inherit; } .spinbutton.vertical .button:last-child, .spinbutton.vertical:dir(rtl) .button:last-child { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } .spinbutton.vertical .button:last-child:insensitive, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } .spinbutton.vertical .button:last-child:insensitive > GtkLabel, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive > GtkLabel { color: inherit; } .spinbutton.vertical.entry, .spinbutton.vertical:dir(rtl).entry { @@ -800,16 +855,15 @@ GtkComboBox { border-left-style: none; } GtkComboBox.combobox-entry .button { color: rgba(211, 218, 227, 0.6); - background-color: #2d3036; - border-color: #2d3036; } + background-color: #2b2e39; + border-color: #2b2e39; } GtkComboBox.combobox-entry .button:hover { - background-color: #383c44; - border-color: #5294E2; - box-shadow: -1px 0 #5294E2; } + background-color: #363a47; + border-color: #363a47; } GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } GtkComboBox.combobox-entry .button:insensitive { opacity: 0.5; } @@ -820,40 +874,40 @@ GtkComboBox { .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; - background-color: #444852; } + background-color: #383C4A; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: 1px solid rgba(0, 0, 0, 0.6); + border: 1px solid rgba(0, 0, 0, 0.5); border-radius: 3px; - background-color: rgba(42, 44, 51, 0.9); } + background-color: rgba(53, 57, 69, 0.9); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; + background-color: #2f343f; box-shadow: none; border-width: 0 0 1px 0; border-style: solid; - border-image: linear-gradient(to bottom, #2f343b, #1f2227) 1 0 1 0; } + border-image: linear-gradient(to bottom, #2f343f, #20232b) 1 0 1 0; } .primary-toolbar:backdrop { - background-color: #32383f; } + background-color: #323843; } .inline-toolbar { - background-color: #3d414a; + background-color: #313541; border-style: solid; - border-color: #2d3036; + border-color: #2b2e39; border-width: 0 1px 1px; padding: 3px; border-radius: 0 0 3px 3px; } .search-bar { - background-color: #444852; + background-color: #383C4A; border-style: solid; - border-color: #2d3036; + border-color: #2b2e39; border-width: 0 0 1px; padding: 3px; } .action-bar { - background-color: #3d414a; } + background-color: #313541; } /*************** * Header bars * @@ -863,16 +917,16 @@ GtkComboBox { border-width: 0 0 1px; border-style: solid; border-radius: 0; - border-color: #24272d; + border-color: #262a33; color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; } + background-color: #2f343f; } .csd .header-bar { - background-color: #2f343b; } + background-color: #2f343f; } .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); - background-color: #32383f; } + background-color: #323843; } .csd .header-bar:backdrop { - background-color: #32383f; } + background-color: #323843; } .header-bar .title { padding: 0px 12px; } .header-bar .subtitle { @@ -943,35 +997,35 @@ GtkComboBox { .maximized .header-bar, .maximized .header-bar:backdrop { border-radius: 0; } .maximized .header-bar { - background-color: #2f343b; } + background-color: #2f343f; } .maximized .header-bar:backdrop { - background-color: #32383f; } + background-color: #323843; } .header-bar.default-decoration { padding-top: 5px; padding-bottom: 5px; - background-color: #2f343b; + background-color: #2f343f; border-bottom-width: 0; } .header-bar.default-decoration:backdrop { - background-color: #32383f; } + background-color: #323843; } .titlebar { padding-left: 7px; padding-right: 7px; border-radius: 3px 3px 0 0; color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; - box-shadow: inset 0 1px #363c44; } + background-color: #2f343f; + box-shadow: inset 0 1px #363b48; } .csd .titlebar { - background-color: #2f343b; } + background-color: #2f343f; } .titlebar:backdrop { color: rgba(207, 218, 231, 0.5); - background-color: #32383f; } + background-color: #323843; } .csd .titlebar:backdrop { - background-color: #32383f; } + background-color: #323843; } .maximized .titlebar { - background-color: #2f343b; } + background-color: #2f343f; } .maximized .titlebar:backdrop { - background-color: #32383f; } + background-color: #323843; } .titlebar .titlebar, .titlebar .titlebar:backdrop { @@ -989,8 +1043,8 @@ GtkComboBox { .primary-toolbar .entry, .header-bar .entry { color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } .primary-toolbar .entry.image, .header-bar .entry.image, .primary-toolbar .entry.image:hover, .header-bar .entry.image:hover { color: inherit; } @@ -998,13 +1052,14 @@ GtkComboBox { opacity: 0.85; } .primary-toolbar .entry:focus, .header-bar .entry:focus { color: #ffffff; - border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); + background-clip: padding-box; } .primary-toolbar .entry:focus.image, .header-bar .entry:focus.image { color: #ffffff; } .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus { background-color: #ffffff; color: #5294E2; } @@ -1017,24 +1072,25 @@ GtkComboBox { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); outline-offset: -3px; - background-color: rgba(47, 52, 59, 0); - border-color: rgba(47, 52, 59, 0); } + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .primary-toolbar .button:backdrop, .header-bar .button:backdrop { opacity: 0.7; } .primary-toolbar .button:hover, .header-bar .button:hover { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: #1d2024; - background-color: rgba(40, 44, 50, 0.9); } + border-color: rgba(21, 23, 28, 0.4); + background-color: rgba(95, 105, 127, 0.4); } .primary-toolbar .button:active, .header-bar .button:active, .primary-toolbar .button:checked, .header-bar .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; - background-color: #5294E2; } + border-color: transparent; + background-color: #5294E2; + background-clip: padding-box; } .primary-toolbar .button:insensitive, .header-bar .button:insensitive { color: rgba(207, 218, 231, 0.35); - background-color: rgba(47, 52, 59, 0); - border-color: rgba(47, 52, 59, 0); } + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .primary-toolbar .button:insensitive > GtkLabel, .header-bar .button:insensitive > GtkLabel { color: inherit; } .primary-toolbar .button:insensitive:active, .header-bar .button:insensitive:active, .primary-toolbar .button:insensitive:checked, .header-bar .button:insensitive:checked { @@ -1054,12 +1110,12 @@ GtkComboBox { .primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: #1d2024; - background-color: rgba(40, 44, 50, 0.9); } + border-color: rgba(21, 23, 28, 0.4); + background-color: rgba(95, 105, 127, 0.4); } .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { - border-color: #5294E2; } + background-color: rgba(134, 144, 165, 0.4); } .primary-toolbar .linked.stack-switcher > .button:active, .header-bar .linked.stack-switcher > .button:active, .primary-toolbar .linked.stack-switcher > .button:checked, @@ -1067,8 +1123,52 @@ GtkComboBox { .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } + .primary-toolbar .linked.stack-switcher > .button:insensitive, + .header-bar .linked.stack-switcher > .button:insensitive, + .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive { + color: rgba(207, 218, 231, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:hover, + .header-bar .linked.stack-switcher > .button:hover, + .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:first-child:hover, + .header-bar .linked.stack-switcher > .button:first-child:hover, + .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:last-child:hover, + .header-bar .linked.stack-switcher > .button:last-child:hover, + .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:hover, + .header-bar .linked.stack-switcher > .button:only-child:hover, + .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked { + box-shadow: none; } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; @@ -1162,24 +1262,25 @@ GtkComboBox { .primary-toolbar GtkComboBox.combobox-entry .button, .header-bar GtkComboBox.combobox-entry .button { color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } .primary-toolbar GtkComboBox.combobox-entry .button.image, .header-bar GtkComboBox.combobox-entry .button.image, .primary-toolbar GtkComboBox.combobox-entry .button.image:hover, .header-bar GtkComboBox.combobox-entry .button.image:hover { color: inherit; } .primary-toolbar GtkComboBox.combobox-entry .button:hover, .header-bar GtkComboBox.combobox-entry .button:hover { color: #ffffff; - border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); + box-shadow: none; } .primary-toolbar GtkComboBox.combobox-entry .button:insensitive, .header-bar GtkComboBox.combobox-entry .button:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } .primary-toolbar GtkProgressBar.trough, .header-bar GtkProgressBar.trough, .primary-toolbar .level-bar.trough, .header-bar .level-bar.trough { - background-color: rgba(207, 218, 231, 0.15); } + background-color: rgba(21, 23, 28, 0.4); } .primary-toolbar GtkProgressBar:backdrop, .header-bar GtkProgressBar:backdrop { opacity: 0.75; } @@ -1188,14 +1289,22 @@ GtkComboBox { opacity: 0.75; } .primary-toolbar .scale.trough, .header-bar .scale.trough { - background-image: linear-gradient(to bottom, rgba(207, 218, 231, 0.15)); } + background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.4)); } .primary-toolbar .scale.trough:insensitive, .header-bar .scale.trough:insensitive { - background-image: linear-gradient(to bottom, rgba(207, 218, 231, 0.1)); } + background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.3)); } .primary-toolbar .scale.slider, .header-bar .scale.slider { - background-image: linear-gradient(to bottom, #373b44); } + background-image: linear-gradient(to bottom, #454c5c); + border-color: rgba(21, 23, 28, 0.7); } + .primary-toolbar .scale.slider:hover, .header-bar .scale.slider:hover { + background-image: linear-gradient(to bottom, #50586b); + border-color: rgba(21, 23, 28, 0.7); } + .primary-toolbar .scale.slider:active, .header-bar .scale.slider:active { + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .primary-toolbar .scale.slider:insensitive, .header-bar .scale.slider:insensitive { - background-image: linear-gradient(to bottom, #33373f); } + background-image: linear-gradient(to bottom, #3e4553); + border-color: rgba(21, 23, 28, 0.7); } /************ * Pathbars * @@ -1239,7 +1348,7 @@ GtkTreeView.view { border-color: #93b7e3; } GtkTreeView.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); - color: #868b94; } + color: #8a909b; } GtkTreeView.view.expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } GtkTreeView.view.expander:hover { @@ -1259,13 +1368,13 @@ GtkTreeView.view { background-color: #ffffff; } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #D3DAE3; - background-color: #2d3036; + background-color: #2b2e39; border-radius: 3px; border-width: 0; } column-header .button { - color: #b4bac3; - background-color: #383C45; } + color: #b6bcc6; + background-color: #404552; } column-header .button:hover { color: #5294E2; box-shadow: none; @@ -1282,7 +1391,7 @@ column-header:last-child.button { column-header.button.dnd, column-header .button.dnd, column-header.button.dnd:active, column-header.button.dnd:selected, column-header.button.dnd:hover { transition: none; color: #5294E2; - box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #383C45, inset -1px 0 #383C45; } + box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #404552, inset -1px 0 #404552; } column-header .button, column-header .button:hover, column-header .button:active { padding: 3px 6px; @@ -1291,11 +1400,11 @@ column-header .button, column-header .button:hover, column-header .button:active border-radius: 0; border-image: linear-gradient(to bottom, rgba(255, 255, 255, 0) 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, rgba(255, 255, 255, 0) 80%) 0 1 0 0/0 1px 0 0 stretch; } column-header .button:active, column-header .button:hover { - background-color: #383C45; } + background-color: #404552; } column-header .button:active:hover { color: #D3DAE3; } column-header .button:insensitive { - border-color: #444852; + border-color: #383C4A; background-image: none; } /********* @@ -1304,10 +1413,10 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar { -GtkWidget-window-dragging: true; padding: 0px; - background-color: #2f343b; + background-color: #2f343f; color: rgba(207, 218, 231, 0.8); } .menubar:backdrop { - background-color: #32383f; } + background-color: #323843; } .menubar > .menuitem { padding: 6px 8px; border: solid transparent; @@ -1323,8 +1432,8 @@ column-header .button, column-header .button:hover, column-header .button:active margin: 4px; padding: 0; border-radius: 0; - background-color: #383C45; - border: 1px solid #2d3036; } + background-color: #383C4A; + border: 1px solid #2b2e39; } .csd .menu, .csd .popup { padding: 4px 0px; border-radius: 2px; @@ -1339,7 +1448,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem:insensitive, .popup .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { - color: rgba(56, 60, 69, 0); } + color: rgba(64, 69, 82, 0); } .menu .menuitem.arrow, .popup .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { @@ -1348,11 +1457,11 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none; border-radius: 0; } .menu.button.top, .popup.button.top { - border-bottom: 1px solid #484c55; } + border-bottom: 1px solid #4f5461; } .menu.button.bottom, .popup.button.bottom { - border-top: 1px solid #484c55; } + border-top: 1px solid #4f5461; } .menu.button:hover, .popup.button:hover { - background-color: #484c55; } + background-color: #4f5461; } .menu.button:insensitive, .popup.button:insensitive { color: transparent; background-color: transparent; @@ -1366,13 +1475,13 @@ column-header .button, column-header .button:hover, column-header .button:active ************/ .popover { padding: 2px; - border: 1px solid #212328; + border: 1px solid #20222a; border-radius: 3px; background-clip: border-box; - background-color: #383C45; + background-color: #383C4A; box-shadow: 0 2px 6px 1px rgba(0, 0, 0, 0.35); } .popover .separator, .popover GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .popover .view.separator { - color: rgba(56, 60, 69, 0); } + color: rgba(64, 69, 82, 0); } .popover > .list, .popover > .view, .popover > .toolbar, @@ -1400,7 +1509,7 @@ column-header .button, column-header .button:hover, column-header .button:active *****************/ .notebook { padding: 0; - background-color: #383C45; + background-color: #404552; -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; @@ -1410,7 +1519,7 @@ column-header .button, column-header .button:hover, column-header .button:active -GtkWidget-focus-line-width: 0; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } .notebook.frame { - border: 1px solid #2d3036; } + border: 1px solid #2b2e39; } .notebook.frame.top { border-top-width: 0; } .notebook.frame.bottom { @@ -1420,9 +1529,9 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.frame.left { border-left-width: 0; } .notebook.header { - background-color: #444852; } + background-color: #383C4A; } .notebook.header.frame { - border: 0px solid #2d3036; } + border: 0px solid #2b2e39; } .notebook.header.frame.top { border-bottom-width: 0; } .notebook.header.frame.bottom { @@ -1432,13 +1541,13 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.header.frame.left { border-right-width: 0; } .notebook.header.top { - box-shadow: inset 0 -1px #2d3036; } + box-shadow: inset 0 -1px #2b2e39; } .notebook.header.bottom { - box-shadow: inset 0 1px #2d3036; } + box-shadow: inset 0 1px #2b2e39; } .notebook.header.right { - box-shadow: inset 1px 0 #2d3036; } + box-shadow: inset 1px 0 #2b2e39; } .notebook.header.left { - box-shadow: inset -1px 0 #2d3036; } + box-shadow: inset -1px 0 #2b2e39; } .notebook tab { border-width: 0; border-style: solid; @@ -1459,52 +1568,52 @@ column-header .button, column-header .button:hover, column-header .button:active border-width: 0; border-top-width: 2px; border-color: transparent; - background-color: rgba(56, 60, 69, 0); } + background-color: rgba(64, 69, 82, 0); } .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page, .notebook tab.top:hover, .notebook tab.top.prelight-page { - background-color: rgba(56, 60, 69, 0.5); - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: rgba(64, 69, 82, 0.5); + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.top:active, .notebook tab.top.active-page, .notebook tab.top.active-page:hover { - background-color: #383C45; - box-shadow: inset 0 1px #2d3036, inset 0 -1px #383C45, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: #404552; + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #404552, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.bottom, .notebook tab.bottom { padding-bottom: 6px; border-radius: 0 0 2px 3.5px; border-width: 0; border-bottom-width: 2px; border-color: transparent; - background-color: rgba(56, 60, 69, 0); } + background-color: rgba(64, 69, 82, 0); } .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page { - background-color: rgba(56, 60, 69, 0.5); - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: rgba(64, 69, 82, 0.5); + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.bottom:active, .notebook tab.bottom.active-page, .notebook tab.bottom.active-page:hover { - background-color: #383C45; - box-shadow: inset 0 -1px #383C45, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: #404552; + box-shadow: inset 0 -1px #404552, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.right, .notebook tab.right { padding-right: 17px; border-radius: 0 3.5px 3.5px 0; border-width: 0; border-right-width: 2px; border-color: transparent; - background-color: rgba(56, 60, 69, 0); } + background-color: rgba(64, 69, 82, 0); } .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page { - background-color: rgba(56, 60, 69, 0.5); - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: rgba(64, 69, 82, 0.5); + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.right:active, .notebook tab.right.active-page, .notebook tab.right.active-page:hover { - background-color: #383C45; - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #383C45, inset -1px 0 #2d3036; } + background-color: #404552; + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #404552, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.left, .notebook tab.left { padding-left: 17px; border-radius: 3.5px 0 0 3.5px; border-width: 0; border-left-width: 2px; border-color: transparent; - background-color: rgba(56, 60, 69, 0); } + background-color: rgba(64, 69, 82, 0); } .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page { - background-color: rgba(56, 60, 69, 0.5); - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + background-color: rgba(64, 69, 82, 0.5); + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.left:active, .notebook tab.left.active-page, .notebook tab.left.active-page:hover { - background-color: #383C45; - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #383C45; } + background-color: #404552; + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #404552; } .notebook tab GtkLabel { padding: 0 2px; color: rgba(211, 218, 227, 0.45); } @@ -1514,7 +1623,7 @@ column-header .button, column-header .button:hover, column-header .button:active color: #D3DAE3; } .notebook tab .button { padding: 0; - color: #a1a7b0; } + color: #9da3ad; } .notebook tab .button:hover { color: #ff4d4d; } .notebook tab .button:active { @@ -1548,7 +1657,7 @@ column-header .button, column-header .button:hover, column-header .button:active -GtkRange-slider-width: 6px; } .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { margin: 0; - background-color: #a8aeb7; + background-color: #a5abb5; border: 1px solid rgba(0, 0, 0, 0.3); background-clip: padding-box; } .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .trough { @@ -1564,12 +1673,12 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbar.overlay-indicator.hovering { opacity: 0.99; } .scrollbar .trough { - background-color: #363a42; - border: 1px none #2d3036; } + background-color: #3e434f; + border: 1px none #2b2e39; } .scrollbar .slider { - background-color: #7d828c; } + background-color: #767b87; } .scrollbar .slider:hover { - background-color: #6f747e; } + background-color: #676b78; } .scrollbar .slider:prelight:active { background-color: #5294E2; } .scrollbar .slider:insensitive { @@ -1604,8 +1713,8 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbars-junction, .scrollbars-junction.frame { border-color: transparent; - border-image: linear-gradient(to bottom, #2d3036 1px, transparent 1px) 0 0 0 1/0 1px stretch; - background-color: #363a42; } + border-image: linear-gradient(to bottom, #2b2e39 1px, transparent 1px) 0 0 0 1/0 1px stretch; + background-color: #3e434f; } .scrollbars-junction:dir(rtl), .scrollbars-junction.frame:dir(rtl) { border-image-slice: 0 1 0 0; } @@ -1832,21 +1941,21 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { margin: 3px; } .scale.slider { background-clip: border-box; - background-image: linear-gradient(to bottom, #383c45); - border: 1px solid #5294E2; + background-image: linear-gradient(to bottom, #444a58); + border: 1px solid #262933; border-radius: 50%; box-shadow: none; } .scale.slider:hover { - background-image: linear-gradient(to bottom, #5294E2); - border-color: #5294E2; } + background-image: linear-gradient(to bottom, #505666); + border-color: #262933; } .scale.slider:insensitive { - background-image: linear-gradient(to bottom, #3d414b); - border-color: #4c72a1; } + background-image: linear-gradient(to bottom, #3c414e); + border-color: rgba(38, 41, 51, 0.8); } .scale.slider:active { - background-image: linear-gradient(to bottom, #2679db); - border-color: #2679db; } + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .osd .scale.slider { - background-image: linear-gradient(to bottom, #2a2c33); + background-image: linear-gradient(to bottom, #353945); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1868,15 +1977,15 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough { border: none; border-radius: 2.5px; - background-image: linear-gradient(to bottom, #2f323a); } + background-image: linear-gradient(to bottom, #2d303b); } .scale.trough.highlight { background-image: linear-gradient(to bottom, #5294E2); } .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, rgba(82, 148, 226, 0.55)); } .scale.trough:insensitive { - background-image: linear-gradient(to bottom, rgba(47, 50, 58, 0.55)); } + background-image: linear-gradient(to bottom, rgba(45, 48, 59, 0.55)); } .osd .scale.trough { - background-image: linear-gradient(to bottom, #3a3e46); + background-image: linear-gradient(to bottom, #454a59); outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; @@ -1916,7 +2025,7 @@ GtkProgressBar { GtkProgressBar.trough, .level-bar.trough { border: none; border-radius: 3px; - background-color: #2f323a; } + background-color: #2d303b; } GtkProgressBar.trough.osd, .osd.level-bar.trough { border-style: none; background-color: transparent; @@ -1952,14 +2061,14 @@ GtkLevelBar.vertical { border-color: #F27835; background-color: #F27835; } .level-bar.fill-block.empty-fill-block { - background-color: rgba(211, 218, 227, 0.2); - border-color: rgba(211, 218, 227, 0.2); } + background-color: #404552; + border-color: #404552; } /********** * Frames * **********/ .frame { - border: 1px solid #2d3036; + border: 1px solid #2b2e39; padding: 0; } .frame.flat { border-style: none; } @@ -1985,8 +2094,8 @@ GtkScrolledWindow GtkViewport.frame { * Lists * *********/ .list, .list-row { - background-color: #383C45; - border-color: #2d3036; } + background-color: #404552; + border-color: #2b2e39; } .list-row, .grid-child { @@ -2023,18 +2132,18 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame { padding: 10px; color: #BAC3CF; - background-color: #3c4049; + background-color: #353945; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: #25272d; } + border-color: #1f2128; } .app-notification .button, .app-notification.frame .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } @@ -2042,8 +2151,8 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { @@ -2053,9 +2162,9 @@ GtkScrolledWindow GtkViewport.frame { background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } /************* * Expanders * @@ -2074,7 +2183,7 @@ GtkScrolledWindow GtkViewport.frame { ***********/ GtkCalendar { color: #D3DAE3; - border: 1px solid #2d3036; + border: 1px solid #2b2e39; border-radius: 3px; padding: 2px; } GtkCalendar:selected { @@ -2087,8 +2196,9 @@ GtkCalendar { border-radius: 0; } GtkCalendar.button, GtkCalendar.button:focus { color: rgba(211, 218, 227, 0.45); - box-shadow: none; - border: none; } + border-color: transparent; + background-color: transparent; + background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #D3DAE3; } GtkCalendar.highlight { @@ -2103,8 +2213,8 @@ GtkCalendar { .message-dialog { -GtkDialog-button-spacing: 0; } .message-dialog .titlebar { - background-color: #2f343b; - border-bottom: 1px solid #1f2227; } + background-color: #2f343f; + border-bottom: 1px solid #20232b; } .message-dialog.csd.background { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; @@ -2126,19 +2236,19 @@ GtkCalendar { border-bottom-left-radius: 3px; } GtkFileChooserDialog .search-bar { - background-color: #444852; - border-color: #2d3036; + background-color: #383C4A; + border-color: #2b2e39; box-shadow: none; } GtkFileChooserDialog .dialog-action-box { - border-top: 1px solid #2d3036; } + border-top: 1px solid #2b2e39; } /*********** * Sidebar * ***********/ .sidebar { border: none; - background-color: #444852; } + background-color: #383C4A; } .sidebar:selected { background-color: #5294E2; } @@ -2165,7 +2275,7 @@ GtkPaned { margin-right: 0; margin-left: 8px; } GtkPaned .pane-separator { - background-color: #2d3036; } + background-color: #2b2e39; } GtkPaned.wide { -GtkPaned-handle-size: 5; @@ -2173,7 +2283,7 @@ GtkPaned.wide { GtkPaned.wide .pane-separator { background-color: transparent; border-style: none solid; - border-color: #2d3036; + border-color: #2b2e39; border-width: 1px; } GtkPaned.wide.vertical .pane-separator { border-style: solid none; } @@ -2229,7 +2339,7 @@ GtkInfoBar { color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: #2a2c33; + background-color: #353945; background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2295,13 +2405,13 @@ GtkColorSwatch#add-color-button { border-width: 1px; color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } GtkColorSwatch#add-color-button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } GtkColorSwatch#add-color-button .overlay { border-color: transparent; background-color: transparent; @@ -2320,8 +2430,8 @@ GtkColorButton.button { .scale-popup .button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } GtkVolumeButton.button { padding: 8px; } @@ -2332,11 +2442,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px #1f2227, 0 4px 8px 1px rgba(0, 0, 0, 0.65); + box-shadow: 0 0 0 1px #22262d, 0 8px 8px 0 rgba(0, 0, 0, 0.35); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px #1f2227, 0 4px 5px 2px rgba(0, 0, 0, 0.55); } + box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } .window-frame.ssd { @@ -2346,7 +2456,7 @@ GtkVolumeButton.button { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; - box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #212429; } + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } .window-frame.csd.tooltip { border-radius: 2px; box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.55); } @@ -2355,7 +2465,7 @@ GtkVolumeButton.button { .window-frame.solid-csd { border-radius: 0; margin: 1px; - background-color: #2f343b; + background-color: #2f343f; box-shadow: none; } .header-bar.default-decoration .button.titlebutton, @@ -2369,20 +2479,20 @@ GtkVolumeButton.button { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 59, 0); + background-color: rgba(47, 52, 63, 0); border-width: 0; } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: #1d2024; - background-color: rgba(40, 44, 50, 0.9); } + border-color: rgba(21, 23, 28, 0.4); + background-color: rgba(95, 105, 127, 0.4); } .header-bar .button.titlebutton:active, .header-bar .button.titlebutton:checked, .titlebar .button.titlebutton:active, .titlebar .button.titlebutton:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } .header-bar .button.titlebutton.close, .header-bar .button.titlebutton.maximize, @@ -2556,7 +2666,7 @@ TerminalWindow .notebook tab.top:active, TerminalWindow .notebook tab.top.active-page, TerminalWindow .notebook tab.top.active-page:hover, PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top:active, PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top.active-page, PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top.active-page:hover, PantheonTerminalPantheonTerminalWindow .notebook tab.top:active, PantheonTerminalPantheonTerminalWindow .notebook tab.top.active-page, PantheonTerminalPantheonTerminalWindow .notebook tab.top.active-page:hover { - box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } + box-shadow: inset 0 1px #2b2e39, inset 0 -1px #2b2e39, inset 1px 0 #2b2e39, inset -1px 0 #2b2e39; } TerminalWindow .notebook tab.reorderable-page.top, TerminalWindow .notebook tab.top, @@ -2566,10 +2676,10 @@ PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top, Panth TerminalWindow .notebook.header.top, PantheonTerminalPantheonTerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #24272d, inset 0 -1px #2d3036; } + box-shadow: inset 0 1px #262a33, inset 0 -1px #2b2e39; } GtkHTML { - background-color: #383C45; + background-color: #404552; color: #D3DAE3; } GtkHTML:active { color: #ffffff; @@ -2605,7 +2715,7 @@ NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { .nautilus-canvas-item.label.separator, GtkPlacesSidebar.sidebar .nautilus-canvas-item.label.view.separator, .header-bar .nautilus-canvas-item.subtitle, .nautilus-list-dim-label { - color: #8c919b; } + color: #868b97; } .nautilus-canvas-item.dim-label:selected, .nautilus-canvas-item.label.separator:selected, .header-bar .nautilus-canvas-item.subtitle:selected, @@ -2616,7 +2726,7 @@ GtkPlacesSidebar.sidebar .nautilus-canvas-item.label.view.separator, .header-bar color: #dceaf9; } NautilusNotebook.notebook { - background-color: #383C45; } + background-color: #404552; } NautilusNotebook.notebook tab { border-width: 0; border-style: solid; @@ -2626,7 +2736,7 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar { padding: 5px; box-shadow: none; - background-color: #383C45; } + background-color: #404552; } .nautilus-circular-button { border-radius: 50%; @@ -2642,34 +2752,52 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: rgba(82, 148, 226, 0.8); border-color: rgba(38, 121, 219, 0.8); } .disk-space-display.free { - background-color: #3d414a; - border-color: #26282e; } + background-color: #313541; + border-color: #1b1d24; } NemoWindow .sidebar .frame { border-width: 0; } NemoWindow GtkSeparator.separator.horizontal, NemoWindow GtkPlacesSidebar.sidebar GtkSeparator.horizontal.view.separator, GtkPlacesSidebar.sidebar NemoWindow GtkSeparator.horizontal.view.separator { - color: #2d3036; } + color: #2b2e39; } NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: #1d2024; - background-color: rgba(40, 44, 50, 0.9); } + border-color: rgba(21, 23, 28, 0.4); + background-color: rgba(95, 105, 127, 0.4); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { - border-color: #5294E2; } + background-color: rgba(134, 144, 165, 0.4); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive { + color: rgba(207, 218, 231, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .gedit-headerbar-paned { - color: #24272d; } + color: #262a33; } .open-document-selector-treeview.view { padding: 3px 6px 3px 6px; - border-color: #383C45; } + border-color: #404552; } .open-document-selector-treeview.view:prelight { background-color: rgba(0, 0, 0, 0.05); } .open-document-selector-treeview.view:prelight:selected { @@ -2682,7 +2810,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { /* Only normal state is handle */ .open-document-selector-path-label { - color: #868b94; + color: #8a909b; font-size: smaller; } .open-document-selector-path-label:selected { color: rgba(255, 255, 255, 0.9); } @@ -2698,7 +2826,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: inherit; } .gedit-document-panel .prelight-row .button { - color: #a1a7b0; } + color: #9da3ad; } .gedit-document-panel .list-row .button:hover, .gedit-document-panel .prelight-row .button:hover { @@ -2717,13 +2845,13 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: #D3DAE3; } .gedit-document-panel-dragged-row { - border: 1px solid #2d3036; - background-color: #2d3036; + border: 1px solid #2b2e39; + background-color: #22242d; color: #D3DAE3; } GeditStatusbar { - border-top: 1px solid #2d3036; - background-color: #444852; } + border-top: 1px solid #2b2e39; + background-color: #383C4A; } GeditStatusMenuButton.button.flat, GeditStatusMenuButton:prelight.button.flat, @@ -2732,7 +2860,7 @@ GeditStatusMenuButton:checked.button.flat { border-radius: 0; } GeditFileBrowserWidget .toolbar, GeditFileBrowserWidget .inline-toolbar { - border-bottom: 1px solid #2d3036; } + border-bottom: 1px solid #2b2e39; } .gedit-search-entry-occurrences-tag, .gb-search-entry-occurrences-tag { color: rgba(211, 218, 227, 0.6); @@ -2740,9 +2868,9 @@ GeditFileBrowserWidget .toolbar, GeditFileBrowserWidget .inline-toolbar { padding: 2px; } GeditViewFrame .gedit-search-slider, GbEditorFrame .gb-search-slider { - background-color: #494d58; + background-color: #3c4150; padding: 6px; - border-color: #2d3036; + border-color: #2b2e39; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; } @@ -2751,8 +2879,8 @@ GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr), GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { padding: 0 10px; color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover, @@ -2760,25 +2888,19 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { - color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); - background-color: transparent; - border-color: #5294E2; } - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, - GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { - color: inherit; } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { color: #ffffff; - border-color: #5294E2; + border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; @@ -2804,7 +2926,7 @@ GdTaggedEntry { border: none; } .preferences.sidebar GtkListBox { - background-color: #444852; } + background-color: #383C4A; } .preferences.sidebar GtkListBoxRow { padding: 10px; } @@ -2818,7 +2940,7 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #2a2c33; } + background-color: #353945; } GtkBox.gb-command-bar-box GtkLabel { color: #BAC3CF; } @@ -2827,7 +2949,7 @@ GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; color: #BAC3CF; background-image: none; - background-color: #2a2c33; + background-color: #353945; padding: 6px 6px 6px 6px; border: none; } @@ -2842,10 +2964,10 @@ GbSearchDisplayGroup GtkListBox .list-row, GbDocumentStack .button { GbViewStack GtkBox.header.notebook, GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { - border-bottom: 1px solid #2d3036; } + border-bottom: 1px solid #2b2e39; } GbViewStack.focused GtkBox.header.notebook { - background-color: #383C45; } + background-color: #404552; } GbViewStack.focused GtkBox.header.notebook .button.dim-label, GbViewStack.focused GtkBox.header.notebook .button.label.separator, GbViewStack.focused GtkBox.header.notebook .header-bar .button.subtitle, .header-bar GbViewStack.focused GtkBox.header.notebook .button.subtitle { opacity: 1; } @@ -2910,7 +3032,7 @@ PanelWidget, PanelAppletFrame, PanelApplet { color: #BAC3CF; - background-image: linear-gradient(to bottom, #1f2125); } + background-image: linear-gradient(to bottom, #2b2e37); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2954,18 +3076,18 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: #1f2125; } + background-color: #2b2e37; } .xfce4-panel.panel .button.flat { color: #BAC3CF; - background-color: rgba(31, 33, 37, 0); + background-color: rgba(43, 46, 55, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: #363941; } + background-color: #414654; } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: #0f1012; } + background-color: #1b1d23; } .floating-bar { background-color: #5294E2; @@ -3008,26 +3130,26 @@ MarlinViewWindow *:selected:focus { .marlin-pathbar.pathbar { border-radius: 3px; color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } .marlin-pathbar.pathbar.image, .marlin-pathbar.pathbar.image:hover { color: inherit; } .marlin-pathbar.pathbar:focus { color: #ffffff; - border-color: #5294E2; + border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked { color: #5294E2; } .gala-notification { - border: 1px solid #2d3036; + border: 1px solid #2b2e39; border-radius: 3px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); - background-image: linear-gradient(to bottom, #383C45); + background-image: linear-gradient(to bottom, #404552); background-color: transparent; } .gala-notification .title, .gala-notification .label { color: #D3DAE3; } @@ -3133,24 +3255,24 @@ UnityDecoration { -UnityDecoration-title-fade: 35px; -UnityDecoration-title-alignment: 0.0; } UnityDecoration.top { - border: 1px solid #1f2227; + border: 1px solid #20232b; border-bottom-width: 0; border-radius: 4px 4px 0 0; padding: 1px 6px 0 6px; - background-image: linear-gradient(to bottom, #2f343b); + background-image: linear-gradient(to bottom, #2f343f); color: rgba(207, 218, 231, 0.8); - box-shadow: inset 0 1px #363c44; } + box-shadow: inset 0 1px #363b48; } UnityDecoration.top:backdrop { border-bottom-width: 0; - background-image: linear-gradient(to bottom, #32383f); + background-image: linear-gradient(to bottom, #323843); color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { - background-image: linear-gradient(to bottom, #1f2227); } + background-image: linear-gradient(to bottom, #20232b); } UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #1f2125); + background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } @@ -3173,8 +3295,8 @@ GraniteWidgetsThinPaned { background-color: transparent; background-image: none; margin: 0; - border-left: 1px solid #2d3036; - border-right: 1px solid #2d3036; } + border-left: 1px solid #2b2e39; + border-right: 1px solid #2b2e39; } GraniteWidgetsPopOver .frame, GraniteWidgetsStaticNotebook .frame { @@ -3186,7 +3308,7 @@ GraniteWidgetsStaticNotebook .frame { .secondary-toolbar.toolbar, .secondary-toolbar.inline-toolbar { padding: 3px; - border-bottom: 1px solid #2d3036; } + border-bottom: 1px solid #2b2e39; } .secondary-toolbar.toolbar .button, .secondary-toolbar.inline-toolbar .button { padding: 0 3px 0 3px; } @@ -3194,8 +3316,8 @@ GraniteWidgetsStaticNotebook .frame { padding: 5px; border-width: 1px 0 0 0; border-style: solid; - border-color: #2d3036; - background-color: #444852; } + border-color: #2b2e39; + background-color: #383C4A; } .bottom-toolbar.toolbar .button, .bottom-toolbar.inline-toolbar .button { padding: 2px 3px 2px 3px; } @@ -3205,7 +3327,7 @@ GraniteWidgetsStaticNotebook .frame { .source-list, .source-list.view { - background-color: #444852; + background-color: #383C4A; color: #D3DAE3; -gtk-icon-style: regular; } @@ -3213,7 +3335,7 @@ GraniteWidgetsStaticNotebook .frame { color: transparent; } .source-list.view:prelight { - background-color: #505460; } + background-color: #434859; } .source-list.view:selected, .source-list.view:prelight:selected, @@ -3226,7 +3348,7 @@ GraniteWidgetsStaticNotebook .frame { .source-list .scrollbars-junction { border-image: none; border-color: transparent; - background-color: #444852; + background-color: #383C4A; background-image: none; } .source-list.badge, @@ -3262,10 +3384,10 @@ GraniteWidgetsStaticNotebook .frame { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GraniteWidgetsWelcome { - background-color: #383C45; } + background-color: #404552; } GraniteWidgetsWelcome GtkLabel { - color: #8c919b; + color: #868b97; font: open sans 11; text-shadow: none; } @@ -3286,7 +3408,7 @@ GraniteWidgetsPopOver { margin: 0; } .popover_bg { - background-image: linear-gradient(to bottom, #383C45); + background-image: linear-gradient(to bottom, #404552); border: 1px solid rgba(0, 0, 0, 0.3); } GraniteWidgetsPopOver .sidebar.view, @@ -3304,7 +3426,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { - color: #a8aeb7; + color: #a5abb5; font-weight: 600; text-shadow: 0 1px rgba(255, 255, 255, 0.6); } @@ -3317,10 +3439,10 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: #1f2125; + background-color: #2b2e37; color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px #0f1012; + box-shadow: inset 0 -1px #1b1d23; /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { @@ -3346,7 +3468,7 @@ GtkListBox .h4 { /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: #383C45; + background-color: #383C4A; border-top-left-radius: 2px; border-top-right-radius: 2px; border: solid rgba(0, 0, 0, 0.1); @@ -3355,22 +3477,22 @@ GtkListBox .h4 { #content_frame .button { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #2d3036; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #444a58; } #content_frame .button:hover { color: #D3DAE3; outline-color: rgba(211, 218, 227, 0.3); - border-color: #5294E2; - background-color: #3d414b; } + border-color: #2b2e39; + background-color: #505666; } #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } #content_frame .button:insensitive { color: rgba(211, 218, 227, 0.45); - border-color: rgba(45, 48, 54, 0.55); - background-color: rgba(61, 65, 75, 0.55); } + border-color: rgba(43, 46, 57, 0.55); + background-color: rgba(68, 74, 88, 0.55); } #content_frame .button:insensitive > GtkLabel { color: inherit; } @@ -3379,32 +3501,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: #2a2c33; + background-color: #2f343f; 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; } + box-shadow: inset 0 1px #262a33; } #buttonbox_frame .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } #buttonbox_frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } #login_window #user_combobox { color: #D3DAE3; @@ -3464,10 +3586,10 @@ GtkListBox .h4 { font: bold; } .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator { - color: #24272d; } + color: #262a33; } NemoWindow GtkEventBox { - background-color: #444852; } + background-color: #383C4A; } GtkFileChooserDialog *, NautilusWindow *, @@ -3477,12 +3599,12 @@ NemoWindow { GtkFileChooserDialog .sidebar, NautilusWindow .sidebar, NemoWindow .sidebar { - border-right: 1px solid #25272d; } + border-right: 1px solid #2a2d37; } GtkFileChooserDialog .sidebar:dir(rtl), NautilusWindow .sidebar:dir(rtl), NemoWindow .sidebar:dir(rtl) { - border-left: 1px solid #25272d; } + border-left: 1px solid #2a2d37; } GtkFileChooserDialog.csd.background, GtkFileChooserDialog .source-list, @@ -3507,7 +3629,7 @@ NautilusWindow .source-list.sidebar.view, NemoWindow .sidebar, NemoWindow .source-list.sidebar.view, MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar row, GtkFileChooserDialog .source-list.sidebar.view .view, @@ -3626,25 +3748,25 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: #25272d; } + background-color: #2a2d37; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .sidebar { background-color: transparent; } GtkFileChooserDialog GtkPaned > .vertical > .horizontal { - background-color: #444852; } + background-color: #383C4A; } GtkFileChooserDialog .dialog-action-box { - background-color: #444852; } + background-color: #383C4A; } GtkFileChooserDialog .dialog-vbox > .frame { color: #BAC3CF; @@ -3652,7 +3774,7 @@ GtkFileChooserDialog .dialog-vbox > .frame { GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: #191b1f; } + border-color: #1f2128; } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, @@ -3663,20 +3785,20 @@ GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: #25272d; } + background-color: #2a2d37; } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop { - background-color: #24272d; } + background-color: #262a33; } .gedit-bottom-panel-paned { - background-color: #383C45; } + background-color: #404552; } .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .maximized .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .gedit-document-panel .list-row { color: #BAC3CF; } .gedit-document-panel .list-row { @@ -3703,9 +3825,9 @@ GeditWindow.background.csd { color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } @@ -3722,7 +3844,7 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: #2c2f35; } + border-color: #252831; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #BAC3CF; } @@ -3738,14 +3860,14 @@ GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } 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 { @@ -3755,75 +3877,71 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.4); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.4)); + background-color: transparent; } + GtkFileChooserDialog .action-bar.frame .image.entry, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry, GtkFileChooserDialog .action-bar.frame .image.entry:hover, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry:hover { + color: inherit; } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #BAC3CF; - border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #D3DAE3; @define-color theme_text_color #D3DAE3; -@define-color theme_bg_color #444852; -@define-color theme_base_color #383C45; +@define-color theme_bg_color #383C4A; +@define-color theme_base_color #404552; @define-color theme_selected_bg_color #5294E2; @define-color theme_selected_fg_color #ffffff; @define-color fg_color #D3DAE3; @define-color text_color #D3DAE3; -@define-color bg_color #444852; -@define-color base_color #383C45; +@define-color bg_color #383C4A; +@define-color base_color #404552; @define-color selected_bg_color #5294E2; @define-color selected_fg_color #ffffff; -@define-color insensitive_bg_color #494d58; +@define-color insensitive_bg_color #3c4150; @define-color insensitive_fg_color alpha(#d3dae3, 0.5); -@define-color insensitive_base_color #383C45; +@define-color insensitive_base_color #404552; @define-color theme_unfocused_fg_color #D3DAE3; @define-color theme_unfocused_text_color #D3DAE3; -@define-color theme_unfocused_bg_color #444852; -@define-color theme_unfocused_base_color #383C45; -@define-color borders #2d3036; -@define-color unfocused_borders #2d3036; +@define-color theme_unfocused_bg_color #383C4A; +@define-color theme_unfocused_base_color #404552; +@define-color borders #2b2e39; +@define-color unfocused_borders #2b2e39; @define-color warning_color #F27835; @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); -@define-color wm_bg #2f343b; -@define-color wm_bg_unfocused #32383f; -@define-color wm_highlight #363c44; +@define-color wm_bg #2f343f; +@define-color wm_bg_unfocused #323843; +@define-color wm_highlight #363b48; @define-color wm_shadow alpha(black, 0.35); -@define-color wm_button_close_bg #e45e65; -@define-color wm_button_close_hover_bg #f48085; -@define-color wm_button_close_active_bg #e6262f; -@define-color wm_icon_close_bg #ffffff; -@define-color wm_icon_close_hover_bg #ffffff; -@define-color wm_icon_close_active_bg #ffffff; -@define-color wm_button_bg #272c32; -@define-color wm_button_unfocused_bg #2a3035; -@define-color wm_button_hover_bg #272c32; +@define-color wm_button_close_bg #cc575d; +@define-color wm_button_close_hover_bg #d7787d; +@define-color wm_button_close_active_bg #be3841; +@define-color wm_icon_close_bg #2f343f; +@define-color wm_button_hover_bg #454C5C; @define-color wm_button_active_bg #5294E2; -@define-color wm_button_border #191C21; -@define-color wm_button_unfocused_border #1F2328; -@define-color wm_button_hover_border #5294E2; -@define-color wm_button_active_border #5294E2; -@define-color wm_icon_bg #939ca8; -@define-color wm_icon_unfocused_bg #686f78; -@define-color wm_icon_hover_bg #afb8c5; +@define-color wm_button_hover_border #262932; +@define-color wm_icon_bg #90939B; +@define-color wm_icon_unfocused_bg #666A74; +@define-color wm_icon_hover_bg #C4C7CC; @define-color wm_icon_active_bg #ffffff; -@define-color content_view_bg #383C45; +@define-color content_view_bg #404552; 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 23095fb..5e82c4d 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 @@ -112,7 +112,7 @@ GtkTextView { .popover.osd, .osd { color: #BAC3CF; border: none; - background-color: #2a2c33; + background-color: #353945; background-clip: padding-box; outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } @@ -245,17 +245,18 @@ GtkTextView { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.4); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.4)); + background-color: transparent; } + .osd .entry.image, .osd .entry.image:hover { + color: inherit; } .osd .entry:focus { - color: #BAC3CF; - border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } GtkSearchEntry.entry { border-radius: 20px; } @@ -294,14 +295,14 @@ GtkSearchEntry.entry { .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; + border-color: #cfd6e6; + background-color: white; -gtk-image-effect: highlight; } .button:active, .button:checked { background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; transition-duration: 50ms; } .button:active { @@ -329,31 +330,31 @@ GtkSearchEntry.entry { 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; } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); + background-color: #353945; } .button.osd.image-button { padding: 10px; } .button.osd:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); - background-color: #2a2c33; } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); + background-color: #353945; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .button.osd:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } .osd .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -375,17 +376,17 @@ GtkSearchEntry.entry { .osd .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .osd .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } .osd .button.flat { border-color: transparent; background-color: transparent; @@ -394,12 +395,12 @@ GtkSearchEntry.entry { .osd .button.flat:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .osd .button.flat:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; @@ -531,13 +532,13 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } .inline-toolbar GtkToolButton > .button:insensitive { color: rgba(92, 97, 108, 0.55); @@ -568,7 +569,15 @@ GtkSearchEntry.entry { GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .button:hover, .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .button:hover:dir(ltr) { - box-shadow: inset 1px 0 #5294E2, inset -1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); } + .inline-toolbar GtkToolButton > .button.flat:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active, + GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .button:active, .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .button:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked, + GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .button:checked, .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .button:checked:dir(ltr) { + box-shadow: none; } .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl), .header-bar .linked.stack-switcher > .button:dir(rtl), @@ -585,7 +594,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:first-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .button:first-child:hover, .linked > GtkComboBox:first-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover, .header-bar .linked.stack-switcher > .button:first-child:hover, .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { - box-shadow: inset -1px 0 #5294E2; } + box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); } + .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active, + .inline-toolbar GtkToolButton:first-child > .button.flat:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .button:first-child:active, .linked > GtkComboBox:first-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked, + .inline-toolbar GtkToolButton:first-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .button:first-child:checked, .linked > GtkComboBox:first-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } .osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button, .primary-toolbar .linked.stack-switcher > .button:last-child, @@ -597,7 +614,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:last-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .button:last-child:hover, .linked > GtkComboBox:last-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover, .header-bar .linked.stack-switcher > .button:last-child:hover, .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { - box-shadow: inset 1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); } + .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active, + .inline-toolbar GtkToolButton:last-child > .button.flat:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .button:last-child:active, .linked > GtkComboBox:last-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked, + .inline-toolbar GtkToolButton:last-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .button:last-child:checked, .linked > GtkComboBox:last-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl), .header-bar .linked.stack-switcher > .button:last-child:dir(rtl), @@ -615,6 +640,14 @@ GtkSearchEntry.entry { .header-bar .linked.stack-switcher > .button:only-child:hover, .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { box-shadow: none; } + .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active, + .inline-toolbar GtkToolButton:only-child > .button.flat:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .button:only-child:active, .linked > GtkComboBox:only-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked, + .inline-toolbar GtkToolButton:only-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .button:only-child:checked, .linked > GtkComboBox:only-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button, .linked.vertical > .button:hover, @@ -628,7 +661,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:hover, .linked.vertical > .button:hover, .linked.vertical > GtkComboBoxText > .button:hover, .linked.vertical > GtkComboBox > .button:hover { - box-shadow: inset 0 1px #5294E2, inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4), inset 0 1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:active, .linked.vertical > .button:active, + .linked.vertical > GtkComboBoxText > .button:active, + .linked.vertical > GtkComboBox > .button:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked, + .linked.vertical > GtkComboBoxText > .button:checked, + .linked.vertical > GtkComboBox > .button:checked { + box-shadow: none; } .linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, @@ -638,7 +677,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover, .linked.vertical > GtkComboBoxText:first-child > .button:hover, .linked.vertical > GtkComboBox:first-child > .button:hover { - box-shadow: inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active, + .linked.vertical > GtkComboBoxText:first-child > .button:active, + .linked.vertical > GtkComboBox:first-child > .button:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked, + .linked.vertical > GtkComboBoxText:first-child > .button:checked, + .linked.vertical > GtkComboBox:first-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, @@ -648,7 +693,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover, .linked.vertical > GtkComboBoxText:last-child > .button:hover, .linked.vertical > GtkComboBox:last-child > .button:hover { - box-shadow: inset 0 1px #5294E2; } + box-shadow: inset 0 1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active, + .linked.vertical > GtkComboBoxText:last-child > .button:active, + .linked.vertical > GtkComboBox:last-child > .button:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked, + .linked.vertical > GtkComboBoxText:last-child > .button:checked, + .linked.vertical > GtkComboBox:last-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, @@ -659,6 +710,12 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBoxText:only-child > .button:hover, .linked.vertical > GtkComboBox:only-child > .button:hover { box-shadow: none; } + .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active, + .linked.vertical > GtkComboBoxText:only-child > .button:active, + .linked.vertical > GtkComboBox:only-child > .button:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked, + .linked.vertical > GtkComboBoxText:only-child > .button:checked, + .linked.vertical > GtkComboBox:only-child > .button:checked { + box-shadow: none; } .menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, @@ -715,8 +772,6 @@ GtkSearchEntry.entry { border-style: none solid none none; } .spinbutton .button:first-child { color: red; } - .spinbutton .button:hover { - color: #5294E2; } .spinbutton .button:insensitive { color: rgba(92, 97, 108, 0.55); } .spinbutton .button:active { @@ -730,13 +785,13 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .spinbutton.vertical .button:first-child:insensitive, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive { color: rgba(92, 97, 108, 0.55); border-color: rgba(207, 214, 230, 0.55); @@ -751,13 +806,13 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .spinbutton.vertical .button:last-child:insensitive, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive { color: rgba(92, 97, 108, 0.55); border-color: rgba(207, 214, 230, 0.55); @@ -804,12 +859,11 @@ GtkComboBox { border-color: #cfd6e6; } GtkComboBox.combobox-entry .button:hover { background-color: #e0e4ef; - border-color: #5294E2; - box-shadow: -1px 0 #5294E2; } + border-color: #e0e4ef; } GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } GtkComboBox.combobox-entry .button:insensitive { opacity: 0.5; } @@ -823,19 +877,19 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: 1px solid rgba(0, 0, 0, 0.6); + border: 1px solid rgba(0, 0, 0, 0.5); border-radius: 3px; - background-color: rgba(42, 44, 51, 0.9); } + background-color: rgba(53, 57, 69, 0.9); } .primary-toolbar { color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; + background-color: #2f343f; box-shadow: none; border-width: 0 0 1px 0; border-style: solid; - border-image: linear-gradient(to bottom, #2f343b, #1f2227) 1 0 1 0; } + border-image: linear-gradient(to bottom, #2f343f, #20232b) 1 0 1 0; } .primary-toolbar:backdrop { - background-color: #32383f; } + background-color: #323843; } .inline-toolbar { background-color: #edeef0; @@ -863,16 +917,16 @@ GtkComboBox { border-width: 0 0 1px; border-style: solid; border-radius: 0; - border-color: #1f2227; + border-color: #262a33; color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; } + background-color: #2f343f; } .csd .header-bar { - background-color: #2f343b; } + background-color: #2f343f; } .header-bar:backdrop { color: rgba(207, 218, 231, 0.5); - background-color: #32383f; } + background-color: #323843; } .csd .header-bar:backdrop { - background-color: #32383f; } + background-color: #323843; } .header-bar .title { padding: 0px 12px; } .header-bar .subtitle { @@ -943,35 +997,35 @@ GtkComboBox { .maximized .header-bar, .maximized .header-bar:backdrop { border-radius: 0; } .maximized .header-bar { - background-color: #2f343b; } + background-color: #2f343f; } .maximized .header-bar:backdrop { - background-color: #32383f; } + background-color: #323843; } .header-bar.default-decoration { padding-top: 5px; padding-bottom: 5px; - background-color: #2f343b; + background-color: #2f343f; border-bottom-width: 0; } .header-bar.default-decoration:backdrop { - background-color: #32383f; } + background-color: #323843; } .titlebar { padding-left: 7px; padding-right: 7px; border-radius: 3px 3px 0 0; color: rgba(207, 218, 231, 0.8); - background-color: #2f343b; - box-shadow: inset 0 1px #363c44; } + background-color: #2f343f; + box-shadow: inset 0 1px #363b48; } .csd .titlebar { - background-color: #2f343b; } + background-color: #2f343f; } .titlebar:backdrop { color: rgba(207, 218, 231, 0.5); - background-color: #32383f; } + background-color: #323843; } .csd .titlebar:backdrop { - background-color: #32383f; } + background-color: #323843; } .maximized .titlebar { - background-color: #2f343b; } + background-color: #2f343f; } .maximized .titlebar:backdrop { - background-color: #32383f; } + background-color: #323843; } .titlebar .titlebar, .titlebar .titlebar:backdrop { @@ -989,8 +1043,8 @@ GtkComboBox { .primary-toolbar .entry, .header-bar .entry { color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } .primary-toolbar .entry.image, .header-bar .entry.image, .primary-toolbar .entry.image:hover, .header-bar .entry.image:hover { color: inherit; } @@ -998,13 +1052,14 @@ GtkComboBox { opacity: 0.85; } .primary-toolbar .entry:focus, .header-bar .entry:focus { color: #ffffff; - border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); + background-clip: padding-box; } .primary-toolbar .entry:focus.image, .header-bar .entry:focus.image { color: #ffffff; } .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus { background-color: #ffffff; color: #5294E2; } @@ -1017,24 +1072,25 @@ GtkComboBox { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); outline-offset: -3px; - background-color: rgba(47, 52, 59, 0); - border-color: rgba(47, 52, 59, 0); } + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .primary-toolbar .button:backdrop, .header-bar .button:backdrop { opacity: 0.7; } .primary-toolbar .button:hover, .header-bar .button:hover { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: #1d2024; - background-color: rgba(40, 44, 50, 0.9); } + border-color: rgba(21, 23, 28, 0.4); + background-color: rgba(95, 105, 127, 0.4); } .primary-toolbar .button:active, .header-bar .button:active, .primary-toolbar .button:checked, .header-bar .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; - background-color: #5294E2; } + border-color: transparent; + background-color: #5294E2; + background-clip: padding-box; } .primary-toolbar .button:insensitive, .header-bar .button:insensitive { color: rgba(207, 218, 231, 0.35); - background-color: rgba(47, 52, 59, 0); - border-color: rgba(47, 52, 59, 0); } + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .primary-toolbar .button:insensitive > GtkLabel, .header-bar .button:insensitive > GtkLabel { color: inherit; } .primary-toolbar .button:insensitive:active, .header-bar .button:insensitive:active, .primary-toolbar .button:insensitive:checked, .header-bar .button:insensitive:checked { @@ -1054,12 +1110,12 @@ GtkComboBox { .primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: #1d2024; - background-color: rgba(40, 44, 50, 0.9); } + border-color: rgba(21, 23, 28, 0.4); + background-color: rgba(95, 105, 127, 0.4); } .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { - border-color: #5294E2; } + background-color: rgba(134, 144, 165, 0.4); } .primary-toolbar .linked.stack-switcher > .button:active, .header-bar .linked.stack-switcher > .button:active, .primary-toolbar .linked.stack-switcher > .button:checked, @@ -1067,8 +1123,52 @@ GtkComboBox { .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } + .primary-toolbar .linked.stack-switcher > .button:insensitive, + .header-bar .linked.stack-switcher > .button:insensitive, + .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive { + color: rgba(207, 218, 231, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:hover, + .header-bar .linked.stack-switcher > .button:hover, + .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:first-child:hover, + .header-bar .linked.stack-switcher > .button:first-child:hover, + .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:last-child:hover, + .header-bar .linked.stack-switcher > .button:last-child:hover, + .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:hover, + .header-bar .linked.stack-switcher > .button:only-child:hover, + .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked { + box-shadow: none; } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; @@ -1162,24 +1262,25 @@ GtkComboBox { .primary-toolbar GtkComboBox.combobox-entry .button, .header-bar GtkComboBox.combobox-entry .button { color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } .primary-toolbar GtkComboBox.combobox-entry .button.image, .header-bar GtkComboBox.combobox-entry .button.image, .primary-toolbar GtkComboBox.combobox-entry .button.image:hover, .header-bar GtkComboBox.combobox-entry .button.image:hover { color: inherit; } .primary-toolbar GtkComboBox.combobox-entry .button:hover, .header-bar GtkComboBox.combobox-entry .button:hover { color: #ffffff; - border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); + box-shadow: none; } .primary-toolbar GtkComboBox.combobox-entry .button:insensitive, .header-bar GtkComboBox.combobox-entry .button:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } .primary-toolbar GtkProgressBar.trough, .header-bar GtkProgressBar.trough, .primary-toolbar .level-bar.trough, .header-bar .level-bar.trough { - background-color: rgba(207, 218, 231, 0.15); } + background-color: rgba(21, 23, 28, 0.4); } .primary-toolbar GtkProgressBar:backdrop, .header-bar GtkProgressBar:backdrop { opacity: 0.75; } @@ -1188,15 +1289,22 @@ GtkComboBox { opacity: 0.75; } .primary-toolbar .scale.trough, .header-bar .scale.trough { - background-image: linear-gradient(to bottom, rgba(207, 218, 231, 0.15)); } + background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.4)); } .primary-toolbar .scale.trough:insensitive, .header-bar .scale.trough:insensitive { - background-image: linear-gradient(to bottom, rgba(207, 218, 231, 0.1)); } + background-image: linear-gradient(to bottom, rgba(21, 23, 28, 0.3)); } .primary-toolbar .scale.slider, .header-bar .scale.slider { - background-image: linear-gradient(to bottom, #262a30); } + background-image: linear-gradient(to bottom, #454c5c); + border-color: rgba(21, 23, 28, 0.7); } + .primary-toolbar .scale.slider:hover, .header-bar .scale.slider:hover { + background-image: linear-gradient(to bottom, #50586b); + border-color: rgba(21, 23, 28, 0.7); } + .primary-toolbar .scale.slider:active, .header-bar .scale.slider:active { + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .primary-toolbar .scale.slider:insensitive, .header-bar .scale.slider:insensitive { - background-image: linear-gradient(to bottom, #2d3138); - border-color: #3d5a7e; } + background-image: linear-gradient(to bottom, #3e4553); + border-color: rgba(21, 23, 28, 0.7); } /************ * Pathbars * @@ -1305,10 +1413,10 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar { -GtkWidget-window-dragging: true; padding: 0px; - background-color: #2f343b; + background-color: #2f343f; color: rgba(207, 218, 231, 0.8); } .menubar:backdrop { - background-color: #32383f; } + background-color: #323843; } .menubar > .menuitem { padding: 6px 8px; border: solid transparent; @@ -1833,21 +1941,21 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { margin: 3px; } .scale.slider { background-clip: border-box; - background-image: linear-gradient(to bottom, #ffffff); - border: 1px solid #5294E2; + background-image: linear-gradient(to bottom, #fbfbfc); + border: 1px solid rgba(123, 142, 186, 0.5); border-radius: 50%; box-shadow: none; } .scale.slider:hover { - background-image: linear-gradient(to bottom, #5294E2); - border-color: #5294E2; } + background-image: linear-gradient(to bottom, white); + border-color: rgba(123, 142, 186, 0.5); } .scale.slider:insensitive { background-image: linear-gradient(to bottom, #fbfbfb); - border-color: #9bc0eb; } + border-color: rgba(123, 142, 186, 0.3); } .scale.slider:active { - background-image: linear-gradient(to bottom, #2679db); - border-color: #2679db; } + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .osd .scale.slider { - background-image: linear-gradient(to bottom, #2a2c33); + background-image: linear-gradient(to bottom, #353945); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1877,7 +1985,7 @@ 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, #3a3e46); + background-image: linear-gradient(to bottom, #454a59); outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; @@ -2024,18 +2132,18 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame { padding: 10px; color: #BAC3CF; - background-color: #3c4049; + background-color: #353945; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: #25272d; } + border-color: #1f2128; } .app-notification .button, .app-notification.frame .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } @@ -2043,8 +2151,8 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { @@ -2054,9 +2162,9 @@ GtkScrolledWindow GtkViewport.frame { background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } /************* * Expanders * @@ -2088,8 +2196,9 @@ GtkCalendar { border-radius: 0; } GtkCalendar.button, GtkCalendar.button:focus { color: rgba(92, 97, 108, 0.45); - box-shadow: none; - border: none; } + border-color: transparent; + background-color: transparent; + background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #5c616c; } GtkCalendar.highlight { @@ -2104,8 +2213,8 @@ GtkCalendar { .message-dialog { -GtkDialog-button-spacing: 0; } .message-dialog .titlebar { - background-color: #2f343b; - border-bottom: 1px solid #1f2227; } + background-color: #2f343f; + border-bottom: 1px solid #20232b; } .message-dialog.csd.background { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; @@ -2230,7 +2339,7 @@ GtkInfoBar { color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: #2a2c33; + background-color: #353945; background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2301,8 +2410,8 @@ GtkColorSwatch#add-color-button { GtkColorSwatch#add-color-button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } GtkColorSwatch#add-color-button .overlay { border-color: transparent; background-color: transparent; @@ -2321,8 +2430,8 @@ GtkColorButton.button { .scale-popup .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } GtkVolumeButton.button { padding: 8px; } @@ -2333,11 +2442,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px #1f2227, 0 4px 8px 1px rgba(0, 0, 0, 0.25); + box-shadow: 0 0 0 1px #22262d, 0 8px 8px 0 rgba(0, 0, 0, 0.2); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px #1f2227, 0 4px 5px 2px rgba(0, 0, 0, 0.25); } + box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } .window-frame.ssd { @@ -2356,7 +2465,7 @@ GtkVolumeButton.button { .window-frame.solid-csd { border-radius: 0; margin: 1px; - background-color: #2f343b; + background-color: #2f343f; box-shadow: none; } .header-bar.default-decoration .button.titlebutton, @@ -2370,20 +2479,20 @@ GtkVolumeButton.button { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 59, 0); + background-color: rgba(47, 52, 63, 0); border-width: 0; } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: #1d2024; - background-color: rgba(40, 44, 50, 0.9); } + border-color: rgba(21, 23, 28, 0.4); + background-color: rgba(95, 105, 127, 0.4); } .header-bar .button.titlebutton:active, .header-bar .button.titlebutton:checked, .titlebar .button.titlebutton:active, .titlebar .button.titlebutton:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } .header-bar .button.titlebutton.close, .header-bar .button.titlebutton.maximize, @@ -2567,7 +2676,7 @@ PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top, Panth TerminalWindow .notebook.header.top, PantheonTerminalPantheonTerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #1f2227, inset 0 -1px #dbdfe3; } + box-shadow: inset 0 1px #262a33, inset 0 -1px #dbdfe3; } GtkHTML { background-color: #ffffff; @@ -2655,18 +2764,36 @@ NemoWindow GtkSeparator.separator.horizontal, NemoWindow GtkPlacesSidebar.sideba NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: rgba(207, 218, 231, 0.8); outline-color: rgba(207, 218, 231, 0.1); - border-color: #1d2024; - background-color: rgba(40, 44, 50, 0.9); } + border-color: rgba(21, 23, 28, 0.4); + background-color: rgba(95, 105, 127, 0.4); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { - border-color: #5294E2; } + background-color: rgba(134, 144, 165, 0.4); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive { + color: rgba(207, 218, 231, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .gedit-headerbar-paned { - color: #1f2227; } + color: #262a33; } .open-document-selector-treeview.view { padding: 3px 6px 3px 6px; @@ -2752,8 +2879,8 @@ GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr), GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { padding: 0 10px; color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover, @@ -2761,25 +2888,19 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { - color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); - background-color: transparent; - border-color: #5294E2; } - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, - GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { - color: inherit; } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { color: #ffffff; - border-color: #5294E2; + border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; @@ -2819,7 +2940,7 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #2a2c33; } + background-color: #353945; } GtkBox.gb-command-bar-box GtkLabel { color: #BAC3CF; } @@ -2828,7 +2949,7 @@ GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; color: #BAC3CF; background-image: none; - background-color: #2a2c33; + background-color: #353945; padding: 6px 6px 6px 6px; border: none; } @@ -2911,7 +3032,7 @@ PanelWidget, PanelAppletFrame, PanelApplet { color: #BAC3CF; - background-image: linear-gradient(to bottom, #1f2125); } + background-image: linear-gradient(to bottom, #2b2e37); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2955,18 +3076,18 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: #1f2125; } + background-color: #2b2e37; } .xfce4-panel.panel .button.flat { color: #BAC3CF; - background-color: rgba(31, 33, 37, 0); + background-color: rgba(43, 46, 55, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: #363941; } + background-color: #414654; } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: #0f1012; } + background-color: #1b1d23; } .floating-bar { background-color: #5294E2; @@ -3009,18 +3130,18 @@ MarlinViewWindow *:selected:focus { .marlin-pathbar.pathbar { border-radius: 3px; color: rgba(207, 218, 231, 0.8); - border-color: #181b1f; - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + border-color: rgba(21, 23, 28, 0.4); + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } .marlin-pathbar.pathbar.image, .marlin-pathbar.pathbar.image:hover { color: inherit; } .marlin-pathbar.pathbar:focus { color: #ffffff; - border-color: #5294E2; + border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:insensitive { color: rgba(207, 218, 231, 0.35); - background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } + background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked { color: #5294E2; } @@ -3134,24 +3255,24 @@ UnityDecoration { -UnityDecoration-title-fade: 35px; -UnityDecoration-title-alignment: 0.0; } UnityDecoration.top { - border: 1px solid #1f2227; + border: 1px solid #20232b; border-bottom-width: 0; border-radius: 4px 4px 0 0; padding: 1px 6px 0 6px; - background-image: linear-gradient(to bottom, #2f343b); + background-image: linear-gradient(to bottom, #2f343f); color: rgba(207, 218, 231, 0.8); - box-shadow: inset 0 1px #363c44; } + box-shadow: inset 0 1px #363b48; } UnityDecoration.top:backdrop { border-bottom-width: 0; - background-image: linear-gradient(to bottom, #32383f); + background-image: linear-gradient(to bottom, #323843); color: rgba(207, 218, 231, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { - background-image: linear-gradient(to bottom, #1f2227); } + background-image: linear-gradient(to bottom, #20232b); } UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #1f2125); + background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } @@ -3318,10 +3439,10 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: #1f2125; + background-color: #2b2e37; color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px #0f1012; + box-shadow: inset 0 -1px #1b1d23; /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { @@ -3361,12 +3482,12 @@ GtkListBox .h4 { #content_frame .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; + border-color: transparent; background-color: #5294E2; } #content_frame .button:insensitive { color: rgba(92, 97, 108, 0.55); @@ -3380,32 +3501,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: #2a2c33; + background-color: #353945; 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; } + box-shadow: inset 0 1px #353945; } #buttonbox_frame .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } #buttonbox_frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } #login_window #user_combobox { color: #5c616c; @@ -3465,7 +3586,7 @@ GtkListBox .h4 { font: bold; } .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator { - color: #1f2227; } + color: #262a33; } NemoWindow GtkEventBox { background-color: #F5F6F7; } @@ -3498,7 +3619,7 @@ NautilusWindow .source-list.sidebar.view, NemoWindow .sidebar, NemoWindow .source-list.sidebar.view, MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar row, GtkFileChooserDialog .source-list.sidebar.view .view, @@ -3617,16 +3738,16 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .sidebar { background-color: transparent; } @@ -3643,7 +3764,7 @@ GtkFileChooserDialog .dialog-vbox > .frame { GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: #2c2f35; } + border-color: #2a2d37; } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, @@ -3654,20 +3775,20 @@ GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: #3c4049; } + background-color: #353945; } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop { - background-color: #1f2227; } + background-color: #262a33; } .gedit-bottom-panel-paned { background-color: #ffffff; } .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .maximized .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .gedit-document-panel .list-row { color: #BAC3CF; } .gedit-document-panel .list-row { @@ -3694,9 +3815,9 @@ GeditWindow.background.csd { color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } @@ -3713,7 +3834,7 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: #2c2f35; } + border-color: #252831; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #BAC3CF; } @@ -3729,14 +3850,14 @@ GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } 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 { @@ -3746,26 +3867,29 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.4); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.4)); + background-color: transparent; } + GtkFileChooserDialog .action-bar.frame .image.entry, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry, GtkFileChooserDialog .action-bar.frame .image.entry:hover, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry:hover { + color: inherit; } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #BAC3CF; - border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + color: #ffffff; + border-color: transparent; + background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @@ -3795,26 +3919,19 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { @define-color placeholder_text_color #A8A8A8; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); -@define-color wm_bg #2f343b; -@define-color wm_bg_unfocused #32383f; -@define-color wm_highlight #363c44; +@define-color wm_bg #2f343f; +@define-color wm_bg_unfocused #323843; +@define-color wm_highlight #363b48; @define-color wm_shadow alpha(black, 0.35); -@define-color wm_button_close_bg #e45e65; -@define-color wm_button_close_hover_bg #f48085; -@define-color wm_button_close_active_bg #e6262f; -@define-color wm_icon_close_bg #ffffff; -@define-color wm_icon_close_hover_bg #ffffff; -@define-color wm_icon_close_active_bg #ffffff; -@define-color wm_button_bg #272c32; -@define-color wm_button_unfocused_bg #2a3035; -@define-color wm_button_hover_bg #272c32; +@define-color wm_button_close_bg #cc575d; +@define-color wm_button_close_hover_bg #d7787d; +@define-color wm_button_close_active_bg #be3841; +@define-color wm_icon_close_bg #2f343f; +@define-color wm_button_hover_bg #454C5C; @define-color wm_button_active_bg #5294E2; -@define-color wm_button_border #191C21; -@define-color wm_button_unfocused_border #1F2328; -@define-color wm_button_hover_border #5294E2; -@define-color wm_button_active_border #5294E2; -@define-color wm_icon_bg #939ca8; -@define-color wm_icon_unfocused_bg #686f78; -@define-color wm_icon_hover_bg #afb8c5; +@define-color wm_button_hover_border #262932; +@define-color wm_icon_bg #90939B; +@define-color wm_icon_unfocused_bg #666A74; +@define-color wm_icon_hover_bg #C4C7CC; @define-color wm_icon_active_bg #ffffff; @define-color content_view_bg #ffffff; 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 180d88a..5f07578 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -112,7 +112,7 @@ GtkTextView { .popover.osd, .osd { color: #BAC3CF; border: none; - background-color: #2a2c33; + background-color: #353945; background-clip: padding-box; outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } @@ -245,17 +245,18 @@ GtkTextView { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.4); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.4)); + background-color: transparent; } + .osd .entry.image, .osd .entry.image:hover { + color: inherit; } .osd .entry:focus { - color: #BAC3CF; + color: #ffffff; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } GtkSearchEntry.entry { border-radius: 20px; } @@ -294,8 +295,8 @@ GtkSearchEntry.entry { .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; + border-color: #cfd6e6; + background-color: white; -gtk-image-effect: highlight; } .button:active, .button:checked { background-clip: border-box; @@ -329,31 +330,31 @@ GtkSearchEntry.entry { 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; } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); + background-color: #353945; } .button.osd.image-button { padding: 10px; } .button.osd:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); - background-color: #2a2c33; } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); + background-color: #353945; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .button.osd:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } .osd .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -375,17 +376,17 @@ GtkSearchEntry.entry { .osd .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .osd .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } .osd .button.flat { border-color: transparent; background-color: transparent; @@ -394,12 +395,12 @@ GtkSearchEntry.entry { .osd .button.flat:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .osd .button.flat:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; @@ -531,8 +532,8 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; @@ -568,7 +569,15 @@ GtkSearchEntry.entry { GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .button:hover, .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .button:hover:dir(ltr) { - box-shadow: inset 1px 0 #5294E2, inset -1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); } + .inline-toolbar GtkToolButton > .button.flat:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active, + GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .button:active, .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .button:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked, + GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .button:checked, .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .button:checked:dir(ltr) { + box-shadow: none; } .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl), .header-bar .linked.stack-switcher > .button:dir(rtl), @@ -585,7 +594,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:first-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .button:first-child:hover, .linked > GtkComboBox:first-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover, .header-bar .linked.stack-switcher > .button:first-child:hover, .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { - box-shadow: inset -1px 0 #5294E2; } + box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); } + .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active, + .inline-toolbar GtkToolButton:first-child > .button.flat:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .button:first-child:active, .linked > GtkComboBox:first-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked, + .inline-toolbar GtkToolButton:first-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .button:first-child:checked, .linked > GtkComboBox:first-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } .osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button, .primary-toolbar .linked.stack-switcher > .button:last-child, @@ -597,7 +614,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:last-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .button:last-child:hover, .linked > GtkComboBox:last-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover, .header-bar .linked.stack-switcher > .button:last-child:hover, .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { - box-shadow: inset 1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); } + .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active, + .inline-toolbar GtkToolButton:last-child > .button.flat:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .button:last-child:active, .linked > GtkComboBox:last-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked, + .inline-toolbar GtkToolButton:last-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .button:last-child:checked, .linked > GtkComboBox:last-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl), .header-bar .linked.stack-switcher > .button:last-child:dir(rtl), @@ -615,6 +640,14 @@ GtkSearchEntry.entry { .header-bar .linked.stack-switcher > .button:only-child:hover, .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { box-shadow: none; } + .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active, + .inline-toolbar GtkToolButton:only-child > .button.flat:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .button:only-child:active, .linked > GtkComboBox:only-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked, + .inline-toolbar GtkToolButton:only-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .button:only-child:checked, .linked > GtkComboBox:only-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button, .linked.vertical > .button:hover, @@ -628,7 +661,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:hover, .linked.vertical > .button:hover, .linked.vertical > GtkComboBoxText > .button:hover, .linked.vertical > GtkComboBox > .button:hover { - box-shadow: inset 0 1px #5294E2, inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4), inset 0 1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:active, .linked.vertical > .button:active, + .linked.vertical > GtkComboBoxText > .button:active, + .linked.vertical > GtkComboBox > .button:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked, + .linked.vertical > GtkComboBoxText > .button:checked, + .linked.vertical > GtkComboBox > .button:checked { + box-shadow: none; } .linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, @@ -638,7 +677,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover, .linked.vertical > GtkComboBoxText:first-child > .button:hover, .linked.vertical > GtkComboBox:first-child > .button:hover { - box-shadow: inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active, + .linked.vertical > GtkComboBoxText:first-child > .button:active, + .linked.vertical > GtkComboBox:first-child > .button:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked, + .linked.vertical > GtkComboBoxText:first-child > .button:checked, + .linked.vertical > GtkComboBox:first-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, @@ -648,7 +693,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover, .linked.vertical > GtkComboBoxText:last-child > .button:hover, .linked.vertical > GtkComboBox:last-child > .button:hover { - box-shadow: inset 0 1px #5294E2; } + box-shadow: inset 0 1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active, + .linked.vertical > GtkComboBoxText:last-child > .button:active, + .linked.vertical > GtkComboBox:last-child > .button:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked, + .linked.vertical > GtkComboBoxText:last-child > .button:checked, + .linked.vertical > GtkComboBox:last-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, @@ -659,6 +710,12 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBoxText:only-child > .button:hover, .linked.vertical > GtkComboBox:only-child > .button:hover { box-shadow: none; } + .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active, + .linked.vertical > GtkComboBoxText:only-child > .button:active, + .linked.vertical > GtkComboBox:only-child > .button:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked, + .linked.vertical > GtkComboBoxText:only-child > .button:checked, + .linked.vertical > GtkComboBox:only-child > .button:checked { + box-shadow: none; } .menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, @@ -715,8 +772,6 @@ GtkSearchEntry.entry { border-style: none solid none none; } .spinbutton .button:first-child { color: red; } - .spinbutton .button:hover { - color: #5294E2; } .spinbutton .button:insensitive { color: rgba(92, 97, 108, 0.55); } .spinbutton .button:active { @@ -735,8 +790,8 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .spinbutton.vertical .button:first-child:insensitive, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive { color: rgba(92, 97, 108, 0.55); border-color: rgba(207, 214, 230, 0.55); @@ -756,8 +811,8 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .spinbutton.vertical .button:last-child:insensitive, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive { color: rgba(92, 97, 108, 0.55); border-color: rgba(207, 214, 230, 0.55); @@ -804,8 +859,7 @@ GtkComboBox { border-color: #cfd6e6; } GtkComboBox.combobox-entry .button:hover { background-color: #e0e4ef; - border-color: #5294E2; - box-shadow: -1px 0 #5294E2; } + border-color: #e0e4ef; } GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); @@ -823,9 +877,9 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: 1px solid rgba(0, 0, 0, 0.6); + border: 1px solid rgba(0, 0, 0, 0.5); border-radius: 3px; - background-color: rgba(42, 44, 51, 0.9); } + background-color: rgba(53, 57, 69, 0.9); } .primary-toolbar { color: rgba(82, 93, 118, 0.8); @@ -999,12 +1053,13 @@ GtkComboBox { .primary-toolbar .entry:focus, .header-bar .entry:focus { color: #ffffff; border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-image: linear-gradient(to bottom, #5294E2); + background-clip: border-box; } .primary-toolbar .entry:focus.image, .header-bar .entry:focus.image { color: #ffffff; } .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive { color: rgba(82, 93, 118, 0.35); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus { background-color: #ffffff; color: #5294E2; } @@ -1030,7 +1085,8 @@ GtkComboBox { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-color: #5294E2; } + background-color: #5294E2; + background-clip: border-box; } .primary-toolbar .button:insensitive, .header-bar .button:insensitive { color: rgba(82, 93, 118, 0.35); background-color: rgba(231, 232, 235, 0); @@ -1059,7 +1115,7 @@ GtkComboBox { .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { - border-color: #5294E2; } + background-color: rgba(255, 255, 255, 0.9); } .primary-toolbar .linked.stack-switcher > .button:active, .header-bar .linked.stack-switcher > .button:active, .primary-toolbar .linked.stack-switcher > .button:checked, @@ -1069,6 +1125,50 @@ GtkComboBox { outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } + .primary-toolbar .linked.stack-switcher > .button:insensitive, + .header-bar .linked.stack-switcher > .button:insensitive, + .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive { + color: rgba(82, 93, 118, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:hover, + .header-bar .linked.stack-switcher > .button:hover, + .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:first-child:hover, + .header-bar .linked.stack-switcher > .button:first-child:hover, + .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:last-child:hover, + .header-bar .linked.stack-switcher > .button:last-child:hover, + .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:hover, + .header-bar .linked.stack-switcher > .button:only-child:hover, + .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked { + box-shadow: none; } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; @@ -1170,10 +1270,11 @@ GtkComboBox { .primary-toolbar GtkComboBox.combobox-entry .button:hover, .header-bar GtkComboBox.combobox-entry .button:hover { color: #ffffff; border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-image: linear-gradient(to bottom, #5294E2); + box-shadow: none; } .primary-toolbar GtkComboBox.combobox-entry .button:insensitive, .header-bar GtkComboBox.combobox-entry .button:insensitive { color: rgba(82, 93, 118, 0.35); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } @@ -1193,9 +1294,17 @@ GtkComboBox { background-image: linear-gradient(to bottom, rgba(82, 93, 118, 0.1)); } .primary-toolbar .scale.slider, .header-bar .scale.slider { - background-image: linear-gradient(to bottom, #fdfdfd); } + background-image: linear-gradient(to bottom, #fbfbfc); + border-color: rgba(82, 93, 118, 0.3); } + .primary-toolbar .scale.slider:hover, .header-bar .scale.slider:hover { + background-image: linear-gradient(to bottom, white); + border-color: rgba(82, 93, 118, 0.3); } + .primary-toolbar .scale.slider:active, .header-bar .scale.slider:active { + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .primary-toolbar .scale.slider:insensitive, .header-bar .scale.slider:insensitive { - background-image: linear-gradient(to bottom, #f1f1f3); } + background-image: linear-gradient(to bottom, #f5f5f7); + border-color: rgba(82, 93, 118, 0.3); } /************ * Pathbars * @@ -1832,21 +1941,21 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { margin: 3px; } .scale.slider { background-clip: border-box; - background-image: linear-gradient(to bottom, #ffffff); - border: 1px solid #5294E2; + background-image: linear-gradient(to bottom, #fbfbfc); + border: 1px solid rgba(123, 142, 186, 0.5); border-radius: 50%; box-shadow: none; } .scale.slider:hover { - background-image: linear-gradient(to bottom, #5294E2); - border-color: #5294E2; } + background-image: linear-gradient(to bottom, white); + border-color: rgba(123, 142, 186, 0.5); } .scale.slider:insensitive { background-image: linear-gradient(to bottom, #fbfbfb); - border-color: #9bc0eb; } + border-color: rgba(123, 142, 186, 0.3); } .scale.slider:active { - background-image: linear-gradient(to bottom, #2679db); - border-color: #2679db; } + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .osd .scale.slider { - background-image: linear-gradient(to bottom, #2a2c33); + background-image: linear-gradient(to bottom, #353945); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1876,7 +1985,7 @@ 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, #3a3e46); + background-image: linear-gradient(to bottom, #454a59); outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; @@ -2023,18 +2132,18 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame { padding: 10px; color: #BAC3CF; - background-color: #3c4049; + background-color: #353945; background-clip: border-box; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; - border-color: #25272d; } + border-color: #1f2128; } .app-notification .button, .app-notification.frame .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } @@ -2042,8 +2151,8 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { @@ -2053,9 +2162,9 @@ GtkScrolledWindow GtkViewport.frame { background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } /************* * Expanders * @@ -2087,8 +2196,9 @@ GtkCalendar { border-radius: 0; } GtkCalendar.button, GtkCalendar.button:focus { color: rgba(92, 97, 108, 0.45); - box-shadow: none; - border: none; } + border-color: transparent; + background-color: transparent; + background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #5c616c; } GtkCalendar.highlight { @@ -2229,7 +2339,7 @@ GtkInfoBar { color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: #2a2c33; + background-color: #353945; background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2300,8 +2410,8 @@ GtkColorSwatch#add-color-button { GtkColorSwatch#add-color-button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } GtkColorSwatch#add-color-button .overlay { border-color: transparent; background-color: transparent; @@ -2320,8 +2430,8 @@ GtkColorButton.button { .scale-popup .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } GtkVolumeButton.button { padding: 8px; } @@ -2332,11 +2442,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 4px 4px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 4px 8px 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 8px 8px 0 rgba(0, 0, 0, 0.2); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 4px 5px 2px rgba(0, 0, 0, 0.1); } + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } .window-frame.ssd { @@ -2657,12 +2767,30 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { border-color: rgba(82, 93, 118, 0.1); background-color: rgba(251, 251, 252, 0.9); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { - border-color: #5294E2; } + background-color: rgba(255, 255, 255, 0.9); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive { + color: rgba(82, 93, 118, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .gedit-headerbar-paned { color: #d4d5db; } @@ -2760,15 +2888,9 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { - color: rgba(82, 93, 118, 0.8); - border-color: rgba(82, 93, 118, 0.1); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); - background-color: transparent; - border-color: #5294E2; } - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, - GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { - color: inherit; } + color: #ffffff; + border-color: #5294E2; + background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { @@ -2778,7 +2900,7 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { color: rgba(82, 93, 118, 0.35); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; @@ -2818,7 +2940,7 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #2a2c33; } + background-color: #353945; } GtkBox.gb-command-bar-box GtkLabel { color: #BAC3CF; } @@ -2827,7 +2949,7 @@ GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; color: #BAC3CF; background-image: none; - background-color: #2a2c33; + background-color: #353945; padding: 6px 6px 6px 6px; border: none; } @@ -2910,7 +3032,7 @@ PanelWidget, PanelAppletFrame, PanelApplet { color: #BAC3CF; - background-image: linear-gradient(to bottom, #1f2125); } + background-image: linear-gradient(to bottom, #2b2e37); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2954,18 +3076,18 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: #1f2125; } + background-color: #2b2e37; } .xfce4-panel.panel .button.flat { color: #BAC3CF; - background-color: rgba(31, 33, 37, 0); + background-color: rgba(43, 46, 55, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: #363941; } + background-color: #414654; } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: #0f1012; } + background-color: #1b1d23; } .floating-bar { background-color: #5294E2; @@ -3019,7 +3141,7 @@ MarlinViewWindow *:selected:focus { background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:insensitive { color: rgba(82, 93, 118, 0.35); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked { color: #5294E2; } @@ -3150,7 +3272,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #1f2125); + background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } @@ -3317,10 +3439,10 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: #1f2125; + background-color: #2b2e37; color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px #0f1012; + box-shadow: inset 0 -1px #1b1d23; /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { @@ -3360,8 +3482,8 @@ GtkListBox .h4 { #content_frame .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); @@ -3379,32 +3501,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: #2a2c33; + background-color: #353945; 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; } + box-shadow: inset 0 1px #353945; } #buttonbox_frame .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } #buttonbox_frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } #login_window #user_combobox { color: #5c616c; @@ -3497,7 +3619,7 @@ NautilusWindow .source-list.sidebar.view, NemoWindow .sidebar, NemoWindow .source-list.sidebar.view, MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar row, GtkFileChooserDialog .source-list.sidebar.view .view, @@ -3616,16 +3738,16 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .sidebar { background-color: transparent; } @@ -3642,7 +3764,7 @@ GtkFileChooserDialog .dialog-vbox > .frame { GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: #2c2f35; } + border-color: #2a2d37; } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, @@ -3653,7 +3775,7 @@ GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: #3c4049; } + background-color: #353945; } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, @@ -3664,9 +3786,9 @@ GeditWindow.background.csd { background-color: #ffffff; } .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .maximized .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .gedit-document-panel .list-row { color: #BAC3CF; } .gedit-document-panel .list-row { @@ -3693,9 +3815,9 @@ GeditWindow.background.csd { color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } @@ -3712,7 +3834,7 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: #2c2f35; } + border-color: #252831; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #BAC3CF; } @@ -3728,14 +3850,14 @@ GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { 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-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.4); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(119, 127, 151, 0.5); } 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 { @@ -3745,26 +3867,29 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.4); + background-color: rgba(102, 109, 132, 0.25); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.4); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.4)); + background-color: transparent; } + GtkFileChooserDialog .action-bar.frame .image.entry, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry, GtkFileChooserDialog .action-bar.frame .image.entry:hover, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry:hover { + color: inherit; } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #BAC3CF; + color: #ffffff; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @@ -3798,22 +3923,15 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { @define-color wm_bg_unfocused #eff0f2; @define-color wm_highlight #eff0f2; @define-color wm_shadow alpha(black, 0.35); -@define-color wm_button_close_bg #f37076; -@define-color wm_button_close_hover_bg #f79da1; -@define-color wm_button_close_active_bg #ef4048; -@define-color wm_icon_close_bg #ffffff; -@define-color wm_icon_close_hover_bg #ffffff; -@define-color wm_icon_close_active_bg #ffffff; -@define-color wm_button_bg #fdfdfd; -@define-color wm_button_unfocused_bg #f6f7f8; +@define-color wm_button_close_bg #f46067; +@define-color wm_button_close_hover_bg #f68086; +@define-color wm_button_close_active_bg #f13039; +@define-color wm_icon_close_bg #F8F8F9; @define-color wm_button_hover_bg #fdfdfd; @define-color wm_button_active_bg #5294E2; -@define-color wm_button_border #d8dae0; -@define-color wm_button_unfocused_border #dddee2; -@define-color wm_button_hover_border #5294E2; -@define-color wm_button_active_border #5294E2; -@define-color wm_icon_bg #8d93a4; -@define-color wm_icon_unfocused_bg #b8bcc7; -@define-color wm_icon_hover_bg #70788d; +@define-color wm_button_hover_border #D1D3DA; +@define-color wm_icon_bg #90949E; +@define-color wm_icon_unfocused_bg #B6B8C0; +@define-color wm_icon_hover_bg #7A7F8B; @define-color wm_icon_active_bg #ffffff; @define-color content_view_bg #ffffff; diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 1b23841..f96b988 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -112,7 +112,7 @@ GtkTextView { .popover.osd, .osd { color: #BAC3CF; border: none; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); background-clip: padding-box; outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } @@ -245,17 +245,18 @@ GtkTextView { border-bottom-color: rgba(0, 0, 0, 0.14); } .osd .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.35); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.35)); + background-color: transparent; } + .osd .entry.image, .osd .entry.image:hover { + color: inherit; } .osd .entry:focus { - color: #BAC3CF; + color: #ffffff; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + background-image: linear-gradient(to bottom, #5294E2); } .osd .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } GtkSearchEntry.entry { border-radius: 20px; } @@ -294,8 +295,8 @@ GtkSearchEntry.entry { .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; + border-color: #cfd6e6; + background-color: white; -gtk-image-effect: highlight; } .button:active, .button:checked { background-clip: border-box; @@ -329,31 +330,31 @@ GtkSearchEntry.entry { 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); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); + background-color: rgba(53, 57, 69, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); - background-color: rgba(42, 44, 51, 0.95); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); + background-color: rgba(53, 57, 69, 0.95); } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .button.osd:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .osd .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); border-radius: 0; border-left-style: none; border-right-style: none; } @@ -375,17 +376,17 @@ GtkSearchEntry.entry { .osd .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .osd .button:active, .osd .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } .osd .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .osd .button.flat { border-color: transparent; background-color: transparent; @@ -394,12 +395,12 @@ GtkSearchEntry.entry { .osd .button.flat:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .osd .button.flat:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); background-image: none; } .osd .button.flat:active, .osd .button.flat:checked { color: #ffffff; @@ -531,8 +532,8 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; @@ -568,7 +569,15 @@ GtkSearchEntry.entry { GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .button:hover, .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .button:hover:dir(ltr) { - box-shadow: inset 1px 0 #5294E2, inset -1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); } + .inline-toolbar GtkToolButton > .button.flat:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active, + GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .button:active, .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .button:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked, + GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .button:checked, .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .button:checked:dir(ltr) { + box-shadow: none; } .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl), .header-bar .linked.stack-switcher > .button:dir(rtl), @@ -585,7 +594,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:first-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .button:first-child:hover, .linked > GtkComboBox:first-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover, .header-bar .linked.stack-switcher > .button:first-child:hover, .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { - box-shadow: inset -1px 0 #5294E2; } + box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); } + .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active, + .inline-toolbar GtkToolButton:first-child > .button.flat:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .button:first-child:active, .linked > GtkComboBox:first-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked, + .inline-toolbar GtkToolButton:first-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .button:first-child:checked, .linked > GtkComboBox:first-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } .osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button, .primary-toolbar .linked.stack-switcher > .button:last-child, @@ -597,7 +614,15 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton:last-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .button:last-child:hover, .linked > GtkComboBox:last-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover, .header-bar .linked.stack-switcher > .button:last-child:hover, .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { - box-shadow: inset 1px 0 #5294E2; } + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); } + .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active, + .inline-toolbar GtkToolButton:last-child > .button.flat:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .button:last-child:active, .linked > GtkComboBox:last-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked, + .inline-toolbar GtkToolButton:last-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .button:last-child:checked, .linked > GtkComboBox:last-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl), .header-bar .linked.stack-switcher > .button:last-child:dir(rtl), @@ -615,6 +640,14 @@ GtkSearchEntry.entry { .header-bar .linked.stack-switcher > .button:only-child:hover, .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { box-shadow: none; } + .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active, + .inline-toolbar GtkToolButton:only-child > .button.flat:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .button:only-child:active, .linked > GtkComboBox:only-child > .button:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked, + .inline-toolbar GtkToolButton:only-child > .button.flat:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .button:only-child:checked, .linked > GtkComboBox:only-child > .button:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button, .linked.vertical > .button:hover, @@ -628,7 +661,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:hover, .linked.vertical > .button:hover, .linked.vertical > GtkComboBoxText > .button:hover, .linked.vertical > GtkComboBox > .button:hover { - box-shadow: inset 0 1px #5294E2, inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4), inset 0 1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:active, .linked.vertical > .button:active, + .linked.vertical > GtkComboBoxText > .button:active, + .linked.vertical > GtkComboBox > .button:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked, + .linked.vertical > GtkComboBoxText > .button:checked, + .linked.vertical > GtkComboBox > .button:checked { + box-shadow: none; } .linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, @@ -638,7 +677,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover, .linked.vertical > GtkComboBoxText:first-child > .button:hover, .linked.vertical > GtkComboBox:first-child > .button:hover { - box-shadow: inset 0 -1px #5294E2; } + box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active, + .linked.vertical > GtkComboBoxText:first-child > .button:active, + .linked.vertical > GtkComboBox:first-child > .button:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked, + .linked.vertical > GtkComboBoxText:first-child > .button:checked, + .linked.vertical > GtkComboBox:first-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, @@ -648,7 +693,13 @@ GtkSearchEntry.entry { .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover, .linked.vertical > GtkComboBoxText:last-child > .button:hover, .linked.vertical > GtkComboBox:last-child > .button:hover { - box-shadow: inset 0 1px #5294E2; } + box-shadow: inset 0 1px rgba(207, 214, 230, 0.4); } + .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active, + .linked.vertical > GtkComboBoxText:last-child > .button:active, + .linked.vertical > GtkComboBox:last-child > .button:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked, + .linked.vertical > GtkComboBoxText:last-child > .button:checked, + .linked.vertical > GtkComboBox:last-child > .button:checked { + box-shadow: none; } .linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, @@ -659,6 +710,12 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBoxText:only-child > .button:hover, .linked.vertical > GtkComboBox:only-child > .button:hover { box-shadow: none; } + .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active, + .linked.vertical > GtkComboBoxText:only-child > .button:active, + .linked.vertical > GtkComboBox:only-child > .button:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked, + .linked.vertical > GtkComboBoxText:only-child > .button:checked, + .linked.vertical > GtkComboBox:only-child > .button:checked { + box-shadow: none; } .menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, @@ -715,8 +772,6 @@ GtkSearchEntry.entry { border-style: none solid none none; } .spinbutton .button:first-child { color: red; } - .spinbutton .button:hover { - color: #5294E2; } .spinbutton .button:insensitive { color: rgba(92, 97, 108, 0.55); } .spinbutton .button:active { @@ -735,8 +790,8 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .spinbutton.vertical .button:first-child:insensitive, .spinbutton.vertical:dir(rtl) .button:first-child:insensitive { color: rgba(92, 97, 108, 0.55); border-color: rgba(207, 214, 230, 0.55); @@ -756,8 +811,8 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } .spinbutton.vertical .button:last-child:insensitive, .spinbutton.vertical:dir(rtl) .button:last-child:insensitive { color: rgba(92, 97, 108, 0.55); border-color: rgba(207, 214, 230, 0.55); @@ -804,8 +859,7 @@ GtkComboBox { border-color: #cfd6e6; } GtkComboBox.combobox-entry .button:hover { background-color: #e0e4ef; - border-color: #5294E2; - box-shadow: -1px 0 #5294E2; } + border-color: #e0e4ef; } GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); @@ -823,9 +877,9 @@ GtkComboBox { background-color: #F5F6F7; } .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar { padding: 7px; - border: 1px solid rgba(0, 0, 0, 0.6); + border: 1px solid rgba(0, 0, 0, 0.5); border-radius: 3px; - background-color: rgba(42, 44, 51, 0.85); } + background-color: rgba(53, 57, 69, 0.85); } .primary-toolbar { color: rgba(82, 93, 118, 0.8); @@ -999,12 +1053,13 @@ GtkComboBox { .primary-toolbar .entry:focus, .header-bar .entry:focus { color: #ffffff; border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-image: linear-gradient(to bottom, #5294E2); + background-clip: border-box; } .primary-toolbar .entry:focus.image, .header-bar .entry:focus.image { color: #ffffff; } .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive { color: rgba(82, 93, 118, 0.35); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus { background-color: #ffffff; color: #5294E2; } @@ -1030,7 +1085,8 @@ GtkComboBox { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; - background-color: #5294E2; } + background-color: #5294E2; + background-clip: border-box; } .primary-toolbar .button:insensitive, .header-bar .button:insensitive { color: rgba(82, 93, 118, 0.35); background-color: rgba(231, 232, 235, 0); @@ -1059,7 +1115,7 @@ GtkComboBox { .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { - border-color: #5294E2; } + background-color: rgba(255, 255, 255, 0.9); } .primary-toolbar .linked.stack-switcher > .button:active, .header-bar .linked.stack-switcher > .button:active, .primary-toolbar .linked.stack-switcher > .button:checked, @@ -1069,6 +1125,50 @@ GtkComboBox { outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } + .primary-toolbar .linked.stack-switcher > .button:insensitive, + .header-bar .linked.stack-switcher > .button:insensitive, + .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive { + color: rgba(82, 93, 118, 0.4); } + .primary-toolbar .linked.stack-switcher > .button:hover, + .header-bar .linked.stack-switcher > .button:hover, + .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar .linked.stack-switcher > .button:active, + .header-bar .linked.stack-switcher > .button:active, + .primary-toolbar .linked.stack-switcher > .button:checked, + .header-bar .linked.stack-switcher > .button:checked, + .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:first-child:hover, + .header-bar .linked.stack-switcher > .button:first-child:hover, + .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar .linked.stack-switcher > .button:first-child:active, + .header-bar .linked.stack-switcher > .button:first-child:active, + .primary-toolbar .linked.stack-switcher > .button:first-child:checked, + .header-bar .linked.stack-switcher > .button:first-child:checked, + .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:last-child:hover, + .header-bar .linked.stack-switcher > .button:last-child:hover, + .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar .linked.stack-switcher > .button:last-child:active, + .header-bar .linked.stack-switcher > .button:last-child:active, + .primary-toolbar .linked.stack-switcher > .button:last-child:checked, + .header-bar .linked.stack-switcher > .button:last-child:checked, + .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:hover, + .header-bar .linked.stack-switcher > .button:only-child:hover, + .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover { + box-shadow: none; } + .primary-toolbar .linked.stack-switcher > .button:only-child:active, + .header-bar .linked.stack-switcher > .button:only-child:active, + .primary-toolbar .linked.stack-switcher > .button:only-child:checked, + .header-bar .linked.stack-switcher > .button:only-child:checked, + .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked { + box-shadow: none; } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; @@ -1170,10 +1270,11 @@ GtkComboBox { .primary-toolbar GtkComboBox.combobox-entry .button:hover, .header-bar GtkComboBox.combobox-entry .button:hover { color: #ffffff; border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-image: linear-gradient(to bottom, #5294E2); + box-shadow: none; } .primary-toolbar GtkComboBox.combobox-entry .button:insensitive, .header-bar GtkComboBox.combobox-entry .button:insensitive { color: rgba(82, 93, 118, 0.35); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } @@ -1193,9 +1294,17 @@ GtkComboBox { background-image: linear-gradient(to bottom, rgba(82, 93, 118, 0.1)); } .primary-toolbar .scale.slider, .header-bar .scale.slider { - background-image: linear-gradient(to bottom, rgba(253, 253, 253, 0.995)); } + background-image: linear-gradient(to bottom, #fbfbfc); + border-color: rgba(82, 93, 118, 0.3); } + .primary-toolbar .scale.slider:hover, .header-bar .scale.slider:hover { + background-image: linear-gradient(to bottom, white); + border-color: rgba(82, 93, 118, 0.3); } + .primary-toolbar .scale.slider:active, .header-bar .scale.slider:active { + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .primary-toolbar .scale.slider:insensitive, .header-bar .scale.slider:insensitive { - background-image: linear-gradient(to bottom, rgba(241, 242, 243, 0.97)); } + background-image: linear-gradient(to bottom, rgba(245, 246, 247, 0.985)); + border-color: rgba(82, 93, 118, 0.3); } /************ * Pathbars * @@ -1832,21 +1941,21 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { margin: 3px; } .scale.slider { background-clip: border-box; - background-image: linear-gradient(to bottom, #ffffff); - border: 1px solid #5294E2; + background-image: linear-gradient(to bottom, #fbfbfc); + border: 1px solid rgba(123, 142, 186, 0.5); border-radius: 50%; box-shadow: none; } .scale.slider:hover { - background-image: linear-gradient(to bottom, #5294E2); - border-color: #5294E2; } + background-image: linear-gradient(to bottom, white); + border-color: rgba(123, 142, 186, 0.5); } .scale.slider:insensitive { background-image: linear-gradient(to bottom, #fbfbfb); - border-color: #9bc0eb; } + border-color: rgba(123, 142, 186, 0.3); } .scale.slider:active { - background-image: linear-gradient(to bottom, #2679db); - border-color: #2679db; } + background-image: linear-gradient(to bottom, #5294E2); + border-color: #5294E2; } .osd .scale.slider { - background-image: linear-gradient(to bottom, rgba(42, 44, 51, 0.95)); + background-image: linear-gradient(to bottom, rgba(53, 57, 69, 0.95)); border-color: #5294E2; } .osd .scale.slider:hover { background-image: linear-gradient(to bottom, #5294E2); } @@ -1876,7 +1985,7 @@ 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(58, 62, 70, 0.95)); + background-image: linear-gradient(to bottom, rgba(69, 74, 89, 0.95)); outline-color: rgba(186, 195, 207, 0.2); } .osd .scale.trough.highlight { background-image: none; @@ -2023,18 +2132,18 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame { padding: 10px; color: #BAC3CF; - background-color: rgba(60, 64, 73, 0.95); + background-color: rgba(53, 57, 69, 0.95); 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: rgba(31, 33, 40, 0.95); } .app-notification .button, .app-notification.frame .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .app-notification .button.flat, .app-notification.frame .button.flat { border-color: rgba(82, 148, 226, 0); } @@ -2042,8 +2151,8 @@ GtkScrolledWindow GtkViewport.frame { .app-notification.frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .app-notification .button:active, .app-notification .button:checked, .app-notification.frame .button:active, .app-notification.frame .button:checked { @@ -2053,9 +2162,9 @@ GtkScrolledWindow GtkViewport.frame { background-color: #5294E2; } .app-notification .button:insensitive, .app-notification.frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } /************* * Expanders * @@ -2087,8 +2196,9 @@ GtkCalendar { border-radius: 0; } GtkCalendar.button, GtkCalendar.button:focus { color: rgba(92, 97, 108, 0.45); - box-shadow: none; - border: none; } + border-color: transparent; + background-color: transparent; + background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #5c616c; } GtkCalendar.highlight { @@ -2229,7 +2339,7 @@ GtkInfoBar { color: #BAC3CF; border-radius: 2px; } .tooltip.background { - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); background-clip: padding-box; } .tooltip.window-frame.csd { background-color: transparent; } @@ -2300,8 +2410,8 @@ GtkColorSwatch#add-color-button { GtkColorSwatch#add-color-button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } GtkColorSwatch#add-color-button .overlay { border-color: transparent; background-color: transparent; @@ -2320,8 +2430,8 @@ GtkColorButton.button { .scale-popup .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } GtkVolumeButton.button { padding: 8px; } @@ -2332,11 +2442,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 4px 4px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 4px 8px 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 8px 8px 0 rgba(0, 0, 0, 0.2); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 4px 5px 2px rgba(0, 0, 0, 0.1); } + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } .window-frame.ssd { @@ -2657,12 +2767,30 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { border-color: rgba(82, 93, 118, 0.1); background-color: rgba(251, 251, 252, 0.9); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { - border-color: #5294E2; } + background-color: rgba(255, 255, 255, 0.9); } NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive { + color: rgba(82, 93, 118, 0.4); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { + box-shadow: none; } + NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked { + box-shadow: none; } .gedit-headerbar-paned { color: rgba(212, 213, 219, 0.95); } @@ -2760,15 +2888,9 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { - color: rgba(82, 93, 118, 0.8); - border-color: rgba(82, 93, 118, 0.1); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); - background-color: transparent; - border-color: #5294E2; } - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, - GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, - GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { - color: inherit; } + color: #ffffff; + border-color: #5294E2; + background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { @@ -2778,7 +2900,7 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { color: rgba(82, 93, 118, 0.35); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; @@ -2818,7 +2940,7 @@ GbPreferencesPageLanguage GtkScrolledWindow { GtkBox.gb-command-bar-box { border: none; - background-color: #2a2c33; } + background-color: #353945; } GtkBox.gb-command-bar-box GtkLabel { color: #BAC3CF; } @@ -2827,7 +2949,7 @@ GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; color: #BAC3CF; background-image: none; - background-color: #2a2c33; + background-color: #353945; padding: 6px 6px 6px 6px; border: none; } @@ -2910,7 +3032,7 @@ PanelWidget, PanelAppletFrame, PanelApplet { color: #BAC3CF; - background-image: linear-gradient(to bottom, rgba(31, 33, 37, 0.95)); } + background-image: linear-gradient(to bottom, rgba(43, 46, 55, 0.95)); } PanelApplet .button, PanelApplet .button:backdrop { padding: 4px; @@ -2954,18 +3076,18 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(31, 33, 37, 0.95); } + background-color: rgba(43, 46, 55, 0.95); } .xfce4-panel.panel .button.flat { color: #BAC3CF; - background-color: rgba(31, 33, 37, 0); + background-color: rgba(43, 46, 55, 0); border-radius: 0; } .xfce4-panel.panel .button.flat:hover { border: none; - background-color: rgba(54, 57, 65, 0.95); } + background-color: rgba(65, 70, 84, 0.95); } .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked { color: #5294E2; border: none; - background-color: rgba(15, 16, 18, 0.95); } + background-color: rgba(27, 29, 35, 0.95); } .floating-bar { background-color: #5294E2; @@ -3019,7 +3141,7 @@ MarlinViewWindow *:selected:focus { background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:insensitive { color: rgba(82, 93, 118, 0.35); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked { color: #5294E2; } @@ -3150,7 +3272,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { - background-image: linear-gradient(to bottom, #1f2125); + background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } @@ -3317,10 +3439,10 @@ GtkListBox .h4 { /* the panel widget at the top */ #panel_window { - background-color: rgba(31, 33, 37, 0.95); + background-color: rgba(43, 46, 55, 0.95); color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(15, 16, 18, 0.95); + box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); /* the menubars/menus of the panel, i.e. indicators */ } #panel_window .menubar, #panel_window .menubar > .menuitem { @@ -3360,8 +3482,8 @@ GtkListBox .h4 { #content_frame .button:hover { color: #5c616c; outline-color: rgba(92, 97, 108, 0.3); - border-color: #5294E2; - background-color: #fbfbfc; } + border-color: #cfd6e6; + background-color: white; } #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); @@ -3379,32 +3501,32 @@ GtkListBox .h4 { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 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); } + box-shadow: inset 0 1px rgba(53, 57, 69, 0.95); } #buttonbox_frame .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } #buttonbox_frame .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } #buttonbox_frame .button:active, #buttonbox_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; background-color: #5294E2; } #buttonbox_frame .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } #login_window #user_combobox { color: #5c616c; @@ -3497,7 +3619,7 @@ NautilusWindow .source-list.sidebar.view, NemoWindow .sidebar, NemoWindow .source-list.sidebar.view, MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar row, GtkFileChooserDialog .source-list.sidebar.view .view, @@ -3616,16 +3738,16 @@ GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { - background-color: #3c4049; } + background-color: #353945; } GtkFileChooserDialog .pane-separator, NautilusWindow .pane-separator, NemoWindow .pane-separator, MarlinViewWindow .pane-separator { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog .sidebar { background-color: transparent; } @@ -3642,7 +3764,7 @@ GtkFileChooserDialog .dialog-vbox > .frame { GtkFileChooserDialog .action-bar.frame { background-color: transparent; - border-color: rgba(44, 47, 53, 0.95); } + border-color: rgba(42, 45, 55, 0.95); } GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, @@ -3653,7 +3775,7 @@ GeditWindow.background.csd { background-color: transparent; } GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, GeditWindow.background.csd .titlebar .pane-separator:backdrop, @@ -3664,9 +3786,9 @@ GeditWindow.background.csd { background-color: #ffffff; } .gedit-document-panel { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } .maximized .gedit-document-panel { - background-color: #3c4049; } + background-color: #353945; } .gedit-document-panel .list-row { color: #BAC3CF; } .gedit-document-panel .list-row { @@ -3693,9 +3815,9 @@ GeditWindow.background.csd { color: #BAC3CF; } GeditWindow.background.csd GeditFileBrowserWidget { - background-color: rgba(60, 64, 73, 0.95); } + background-color: rgba(53, 57, 69, 0.95); } .maximized GeditWindow.background.csd GeditFileBrowserWidget { - background-color: #3c4049; } + background-color: #353945; } GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } @@ -3712,7 +3834,7 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; } GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; - border-color: rgba(44, 47, 53, 0.95); } + border-color: rgba(37, 40, 49, 0.95); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #BAC3CF; } @@ -3728,14 +3850,14 @@ GtkFileChooserDialog .action-bar.frame .button, GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { 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-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } GtkFileChooserDialog .action-bar.frame .button:hover, GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } 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 { @@ -3745,26 +3867,29 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G background-color: #5294E2; } GtkFileChooserDialog .action-bar.frame .button:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border-color: rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } GtkFileChooserDialog .action-bar.frame .entry, GtkFileChooserDialog .dialog-vbox > .frame .entry { color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.4); - background-color: transparent; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + border-color: rgba(26, 28, 34, 0.35); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.35)); + background-color: transparent; } + GtkFileChooserDialog .action-bar.frame .image.entry, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry, GtkFileChooserDialog .action-bar.frame .image.entry:hover, + GtkFileChooserDialog .dialog-vbox > .frame .image.entry:hover { + color: inherit; } GtkFileChooserDialog .action-bar.frame .entry:focus, GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { - color: #BAC3CF; + color: #ffffff; border-color: #5294E2; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + background-image: linear-gradient(to bottom, #5294E2); } GtkFileChooserDialog .action-bar.frame .entry:insensitive, GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { - color: #555a62; - border-color: rgba(0, 0, 0, 0.4); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } + color: rgba(186, 195, 207, 0.55); + background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @@ -3798,22 +3923,15 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry { @define-color wm_bg_unfocused #eff0f2; @define-color wm_highlight #eff0f2; @define-color wm_shadow alpha(black, 0.35); -@define-color wm_button_close_bg #f37076; -@define-color wm_button_close_hover_bg #f79da1; -@define-color wm_button_close_active_bg #ef4048; -@define-color wm_icon_close_bg #ffffff; -@define-color wm_icon_close_hover_bg #ffffff; -@define-color wm_icon_close_active_bg #ffffff; -@define-color wm_button_bg #fdfdfd; -@define-color wm_button_unfocused_bg #f6f7f8; +@define-color wm_button_close_bg #f46067; +@define-color wm_button_close_hover_bg #f68086; +@define-color wm_button_close_active_bg #f13039; +@define-color wm_icon_close_bg #F8F8F9; @define-color wm_button_hover_bg #fdfdfd; @define-color wm_button_active_bg #5294E2; -@define-color wm_button_border #d8dae0; -@define-color wm_button_unfocused_border #dddee2; -@define-color wm_button_hover_border #5294E2; -@define-color wm_button_active_border #5294E2; -@define-color wm_icon_bg #8d93a4; -@define-color wm_icon_unfocused_bg #b8bcc7; -@define-color wm_icon_hover_bg #70788d; +@define-color wm_button_hover_border #D1D3DA; +@define-color wm_icon_bg #90949E; +@define-color wm_icon_unfocused_bg #B6B8C0; +@define-color wm_icon_hover_bg #7A7F8B; @define-color wm_icon_active_bg #ffffff; @define-color content_view_bg #ffffff; diff --git a/common/gtk-3.0/3.16/sass/_applications.scss b/common/gtk-3.0/3.16/sass/_applications.scss index 7dc0323..b408053 100644 --- a/common/gtk-3.0/3.16/sass/_applications.scss +++ b/common/gtk-3.0/3.16/sass/_applications.scss @@ -57,9 +57,6 @@ SushiFontWidget { // // GNOME Terminal // -$terminal_bg: #2A2F36; -$terminal_fg: white; - TerminalWindow { .background { background-color: transparent; @@ -157,12 +154,34 @@ NemoWindow GtkSeparator.separator.horizontal { } NemoWindow .primary-toolbar NemoPathBar.linked > .button { + $_linked_separator_color: $header_button_border; + @include button(header-hover); - &:hover { border-color: $selected_bg_color; } + &:hover { background-color: lighten($header_button_bg, 15%); } &:active, &:checked { @include button(header-active); } + &:insensitive { color: transparentize($header_fg, 0.4); } @extend %linked; + + &:hover { + box-shadow: inset 1px 0 $_linked_separator_color, + inset -1px 0 $_linked_separator_color; + } + &:active, &:checked { box-shadow: none; } + + &:first-child { + &:hover { box-shadow: inset -1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } + } + &:last-child { + &:hover { box-shadow: inset 1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } + } + &:only-child { + &:hover { box-shadow: none; } + &:active, &:checked { box-shadow: none; } + } } // @@ -283,7 +302,7 @@ GbSearchBox.linked { @include entry(header-normal); - &:hover { @include entry(header-normal); border-color: $selected_bg_color; } + &:hover { @include entry(header-focus); } &:active, &:checked { @include entry(header-focus); } &:insensitive { @include entry(header-insensitive); } } diff --git a/common/gtk-3.0/3.16/sass/_colors-public.scss b/common/gtk-3.0/3.16/sass/_colors-public.scss index 60d3cbf..accfee4 100644 --- a/common/gtk-3.0/3.16/sass/_colors-public.scss +++ b/common/gtk-3.0/3.16/sass/_colors-public.scss @@ -51,19 +51,12 @@ $wm_bg_unfocused: opacify($header_bg_backdrop, 1); @define-color wm_button_close_active_bg #{"" + $wm_button_close_active_bg}; @define-color wm_icon_close_bg #{"" + $wm_icon_close_bg}; -@define-color wm_icon_close_hover_bg #{"" + $wm_icon_close_hover_bg}; -@define-color wm_icon_close_active_bg #{"" + $wm_icon_close_active_bg}; // Minimize, Maximize -@define-color wm_button_bg #{"" + $wm_button_bg}; -@define-color wm_button_unfocused_bg #{"" + $wm_button_unfocused_bg}; @define-color wm_button_hover_bg #{"" + $wm_button_hover_bg}; @define-color wm_button_active_bg #{"" + $wm_button_active_bg}; -@define-color wm_button_border #{"" + $wm_button_border}; -@define-color wm_button_unfocused_border #{"" + $wm_button_unfocused_border}; @define-color wm_button_hover_border #{"" + $wm_button_hover_border}; -@define-color wm_button_active_border #{"" + $wm_button_active_border}; @define-color wm_icon_bg #{"" + $wm_icon_bg}; @define-color wm_icon_unfocused_bg #{"" + $wm_icon_unfocused_bg}; diff --git a/common/gtk-3.0/3.16/sass/_colors.scss b/common/gtk-3.0/3.16/sass/_colors.scss index 9c51858..47daa0f 100644 --- a/common/gtk-3.0/3.16/sass/_colors.scss +++ b/common/gtk-3.0/3.16/sass/_colors.scss @@ -2,15 +2,15 @@ // it gets @if ed depending on $variant -$base_color: if($variant =='light', #ffffff, #383C45); +$base_color: if($variant =='light', #ffffff, #404552); $text_color: if($variant == 'light', #5c616c, #D3DAE3); -$bg_color: if($variant =='light', #F5F6F7, #444852); +$bg_color: if($variant =='light', #F5F6F7, #383C4A); $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%)); +$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%)); $link_color: if($variant == 'light', darken($selected_bg_color,10%), lighten($selected_bg_color,20%)); @@ -28,63 +28,67 @@ $suggested_color: #4DADD4; $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; } +@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343f, 0.03); } +@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343f; } $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_border: if($variant == 'light' and $darker=='false', darken($header_bg, 7%), darken($header_bg, 4%)); $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_bg: if($transparency == 'true', transparentize(#353945, 0.05), #353945); $dark_sidebar_fg: #BAC3CF; -$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 10%)); +$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 5%)); $osd_fg_color: $dark_sidebar_fg; -$osd_bg_color: darken($dark_sidebar_bg, 8%); +$osd_bg_color: $dark_sidebar_bg; + +$osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_button_border: transparentize(darken($osd_bg_color, 12%), 0.6); + +$osd_entry_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_entry_border: transparentize(darken($osd_bg_color, 12%), 0.6); $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; +$panel_bg: darken($dark_sidebar_bg, 4.7%); +$panel_fg: $dark_sidebar_fg; + +$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); +$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); + +$header_entry_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($base_color, 0.1)); +$header_entry_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); + +$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); +$button_border: $entry_border; + +$header_button_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($button_bg, 0.1)); +$header_button_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); //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_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #cc575d); +$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #d7787d); +$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #be3841); -$wm_icon_close_bg: $selected_fg_color; -$wm_icon_close_hover_bg: $selected_fg_color; -$wm_icon_close_active_bg: $selected_fg_color; +$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #2f343f); // 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_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #454C5C); $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_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #262932); -$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_bg: if($variant == 'light' and $darker == 'false', #90949E, #90939B); +$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #666A74); +$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #C4C7CC); $wm_icon_active_bg: $selected_fg_color; diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 7049206..ff24b4a 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -415,7 +415,7 @@ $_dot_color: $selected_bg_color; -gtk-image-effect: highlight; } &:active, &:checked { - background-clip: border-box; + background-clip: if($variant=='light', border-box, padding-box); @include button(active); transition-duration: 50ms; } @@ -651,14 +651,18 @@ $_dot_color: $selected_bg_color; &:only-child > .button.flat { @extend %linked:only-child; } } +$_linked_separator_color: if($variant=='light', transparentize($button_border, 0.6), transparentize($button_border, 0.5)); + %linked_middle { border-radius: 0; border-left-style: none; border-right-style: none; &:hover { - box-shadow: inset 1px 0 $selected_bg_color, inset -1px 0 $selected_bg_color; + box-shadow: inset 1px 0 $_linked_separator_color, + inset -1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } &:dir(rtl) { border-radius: 0; // needed when including %linked_middle:dir(rtl) @@ -672,13 +676,15 @@ $_dot_color: $selected_bg_color; border-radius: 3px 0 0 3px; border-left-style: solid; - &:hover { box-shadow: inset -1px 0 $selected_bg_color; } + &:hover { box-shadow: inset -1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } } &:last-child { border-radius: 0 3px 3px 0; border-right-style: solid; - &:hover { box-shadow: inset 1px 0 $selected_bg_color; } + &:hover { box-shadow: inset 1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } &:dir(rtl) { border-bottom-left-radius: 0; } @@ -688,6 +694,7 @@ $_dot_color: $selected_bg_color; border-style: solid; &:hover { box-shadow: none; } + &:active, &:checked { box-shadow: none; } } } @@ -697,7 +704,11 @@ $_dot_color: $selected_bg_color; border-top-style: none; border-radius: 0; - &:hover { box-shadow: inset 0 1px $selected_bg_color, inset 0 -1px $selected_bg_color; } + &:hover { + box-shadow: inset 0 -1px $_linked_separator_color, + inset 0 1px $_linked_separator_color; + } + &:active, &:checked { box-shadow: none; } } %linked_vertical{ @@ -707,19 +718,22 @@ $_dot_color: $selected_bg_color; border-radius: 3px 3px 0 0; border-top-style: solid; - &:hover { box-shadow: inset 0 -1px $selected_bg_color; } + &:hover { box-shadow: inset 0 -1px $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } } &:last-child { border-radius: 0 0 3px 3px; border-bottom-style: solid; - &:hover { box-shadow: inset 0 1px $selected_bg_color; } + &:hover { box-shadow: inset 0 1px $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } } &:only-child { border-radius: 3px; border-style: solid; &:hover { box-shadow: none; } + &:active, &:checked { box-shadow: none; } } } @@ -737,7 +751,7 @@ $_dot_color: $selected_bg_color; outline-offset: -1px; border-radius: 2px; - &:hover { background-color: mix($fg_color,$bg_color,5%); } + &:hover { background-color: if($variant=='light', mix($fg_color,$bg_color,5%), mix($fg_color,$bg_color,10%)); } &:active, &:selected { @extend %selected_items; } @@ -793,9 +807,7 @@ $_dot_color: $selected_bg_color; // padding-right: 6px; &:dir(rtl) { border-style: none solid none none; } &:first-child { color: red; } - &:hover { - color: $selected_bg_color; - } + &:insensitive { color: $insensitive_fg_color; } @@ -929,8 +941,7 @@ GtkComboBox { &:hover { background-color: lighten($button_border, 5%); - border-color: $selected_bg_color; - box-shadow: -1px 0 $selected_bg_color; + border-color: lighten($button_border, 5%); } &:active, &:checked { @include button(active); } @@ -973,7 +984,7 @@ GtkComboBox { background-color: $bg_color; .osd &, &.osd { padding: 7px; - border: 1px solid transparentize(black, 0.4); + border: 1px solid transparentize(black, 0.5); border-radius: 3px; background-color: transparentize($osd_bg_color, 0.1); } @@ -1191,6 +1202,7 @@ GtkComboBox { &:focus { @include entry(header-focus); + background-clip: if($darker=='false' and $variant=='light', border-box, padding-box); &.image { color: $selected_fg_color; } } @@ -1216,7 +1228,10 @@ GtkComboBox { &:backdrop { opacity: 0.7; } &:hover { @include button(header-hover); } - &:active, &:checked { @include button(header-active); } + &:active, &:checked { + @include button(header-active); + background-clip: if($darker=='false' and $variant=='light', border-box, padding-box); + } &:insensitive { @include button(header-insensitive); } &:insensitive:active, &:insensitive:checked { @include button(header-insensitive-active); } } @@ -1227,12 +1242,35 @@ GtkComboBox { .linked.stack-switcher > .button, .linked.path-bar > .button { + + $_linked_separator_color: $header_button_border; + @include button(header-hover); - &:hover { border-color: $selected_bg_color; } + &:hover { background-color: lighten($header_button_bg, 15%); } &:active, &:checked { @include button(header-active); } + &:insensitive { color: transparentize($header_fg, 0.4); } @extend %linked; + + &:hover { + box-shadow: inset 1px 0 $_linked_separator_color, + inset -1px 0 $_linked_separator_color; + } + &:active, &:checked { box-shadow: none; } + + &:first-child { + &:hover { box-shadow: inset -1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } + } + &:last-child { + &:hover { box-shadow: inset 1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } + } + &:only-child { + &:hover { box-shadow: none; } + &:active, &:checked { box-shadow: none; } + } } // Header-bar Suggested and Destructive Action buttons @@ -1285,7 +1323,7 @@ GtkComboBox { &.combobox-entry .button { @include entry(header-normal); - &:hover { @include entry(header-focus); } + &:hover { @include entry(header-focus); box-shadow: none; } &:insensitive { @include entry(header-insensitive); } } } @@ -1297,7 +1335,7 @@ GtkComboBox { GtkProgressBar { - &.trough { background-color: transparentize($header_fg, 0.65); } + &.trough { background-color: if($variant=='light' and $darker=='false', opacify($header_button_border, 0.05), $header_button_border); } &:backdrop { opacity: 0.75; } } @@ -1308,17 +1346,29 @@ GtkComboBox { &:backdrop { opacity: 0.75; } &.trough { - background-image: linear-gradient(to bottom, transparentize($header_fg, 0.65)); + $_trough_bg: if($variant=='light' and $darker=='false', opacify($header_button_border, 0.05), $header_button_border); + background-image: linear-gradient(to bottom, $_trough_bg); - &:insensitive { background-image: linear-gradient(to bottom, transparentize($header_fg, 0.7)); } + &:insensitive { background-image: linear-gradient(to bottom, if($variant=='light' and $darker=='false', transparentize($_trough_bg, 0.05), transparentize($_trough_bg, 0.1))); } } &.slider { - background-image: linear-gradient(to bottom, if($darker == 'false', mix($base_color, $header_bg, 90%), darken($header_bg, 4%))); + $_slider_border: if($variant=='light' and $darker=='false', opacify($header_button_border, 0.2), opacify($header_button_border, 0.3)); + $_slider_bg: if($variant=='light' and $darker=='false', opacify($header_button_bg,1), lighten(opacify($header_bg,1), 10%)); - &:insensitive { - background-image: linear-gradient(to bottom, if($darker == 'false', mix($base_color, $header_bg, 40%), darken($header_bg, 1%))); + background-image: linear-gradient(to bottom, $_slider_bg); + border-color: $_slider_border; - @if $darker=='true' { border-color: mix($header_bg, $selected_bg_color, 60%); } + &:hover { + background-image: linear-gradient(to bottom, lighten($_slider_bg, 5%)); + border-color: $_slider_border; + } + &:active { + background-image: linear-gradient(to bottom, $selected_bg_color); + border-color: $selected_bg_color; + } + &:insensitive { + background-image: linear-gradient(to bottom, mix($_slider_bg, $header_bg, 70%)); + border-color: $_slider_border; } } } @@ -1500,7 +1550,7 @@ column-header.button.dnd { // for treeview-like derive widgets margin: 4px; padding: 0; border-radius: 0; - background-color: $base_color; + background-color: if($variant=='light', $base_color, $bg_color); border: 1px solid $borders_color; .csd & { @@ -1553,7 +1603,7 @@ column-header.button.dnd { // for treeview-like derive widgets border: 1px solid darken($borders_color, 5%); border-radius: 3px; background-clip: border-box; - background-color: $base_color; + background-color: if($variant=='light', $base_color, $bg_color); box-shadow: 0 2px 6px 1px if($variant=='light', transparentize(black, 0.93), transparentize(black, 0.65)); @@ -2011,30 +2061,31 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { -GtkRange-trough-border: 0; outline-offset: -1px; outline-radius: 2px; - //@include _shadows(_button_shadow(normal)); &.trough { margin: 5px; } &.fine-tune { &.trough { border-radius: 5px; margin: 3px; } } &.slider { + $_slider_border: if($variant=='light', transparentize(darken($button_border,25%), 0.5), darken($button_border,2%)); + background-clip: border-box; - background-image: linear-gradient(to bottom, $entry_bg); - border: 1px solid $selected_bg_color; + background-image: linear-gradient(to bottom, $button_bg); + border: 1px solid $_slider_border; border-radius: 50%; box-shadow: none; &:hover { - background-image: linear-gradient(to bottom, $selected_bg_color); - border-color: $selected_bg_color; + background-image: linear-gradient(to bottom, lighten($button_bg, 5%)); + border-color: $_slider_border; } &:insensitive { background-image: linear-gradient(to bottom, mix($entry_bg, $bg_color, 55%)); - border-color: mix($selected_bg_color, $bg_color, 55%); + border-color: transparentize($_slider_border, 0.2); } &:active { - background-image: linear-gradient(to bottom, darken($selected_bg_color, 10%)); - border-color: darken($selected_bg_color, 10%); + background-image: linear-gradient(to bottom, $selected_bg_color); + border-color: $selected_bg_color; } //OSD sliders .osd & { @@ -2068,7 +2119,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } &.trough { - $_scale_trough_bg: if($variant == 'light', $button_border, darken($base_color, 4%)); + $_scale_trough_bg: if($variant == 'light', $button_border, darken($bg_color, 5%)); border: none; border-radius: 2.5px; @@ -2147,7 +2198,7 @@ GtkProgressBar { GtkProgressBar.trough { border: none; border-radius: 3px; - background-color: if($variant == 'light', $button_border, darken($base_color, 4%)); + background-color: if($variant == 'light', $button_border, darken($bg_color, 5%)); &.osd { border-style: none; @@ -2197,8 +2248,8 @@ GtkLevelBar.vertical { background-color: $warning_color; } &.empty-fill-block { - background-color: transparentize($fg_color,0.8); - border-color: transparentize($fg_color,0.8); + background-color: if($variant=='light', transparentize($fg_color,0.8), $base_color); + border-color: if($variant=='light', transparentize($fg_color,0.8), $base_color); } } } @@ -2349,8 +2400,8 @@ GtkCalendar { } &.button, &.button:focus { color: transparentize($fg_color,0.55); - box-shadow: none; - border: none; + @include button(undecorated); + &:hover { color: $fg_color; } @@ -2702,15 +2753,15 @@ GtkVolumeButton.button { padding: 8px; } // see bug #722563 $_wm_border: if($variant=='light', transparentize(black, 0.9), transparentize(black, 0.45)); - box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), $_wm_border), - 0 4px 8px 1px if($darker == 'false', opacify($_wm_border, 0.1), opacify($_wm_border, 0.15)); + box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', darken($header_bg, 6%), $_wm_border), + 0 8px 8px 0 if($variant == 'light', opacify($_wm_border, 0.1), transparentize($_wm_border, 0.2)); /* this is used for the resize cursor area */ margin: 10px; &:backdrop { - box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), $_wm_border), - 0 4px 5px 2px if($darker == 'false', $_wm_border, opacify($_wm_border, 0.15)); + box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', transparentize(darken($header_bg, 6%), 0.1), $_wm_border), + 0 5px 5px 0 if($variant == 'light', opacify($_wm_border, 0.1), transparentize($_wm_border, 0.2)); } &.tiled { border-radius: 0; @@ -2726,7 +2777,7 @@ GtkVolumeButton.button { padding: 8px; } &.popup, &.menu { 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%)); + 0 0 0 1px if($variant == 'light', $_wm_border, darken($bg_color, 10%)); } &.tooltip { border-radius: 2px; diff --git a/common/gtk-3.0/3.16/sass/_drawing.scss b/common/gtk-3.0/3.16/sass/_drawing.scss index 2cb08e1..1e54c38 100644 --- a/common/gtk-3.0/3.16/sass/_drawing.scss +++ b/common/gtk-3.0/3.16/sass/_drawing.scss @@ -52,17 +52,14 @@ background-image: linear-gradient(to bottom, transparentize($entry_bg, 0.45)); } - $_header_entry_bg: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 4%), 0.1), transparentize($base_color, 0.1)); - $_header_entry_border: if($darker == 'true' or $variant == 'dark', darken($header_bg, 10%), transparentize($header_fg, 0.7)); - @if $t==header-normal { // // normal header-bar entry // color: $header_fg; - border-color: $_header_entry_border; - background-image: linear-gradient(to bottom, $_header_entry_bg); + border-color: $header_entry_border; + background-image: linear-gradient(to bottom, $header_entry_bg); background-color: transparent; &.image, &.image:hover { color: inherit; } @@ -73,7 +70,7 @@ // focused header-bar entry // color: $selected_fg_color; - border-color: $selected_bg_color; + border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent); background-image: linear-gradient(to bottom, $selected_bg_color); } @@ -82,7 +79,7 @@ // insensitive header-bar entry // color: transparentize($header_fg, 0.45); - background-image: linear-gradient(to bottom, transparentize($_header_entry_bg, 0.35)); + background-image: linear-gradient(to bottom, transparentize($header_entry_bg, 0.15)); } @else if $t==osd { @@ -90,27 +87,28 @@ // normal osd entry // color: $osd_fg_color; - border-color: transparentize(black, 0.6); + border-color: $osd_entry_border; + background-image: linear-gradient(to bottom, $osd_entry_bg); background-color: transparent; - background-image: linear-gradient(to bottom, transparentize(black, 0.8)); + + &.image, &.image:hover { color: inherit; } } @else if $t==osd-focus { // // active osd entry // - color: $osd_fg_color; - border-color: $selected_bg_color; - background-image: linear-gradient(to bottom, transparentize(black, 0.8)); + color: $selected_fg_color; + border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent); + background-image: linear-gradient(to bottom, $selected_bg_color); } @else if $t==osd-insensitive { // // insensitive osd entry // - color: $osd_insensitive_fg_color; - border-color: transparentize(black, 0.6); - background-image: linear-gradient(to bottom, transparentize(black, 0.9)); + color: transparentize($osd_fg_color, 0.45); + background-image: linear-gradient(to bottom, transparentize($osd_entry_bg, 0.15)); } } @@ -139,8 +137,8 @@ // color: $fg_color; outline-color: transparentize($fg_color, 0.7); - border-color: $selected_bg_color; - background-color: $button_bg; + border-color: $button_border; + background-color: lighten($button_bg, 5%); } @else if $t==active { @@ -149,7 +147,8 @@ // color: $selected_fg_color; outline-color: transparentize($selected_fg_color, 0.7); - border-color: $selected_bg_color; + + border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent); background-color: $selected_bg_color; } @@ -177,9 +176,6 @@ > GtkLabel { color: inherit; } } - $_header_button_bg: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 3%), 0.1), transparentize($button_bg, 0.1)); - $_header_button_border: if($darker == 'true' or $variant == 'dark', darken($header_bg, 8%), transparentize($header_fg, 0.7)); - @if $t==header-normal { // // normal header-bar button @@ -197,8 +193,8 @@ // color: $header_fg; outline-color: transparentize($header_fg, 0.7); - border-color: $_header_button_border; - background-color: $_header_button_bg; + border-color: $header_button_border; + background-color: $header_button_bg; } @else if $t==header-active { @@ -207,7 +203,7 @@ // color: $selected_fg_color; outline-color: transparentize($selected_fg_color, 0.7); - border-color: $selected_bg_color; + border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent); background-color: $selected_bg_color; } @@ -237,8 +233,8 @@ // color: $osd_fg_color; outline-color: transparentize($osd_fg_color, 0.7); - border-color: transparentize(black, 0.55); - background-color: transparentize(black, 0.7); + border-color: $osd_button_border; + background-color: $osd_button_bg; } @else if $t==osd-hover { @@ -247,8 +243,8 @@ // color: $osd_fg_color; outline-color: transparentize($osd_fg_color, 0.7); - border-color: $selected_bg_color; - background-color: transparentize(black, 0.7); + border-color: $osd_button_border; + background-color: opacify(lighten($osd_button_bg, 7%), 0.1); } @else if $t==osd-active { @@ -266,8 +262,8 @@ // insensitive osd button // color: $osd_insensitive_fg_color; - border-color: transparentize(black, 0.55); - background-color: transparentize(black, 0.85); + border-color: $osd_button_border; + background-color: transparentize($osd_button_bg, 0.15); } @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 9b2fa76..0879a5a 100644 --- a/common/gtk-3.0/3.16/sass/_lightdm.scss +++ b/common/gtk-3.0/3.16/sass/_lightdm.scss @@ -34,7 +34,7 @@ /* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; - background-color: if($variant == 'light', $bg_color, $base_color); + background-color: $bg_color; border-top-left-radius: 2px; border-top-right-radius: 2px; border: solid transparentize(black, 0.9); @@ -54,12 +54,12 @@ padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: $osd_bg_color; + background-color: if($variant=='light', $osd_bg_color, $header_bg); 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%); + box-shadow: inset 0 1px if($variant=="light", $dark_sidebar_border, $header_border); } #buttonbox_frame .button{ 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 16bbb1e..6714551 100644 --- a/common/gtk-3.0/3.16/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.16/sass/_transparent_widgets.scss @@ -99,7 +99,7 @@ GtkFileChooserDialog { } .action-bar.frame { background-color: transparent; - border-color: if($variant =='light', darken($dark_sidebar_bg, 7%), darken($dark_sidebar_bg, 15%)); + border-color: if($variant =='light', darken($dark_sidebar_bg, 5%), darken($dark_sidebar_bg, 10%)); } .action-bar.frame, @@ -218,7 +218,7 @@ GeditWindow.background.csd GeditFileBrowserView.view { %dark_sidebar_button { @include button(osd); - &:hover { @include button(osd-hover) } + &:hover { @include button(osd-hover); } &:active, &:checked { @include button(osd-active); } &:insensitive { @include button(osd-insensitive); } } @@ -226,6 +226,6 @@ GeditWindow.background.csd GeditFileBrowserView.view { %dark_sidebar_entry { @include entry(osd); - &:focus { @include entry(osd-focus) } + &:focus { @include entry(osd-focus); } &:insensitive { @include entry(osd-insensitive); } } diff --git a/common/metacity-1/button-bg.svg b/common/metacity-1/button-bg.svg index 49a6f1e..1f225b5 100644 --- a/common/metacity-1/button-bg.svg +++ b/common/metacity-1/button-bg.svg @@ -15,10 +15,10 @@ width="16" xml:space="preserve" inkscape:version="0.91 r13725" - sodipodi:docname="button_bg.svg">image/svg+xmlimage/svg+xml - - + + - - + + - + - - - + + + - - - + - - - + - - - - + - - - + + + @@ -157,39 +150,36 @@ - + - + - + - - - + + - + - - + + - - @@ -205,8 +195,6 @@ - - @@ -223,8 +211,6 @@ - - @@ -240,8 +226,6 @@ - - diff --git a/common/metacity-1/metacity-theme-1.xml b/common/metacity-1/metacity-theme-1.xml index 13c50a8..1556013 100644 --- a/common/metacity-1/metacity-theme-1.xml +++ b/common/metacity-1/metacity-theme-1.xml @@ -21,28 +21,21 @@ - - - + + + - - - + - - - - - - + - - - + + + @@ -157,39 +150,36 @@ - + - + - + - - - + + - + - - + + - - @@ -205,8 +195,6 @@ - - @@ -223,8 +211,6 @@ - - @@ -240,8 +226,6 @@ - - diff --git a/common/metacity-1/metacity-theme-2-dark.xml b/common/metacity-1/metacity-theme-2-dark.xml index 113dce4..38fc8b5 100644 --- a/common/metacity-1/metacity-theme-2-dark.xml +++ b/common/metacity-1/metacity-theme-2-dark.xml @@ -10,39 +10,32 @@ - - + + - - + + - + - - - + + + - - - + - - - + - - - - + - - - + + + @@ -157,39 +150,36 @@ - + - + - + - - - + + - + - - + + - - @@ -205,8 +195,6 @@ - - @@ -223,8 +211,6 @@ - - @@ -240,8 +226,6 @@ - - diff --git a/common/metacity-1/metacity-theme-2.xml b/common/metacity-1/metacity-theme-2.xml index 79fee42..1556013 100644 --- a/common/metacity-1/metacity-theme-2.xml +++ b/common/metacity-1/metacity-theme-2.xml @@ -21,28 +21,21 @@ - - - + + + - - - + - - - - - - + - - - + + + @@ -157,39 +150,36 @@ - + - + - + - - - + + - + - - + + - - @@ -205,8 +195,6 @@ - - @@ -223,8 +211,6 @@ - - @@ -240,8 +226,6 @@ - - diff --git a/common/metacity-1/metacity-theme-3.xml b/common/metacity-1/metacity-theme-3.xml index 1949098..49b5dd7 100644 --- a/common/metacity-1/metacity-theme-3.xml +++ b/common/metacity-1/metacity-theme-3.xml @@ -21,29 +21,22 @@ - - - + + + - - - + - - - - + + - - - - + - - - - + + + + @@ -196,39 +189,36 @@ - + - + - + - - - + + - + - - + + - - @@ -244,8 +234,6 @@ - - @@ -262,8 +250,6 @@ - - @@ -279,8 +265,6 @@ - - diff --git a/common/metacity-1/min-icon.svg b/common/metacity-1/min-icon.svg index cac4f61..92920b5 100644 --- a/common/metacity-1/min-icon.svg +++ b/common/metacity-1/min-icon.svg @@ -18,7 +18,7 @@ sodipodi:docname="min-icon.svg">image/svg+xml + id="g4490-6-5-2-5-3"> - + - - + id="layer4-4-1-9-5-6-3" + style="display:inline;fill:#ffffff;fill-opacity:1" /> @@ -213,7 +207,7 @@ x="645" height="16" width="16" - id="rect17883-39" + id="rect17883-39-99-8" style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> diff --git a/common/unity/dash/close_dash_disabled.svg b/common/unity/dash/close_dash_disabled.svg index d4a4d5a..497574e 100644 --- a/common/unity/dash/close_dash_disabled.svg +++ b/common/unity/dash/close_dash_disabled.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="8.8372772" - inkscape:cy="16.670572" + inkscape:zoom="32.000001" + inkscape:cx="10.337718" + inkscape:cy="9.0639316" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -134,82 +134,81 @@ id="layer1" transform="translate(0,-1028.3622)"> + style="display:inline;opacity:0.4" + id="titlebutton-close-backdrop-dark" + inkscape:label="#g6210" + transform="translate(-641.00002,1218)"> + transform="translate(-678,-432.63782)"> - + transform="translate(-103,0)" + style="display:inline;opacity:1" + id="g4490-6-5-2-5-3-3"> + + + - - - - - - + id="g4778-2-68-8-7-6" + transform="translate(1323,246.86719)" + style="fill:#ffffff;fill-opacity:1"> + + id="layer10-2-1-8-0-4-0" + transform="translate(-60,-518)" + style="fill:#ffffff;fill-opacity:1" /> + + - + transform="translate(-60,-518)" + id="layer12-4-5-7-9-4-0" + style="fill:#ffffff;fill-opacity:1"> + + + + - - - + diff --git a/common/unity/dash/close_dash_prelight.svg b/common/unity/dash/close_dash_prelight.svg index 99d4e33..6d3238c 100644 --- a/common/unity/dash/close_dash_prelight.svg +++ b/common/unity/dash/close_dash_prelight.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="-6.9400422" - inkscape:cy="16.493795" + inkscape:zoom="32.000001" + inkscape:cx="10.337718" + inkscape:cy="9.0639316" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -135,75 +135,69 @@ transform="translate(0,-1028.3622)"> + id="g4490-6-9-1-3"> - + - - + id="layer4-4-1-3-3-7" + style="display:inline;fill:#ffffff;fill-opacity:1" /> @@ -213,7 +207,7 @@ x="542" height="16" width="16" - id="rect17883-5" + id="rect17883-5-4-2" style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> diff --git a/common/unity/dash/close_dash_pressed.svg b/common/unity/dash/close_dash_pressed.svg index cf185e5..2af4093 100644 --- a/common/unity/dash/close_dash_pressed.svg +++ b/common/unity/dash/close_dash_pressed.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="-6.9400422" - inkscape:cy="16.493795" + inkscape:zoom="32.000001" + inkscape:cx="10.337718" + inkscape:cy="9.0639316" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -135,75 +135,69 @@ transform="translate(0,-1028.3622)"> + transform="translate(-437.00001,1218)"> + id="g4490-6-3-7-46-6"> - + - - + id="layer4-4-1-4-1-7-0" + style="display:inline;fill:#ffffff;fill-opacity:1" /> @@ -213,7 +207,7 @@ x="441" height="16" width="16" - id="rect17883-02" + id="rect17883-02-4-3" style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> diff --git a/common/unity/dash/maximize_dash.svg b/common/unity/dash/maximize_dash.svg index 5029ad7..f739283 100644 --- a/common/unity/dash/maximize_dash.svg +++ b/common/unity/dash/maximize_dash.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="8.8372772" - inkscape:cy="16.670572" + inkscape:zoom="32.000001" + inkscape:cx="10.337718" + inkscape:cy="9.0639316" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -134,39 +134,37 @@ id="layer1" transform="translate(0,-1028.3622)"> + style="display:inline;opacity:0.7" + id="titlebutton-max-dark" + inkscape:label="#g6234" + transform="translate(-612.00002,1218)"> + transform="translate(-781,-432.63782)"> - + transform="translate(-29,0)" + style="display:inline;opacity:1" + id="g4490-2-96-8-9"> + + - + width="16" + id="rect17883-29-2-2" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> diff --git a/common/unity/dash/maximize_dash_disabled.svg b/common/unity/dash/maximize_dash_disabled.svg index 750709e..a01a3ec 100644 --- a/common/unity/dash/maximize_dash_disabled.svg +++ b/common/unity/dash/maximize_dash_disabled.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="8.8372772" - inkscape:cy="16.670572" + inkscape:zoom="32.000001" + inkscape:cx="10.337718" + inkscape:cy="9.0639316" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -134,39 +134,37 @@ id="layer1" transform="translate(0,-1028.3622)"> + id="titlebutton-max-backdrop-dark" + inkscape:label="#g6521" + style="display:inline;opacity:0.4" + transform="translate(-612.00002,1201)"> + id="g7146-1-1-6" + transform="translate(-781,-415.63782)"> - + transform="translate(-29,0)" + style="display:inline;opacity:1" + id="g4490-2-6-0"> + + - + x="616" + y="-168.63782" /> diff --git a/common/unity/dash/maximize_dash_prelight.svg b/common/unity/dash/maximize_dash_prelight.svg index f95f9d0..09e1d2d 100644 --- a/common/unity/dash/maximize_dash_prelight.svg +++ b/common/unity/dash/maximize_dash_prelight.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.5885781" - inkscape:cy="15.919271" + inkscape:zoom="32.000001" + inkscape:cx="10.337718" + inkscape:cy="9.0639316" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -134,90 +134,91 @@ id="layer1" transform="translate(0,-1028.3622)"> + style="display:inline" + id="titlebutton-max-hover-dark" + inkscape:label="#g6284" + transform="translate(-509,1218)"> + transform="translate(-781,-432.63782)"> + + - - - - - - - - - - - - - - + id="g4806-9-0-6" + transform="translate(1294,247)" + style="fill:#c0e3ff;fill-opacity:1"> + + + + + + + + + + + + width="16" + id="rect17883-0-1-5" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> diff --git a/common/unity/dash/maximize_dash_pressed.svg b/common/unity/dash/maximize_dash_pressed.svg index db5a8a6..d955b4c 100644 --- a/common/unity/dash/maximize_dash_pressed.svg +++ b/common/unity/dash/maximize_dash_pressed.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="-6.9400422" - inkscape:cy="16.493795" + inkscape:zoom="32.000001" + inkscape:cx="10.337718" + inkscape:cy="9.0639316" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -111,6 +111,10 @@ orientation="1,0" position="12,12" id="guide4316" /> + @@ -131,19 +135,19 @@ transform="translate(0,-1028.3622)"> + transform="translate(-408.00001,1218)"> + id="g4490-2-9-1-2-4-8"> + id="path4068-7-6-5-1-6-6-0" /> + id="layer9-78-2-0-0-8" /> + id="layer15-5-4-2-4-4" /> + id="g71291-1-4-6-4-2" /> + id="g4953-7-0-8-22-2" /> + id="layer12-3-7-2-3-1"> + id="path4293-4-9-0-2" /> @@ -217,7 +221,7 @@ x="412" height="16" width="16" - id="rect17883-79" + id="rect17883-79-3-0" style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> diff --git a/common/unity/dash/minimize_dash.svg b/common/unity/dash/minimize_dash.svg index 2afb3c7..e25d5be 100644 --- a/common/unity/dash/minimize_dash.svg +++ b/common/unity/dash/minimize_dash.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="16.659646" - inkscape:cy="8.8482037" + inkscape:zoom="32.000001" + inkscape:cx="10.337718" + inkscape:cy="9.0639316" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -134,39 +134,37 @@ id="layer1" transform="translate(0,-1028.3622)"> + style="display:inline;opacity:0.7" + id="titlebutton-min-dark" + inkscape:label="#g6247" + transform="translate(-583.00002,1218)"> + transform="translate(-781,-432.63782)"> - + transform="translate(-58,0)" + style="display:inline;opacity:1" + id="g4490-3-75-4-7"> + + - + width="16" + id="rect17883-32-6-9" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> diff --git a/common/unity/dash/minimize_dash_disabled.svg b/common/unity/dash/minimize_dash_disabled.svg index e4c2c2a..1b90e96 100644 --- a/common/unity/dash/minimize_dash_disabled.svg +++ b/common/unity/dash/minimize_dash_disabled.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="16.659646" - inkscape:cy="8.8482037" + inkscape:zoom="32.000001" + inkscape:cx="10.337718" + inkscape:cy="9.0639316" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -134,39 +134,37 @@ id="layer1" transform="translate(0,-1028.3622)"> + id="titlebutton-min-backdrop-dark" + inkscape:label="#g6534" + style="display:inline;opacity:0.4" + transform="translate(-583.00002,1201)"> + id="g7138-0-7-7" + transform="translate(-781,-415.63782)"> - + transform="translate(-58,0)" + style="display:inline;opacity:1" + id="g4490-3-6-9"> + + - + x="587" + y="-168.63782" /> diff --git a/common/unity/dash/minimize_dash_prelight.svg b/common/unity/dash/minimize_dash_prelight.svg index 56c4896..7150ada 100644 --- a/common/unity/dash/minimize_dash_prelight.svg +++ b/common/unity/dash/minimize_dash_prelight.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="16.659646" - inkscape:cy="8.8482037" + inkscape:zoom="32.000001" + inkscape:cx="10.337718" + inkscape:cy="9.0639316" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -134,90 +134,91 @@ id="layer1" transform="translate(0,-1028.3622)"> + style="display:inline" + id="titlebutton-min-hover-dark" + inkscape:label="#g6308" + transform="translate(-480,1218)"> + transform="translate(-781,-432.63782)"> + + - - - - - - - - - - - - - - + style="display:inline;opacity:1;fill:#c0e3ff;fill-opacity:1" + id="g4834-0-4-5" + transform="translate(1265,247)"> + + + + + + + + + + + + width="16" + id="rect17883-11-4-0" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> diff --git a/common/unity/dash/minimize_dash_pressed.svg b/common/unity/dash/minimize_dash_pressed.svg index 26fb74c..bbcbbdb 100644 --- a/common/unity/dash/minimize_dash_pressed.svg +++ b/common/unity/dash/minimize_dash_pressed.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="-6.9400422" - inkscape:cy="16.493795" + inkscape:zoom="32.000001" + inkscape:cx="10.337718" + inkscape:cy="9.0639316" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -111,6 +111,10 @@ orientation="1,0" position="12,12" id="guide4316" /> + @@ -131,19 +135,19 @@ transform="translate(0,-1028.3622)"> + transform="translate(-379.00001,1218)"> + id="g4490-3-6-1-4-1-6"> + id="path4068-7-3-0-3-6-8-3" /> + id="layer9-3-9-1-0-4" /> + id="layer15-52-0-6-6-6" /> + id="g71291-3-4-6-0-6" /> + id="g4953-8-6-8-7-4" /> + id="layer12-45-3-7-96-7"> @@ -214,7 +218,7 @@ + transform="translate(-641,1218)"> + id="g4490-6-5-2-5-3-6"> - + - - + id="layer4-4-1-9-5-6-3-8" + style="display:inline;fill:#ffffff;fill-opacity:1" /> @@ -213,7 +207,7 @@ x="645" height="16" width="16" - id="rect17883-39-99-8" + id="rect17883-39-99-8-8" style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> diff --git a/common/unity/window-buttons-dark/close_prelight.svg b/common/unity/window-buttons-dark/close_prelight.svg index 748830f..852b85a 100644 --- a/common/unity/window-buttons-dark/close_prelight.svg +++ b/common/unity/window-buttons-dark/close_prelight.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="22.627418" + inkscape:cx="4.6255954" + inkscape:cy="10.407616" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -150,11 +150,11 @@ id="g4092-0-2-3-4-6" style="display:inline" transform="translate(58,0)"> - @@ -185,13 +185,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> + transform="translate(-437.00001,1218)"> - @@ -185,13 +185,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> + inkscape:label="#g6210" + transform="translate(-641.00002,1218)"> - - + transform="translate(-678,-432.63782)"> + + + + + - - + id="layer4-4-1-9-5-6-3-3" + style="display:inline;fill:#ffffff;fill-opacity:1" /> + height="16" + width="16" + id="rect17883-39-99-8-6" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> diff --git a/common/unity/window-buttons-dark/maximize.svg b/common/unity/window-buttons-dark/maximize.svg index 057ecc7..e2036d7 100644 --- a/common/unity/window-buttons-dark/maximize.svg +++ b/common/unity/window-buttons-dark/maximize.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1889683" - inkscape:cy="9.2440344" + inkscape:zoom="22.627418" + inkscape:cx="4.6255954" + inkscape:cy="10.407616" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -134,22 +134,10 @@ id="layer1" transform="translate(0,-1028.3622)"> - - + transform="translate(-612.00002,1218)"> diff --git a/common/unity/window-buttons-dark/maximize_prelight.svg b/common/unity/window-buttons-dark/maximize_prelight.svg index 6a420b9..9be9958 100644 --- a/common/unity/window-buttons-dark/maximize_prelight.svg +++ b/common/unity/window-buttons-dark/maximize_prelight.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1889683" - inkscape:cy="9.2440344" + inkscape:zoom="22.627418" + inkscape:cx="4.6255954" + inkscape:cy="10.407616" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -145,12 +145,12 @@ @@ -207,7 +207,7 @@ sodipodi:nodetypes="csscccsscc" inkscape:connector-curvature="0" d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384" - style="opacity:1;fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:none" + style="opacity:1;fill:#c4c7cc;fill-opacity:1;fill-rule:evenodd;stroke:none" id="path4293-6-7-1" /> diff --git a/common/unity/window-buttons-dark/maximize_pressed.svg b/common/unity/window-buttons-dark/maximize_pressed.svg index 326ae8d..6974699 100644 --- a/common/unity/window-buttons-dark/maximize_pressed.svg +++ b/common/unity/window-buttons-dark/maximize_pressed.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1889683" - inkscape:cy="9.2440344" + inkscape:zoom="22.627418" + inkscape:cx="4.6255954" + inkscape:cy="10.407616" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -111,10 +111,6 @@ orientation="1,0" position="12,12" id="guide4316" /> - @@ -133,11 +129,98 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1028.3622)"> + + + + + + + + + + + + + + + + + + + + + transform="translate(-408.00001,1218)"> - - diff --git a/common/unity/window-buttons-dark/minimize.svg b/common/unity/window-buttons-dark/minimize.svg index 45ae2cb..480c900 100644 --- a/common/unity/window-buttons-dark/minimize.svg +++ b/common/unity/window-buttons-dark/minimize.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1889683" - inkscape:cy="9.2440344" + inkscape:zoom="22.627418" + inkscape:cx="4.6255954" + inkscape:cy="10.407616" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -111,10 +111,6 @@ orientation="1,0" position="12,12" id="guide4316" /> - @@ -134,17 +130,10 @@ id="layer1" transform="translate(0,-1028.3622)"> - - diff --git a/common/unity/window-buttons-dark/minimize_prelight.svg b/common/unity/window-buttons-dark/minimize_prelight.svg index 5c12c91..d029d16 100644 --- a/common/unity/window-buttons-dark/minimize_prelight.svg +++ b/common/unity/window-buttons-dark/minimize_prelight.svg @@ -14,7 +14,7 @@ id="svg4306" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="minimize_focused_prelight.svg" + sodipodi:docname="minimize_prelight.svg" style="enable-background:new"> @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1889683" - inkscape:cy="9.2440344" + inkscape:zoom="22.627418" + inkscape:cx="4.6255954" + inkscape:cy="10.407616" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -111,10 +111,6 @@ orientation="1,0" position="12,12" id="guide4316" /> - @@ -145,12 +141,12 @@ @@ -205,7 +201,7 @@ id="layer12-45-6-2-7"> diff --git a/common/unity/window-buttons-dark/minimize_pressed.svg b/common/unity/window-buttons-dark/minimize_pressed.svg index be0af55..f88d4f0 100644 --- a/common/unity/window-buttons-dark/minimize_pressed.svg +++ b/common/unity/window-buttons-dark/minimize_pressed.svg @@ -14,7 +14,7 @@ id="svg4306" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="minimize_focused_pressed.svg" + sodipodi:docname="minimize_pressed.svg" style="enable-background:new"> @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1889683" - inkscape:cy="9.2440344" + inkscape:zoom="22.627418" + inkscape:cx="4.6255954" + inkscape:cy="10.407616" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -111,10 +111,6 @@ orientation="1,0" position="12,12" id="guide4316" /> - @@ -137,7 +133,7 @@ style="display:inline" id="titlebutton-min-active-dark" inkscape:label="#g6414" - transform="translate(-379,1218)"> + transform="translate(-379.00001,1218)"> - @@ -136,20 +132,8 @@ - - image/svg+xml - + @@ -150,11 +150,11 @@ id="g4092-0-2-21-0" style="display:inline" transform="translate(58,0)"> - @@ -185,13 +185,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> + diff --git a/common/unity/window-buttons/close_prelight.svg b/common/unity/window-buttons/close_prelight.svg index 879400d..6f2670e 100644 --- a/common/unity/window-buttons/close_prelight.svg +++ b/common/unity/window-buttons/close_prelight.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="22.627418" + inkscape:cx="12.382889" + inkscape:cy="11.054563" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -150,11 +150,11 @@ id="g4092-0-2-3" style="display:inline" transform="translate(58,0)"> - @@ -185,13 +185,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> + diff --git a/common/unity/window-buttons/close_pressed.svg b/common/unity/window-buttons/close_pressed.svg index 9f0fe17..0365887 100644 --- a/common/unity/window-buttons/close_pressed.svg +++ b/common/unity/window-buttons/close_pressed.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="1" + inkscape:cx="13.034303" + inkscape:cy="10.832259" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -154,7 +154,7 @@ r="7" cy="255" cx="1376" - style="fill:#ef4048;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="fill:#f13039;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path4068-7-5-4-9" /> @@ -188,7 +188,7 @@ style="display:inline;fill:#ffffff;fill-opacity:1"> diff --git a/common/unity/window-buttons/close_unfocused.svg b/common/unity/window-buttons/close_unfocused.svg index 9e0f44b..aca7fa1 100644 --- a/common/unity/window-buttons/close_unfocused.svg +++ b/common/unity/window-buttons/close_unfocused.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="22.627418" + inkscape:cx="12.382889" + inkscape:cy="11.054563" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -134,83 +134,86 @@ id="layer1" transform="translate(0,-1028.3622)"> + inkscape:label="#g6210" + transform="translate(-641,1218)"> - - + transform="translate(-678,-432.63782)"> + + + + + - - + id="layer4-4-1-9-5-3" + style="display:inline;fill:#ffffff;fill-opacity:1" /> + height="16" + width="16" + id="rect17883-39-7" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> + diff --git a/common/unity/window-buttons/maximize.svg b/common/unity/window-buttons/maximize.svg index c2a642d..5da027c 100644 --- a/common/unity/window-buttons/maximize.svg +++ b/common/unity/window-buttons/maximize.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="45.254834" + inkscape:cx="12.734727" + inkscape:cy="10.911658" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -134,22 +134,10 @@ id="layer1" transform="translate(0,-1028.3622)"> - - + transform="translate(-612,1218)" + style="display:inline;opacity:0.8"> diff --git a/common/unity/window-buttons/maximize_prelight.svg b/common/unity/window-buttons/maximize_prelight.svg index 90ef47c..a530d48 100644 --- a/common/unity/window-buttons/maximize_prelight.svg +++ b/common/unity/window-buttons/maximize_prelight.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="45.254834" + inkscape:cx="12.734727" + inkscape:cy="10.911658" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -145,12 +145,12 @@ @@ -207,7 +207,7 @@ sodipodi:nodetypes="csscccsscc" inkscape:connector-curvature="0" d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384" - style="opacity:1;fill:#70788d;fill-opacity:1;fill-rule:evenodd;stroke:none" + style="opacity:1;fill:#7a7f8b;fill-opacity:1;fill-rule:evenodd;stroke:none" id="path4293-6" /> diff --git a/common/unity/window-buttons/maximize_pressed.svg b/common/unity/window-buttons/maximize_pressed.svg index 549401c..c2f869b 100644 --- a/common/unity/window-buttons/maximize_pressed.svg +++ b/common/unity/window-buttons/maximize_pressed.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="45.254834" + inkscape:cx="12.734727" + inkscape:cy="10.911658" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" diff --git a/common/unity/window-buttons/maximize_unfocused.svg b/common/unity/window-buttons/maximize_unfocused.svg index 48a4ed8..72530a8 100644 --- a/common/unity/window-buttons/maximize_unfocused.svg +++ b/common/unity/window-buttons/maximize_unfocused.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="45.254834" + inkscape:cx="12.734727" + inkscape:cy="10.911658" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -136,20 +136,8 @@ - - diff --git a/common/unity/window-buttons/minimize.svg b/common/unity/window-buttons/minimize.svg index 5c2cecd..78a5356 100644 --- a/common/unity/window-buttons/minimize.svg +++ b/common/unity/window-buttons/minimize.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="45.254834" + inkscape:cx="12.734727" + inkscape:cy="10.911658" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -134,17 +134,10 @@ id="layer1" transform="translate(0,-1028.3622)"> - + transform="translate(-583,1218)" + style="display:inline;opacity:0.8"> - diff --git a/common/unity/window-buttons/minimize_prelight.svg b/common/unity/window-buttons/minimize_prelight.svg index 93d5baf..5d9de25 100644 --- a/common/unity/window-buttons/minimize_prelight.svg +++ b/common/unity/window-buttons/minimize_prelight.svg @@ -14,7 +14,7 @@ id="svg4306" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="minimize_focused_prelight.svg" + sodipodi:docname="minimize_prelight.svg" style="enable-background:new"> @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="45.254834" + inkscape:cx="12.734727" + inkscape:cy="10.911658" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -145,12 +145,12 @@ @@ -205,7 +205,7 @@ id="layer12-45-6"> diff --git a/common/unity/window-buttons/minimize_pressed.svg b/common/unity/window-buttons/minimize_pressed.svg index fe9ebee..588536a 100644 --- a/common/unity/window-buttons/minimize_pressed.svg +++ b/common/unity/window-buttons/minimize_pressed.svg @@ -14,7 +14,7 @@ id="svg4306" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="minimize_focused_pressed.svg" + sodipodi:docname="minimize_pressed.svg" style="enable-background:new"> @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="45.254834" + inkscape:cx="12.734727" + inkscape:cy="10.911658" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" diff --git a/common/unity/window-buttons/minimize_unfocused.svg b/common/unity/window-buttons/minimize_unfocused.svg index 36a25f0..c91380b 100644 --- a/common/unity/window-buttons/minimize_unfocused.svg +++ b/common/unity/window-buttons/minimize_unfocused.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="45.254834" + inkscape:cx="12.734727" + inkscape:cy="10.911658" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -136,20 +136,8 @@ - - c #E45E65", -", c #E35E65", -"' c #E6676E", -") c #E5676D", -"! c #DA5C62", -"~ c #3E383E", -"{ c #FEFCFC", -"] c #F4C0C3", -"^ c #E45F66", -"/ c #F4BDC0", -"( c #FFFEFE", -"_ c #8B4950", -": c #C3575D", -"< c #F2AFB3", -"[ c #FFFFFF", -"} c #F5C2C5", -"| c #F5C2C4", -"1 c #F3B4B8", -"2 c #DB5C63", -"3 c #F2B3B6", -"4 c #F3B6BA", -"5 c #E46067", -"6 c #F5C3C6", -"7 c #F6C9CB", -"8 c #E46167", -"9 c #F5C0C3", -"0 c #F2AFB2", -"a c #F5C1C4", -"b c #FDF1F2", -"c c #F1AAAE", -"d c #8A4A50", -"e c #DA5B62", -"f c #3D373E", -"g c #694148", -"h c #C0565D", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #3C3741", +"$ c #80464E", +"% c #AE5056", +"& c #C5555B", +"* c #AD5057", +"= c #7F464E", +"- c #633F49", +"; c #C3555B", +"> c #CC575D", +", c #623F49", +"' c #CB565C", +") c #C2545C", +"! c #3C3641", +"~ c #32343F", +"{ c #6C414A", +"] c #CA565C", +"^ c #6F414B", +"/ c #30343F", +"( c #7F454D", +"_ c #AF5057", +": c #7C454D", +"< c #6A414A", +"[ c #6B414A", +"} c #77434C", +"| c #79444D", +"1 c #75434C", +"2 c #69404A", +"3 c #643F48", +"4 c #C9565C", +"5 c #7D464E", +"6 c #81464E", +"7 c #7E454E", +"8 c #3B3641", +"9 c #613F48", +"0 c #C4555B", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@#$%&&*=#@@@@@@@@", -"@@@@@@@-;>>>>>>;-@@@@@@@", -"@@@@@@-,>>>>>>>>,-@@@@@@", -"@@@@@#;>>'>>>>)>>!~@@@@@", -"@@@@@$>>>{]^^/(>>>_@@@@@", -"@@@@@:>>><[}|[1>>>*@@@@@", -"@@@@@2>>>>3[[4>>>>;@@@@@", -"@@@@@;>>>56[[78>>>!@@@@@", -"@@@@@%>>>9[00[a>>>*@@@@@", -"@@@@@=>>>bc>>cb>>>d@@@@@", -"@@@@@#;>>>>>>>>>>ef@@@@@", -"@@@@@@-,>>>>>>>>,g@@@@@@", -"@@@@@@@-!>>>>>>eg@@@@@@@", -"@@@@@@@@~_h22hdf@@@@@@@@", +"@@@@@@@-;>>>>>>;,@@@@@@@", +"@@@@@@-'>>>>>>>>',@@@@@@", +"@@@@@#;>>)>>>>;>>;!@@@@@", +"@@@@@$>>>~{]]^/>>>(@@@@@", +"@@@@@_>>>:@<[@}>>>*@@@@@", +"@@@@@;>>>>|@@1>>>>;@@@@@", +"@@@@@;>>>]2@@34>>>;@@@@@", +"@@@@@%>>>[@55@<>>>*@@@@@", +"@@@@@=>>>#6>>6#>>>7@@@@@", +"@@@@@#;>>>>>>>>>>)8@@@@@", +"@@@@@@,'>>>>>>>>'9@@@@@@", +"@@@@@@@,;>>>>>>)9@@@@@@@", +"@@@@@@@@!(*00*78@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/close-inactive.xpm b/common/xfwm4-dark/close-inactive.xpm index e8efc08..c4183eb 100644 --- a/common/xfwm4-dark/close-inactive.xpm +++ b/common/xfwm4-dark/close-inactive.xpm @@ -1,67 +1,59 @@ /* XPM */ static char * close_inactive_xpm[] = { -"24 24 42 1", +"24 24 34 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", -"# c #2D3139", -"$ c #262B31", -"% c #22272B", -"& c #1F2428", -"* c #2A2E34", -"= c #20242A", -"- c #24282F", -"; c #282D33", -"> c #2A2E35", -", c #21252B", -"' c #292E34", -") c #282C33", -"! c #21252A", -"~ c #2D3237", -"{ c #2D3239", -"] c #656C76", -"^ c #4F545D", -"/ c #4D535B", -"( c #676D76", -"_ c #22262B", -": c #282C32", -"< c #494E56", -"[ c #4F565D", -"} c #4F555D", -"| c #4A4F57", -"1 c #282D32", -"2 c #1F2429", -"3 c #4B5059", -"4 c #202429", -"5 c #51565D", -"6 c #525860", -"7 c #282D34", -"8 c #202529", -"9 c #484E55", -"0 c #626770", -"a c #454C54", -"b c #272B32", -"c c #22272C", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #333843", +"$ c #4B5059", +"% c #5B5F69", +"& c #646770", +"* c #5C6069", +"= c #4B505A", +"- c #414650", +"; c #636771", +"> c #666A73", +", c #404650", +"' c #636770", +") c #303540", +"! c #444953", +"~ c #666A72", +"{ c #454A54", +"] c #2E333F", +"^ c #4B4F5A", +"/ c #494E58", +"( c #444852", +"_ c #434953", +": c #484D57", +"< c #474C56", +"[ c #656972", +"} c #444853", +"| c #4A4F59", +"1 c #4C515A", +"2 c #4B4F59", +"3 c #40454F", +"4 c #5C5F68", +"5 c #636871", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@#$%&&%$#@@@@@@@@", -"@@@@@@@*=-;;;;-=>@@@@@@@", -"@@@@@@*,;'''''')!>@@@@@@", -"@@@@@#=;'~''''~')={@@@@@", -"@@@@@$-'']^**/(''-$@@@@@", -"@@@@@_:''<([}(|''1%@@@@@", -"@@@@@2;'''|((3''';4@@@@@", -"@@@@@4;''*5((6*''78@@@@@", -"@@@@@%:''}(99(}''1%@@@@@", -"@@@@@$-''0a''a0''-b@@@@@", -"@@@@@#=)'''''''')8{@@@@@", -"@@@@@@>,)'''''')!>@@@@@@", -"@@@@@@@>=-1;;1-8>@@@@@@@", -"@@@@@@@@{$c22cb{@@@@@@@@", +"@@@@@@@@#$%&&*=#@@@@@@@@", +"@@@@@@@-;>>>>>>;,@@@@@@@", +"@@@@@@->>>>>>>>>>,@@@@@@", +"@@@@@#;>>'>>>>'>>'#@@@@@", +"@@@@@$>>>)!~~{]>>>^@@@@@", +"@@@@@%>>>/@(_@:>>>*@@@@@", +"@@@@@;>>>>/@@<>>>>;@@@@@", +"@@@@@;>>>[(@@-[>>>'@@@@@", +"@@@@@%>>>}@||@_>>>*@@@@@", +"@@@@@=>>>#1>>1#>>>2@@@@@", +"@@@@@#;>>>>>>>>>>'#@@@@@", +"@@@@@@,>>>>>>>>>>3@@@@@@", +"@@@@@@@,'>>>>>>'3@@@@@@@", +"@@@@@@@@#^45542#@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/close-prelight.xpm b/common/xfwm4-dark/close-prelight.xpm index 724bbd1..6e28729 100644 --- a/common/xfwm4-dark/close-prelight.xpm +++ b/common/xfwm4-dark/close-prelight.xpm @@ -1,49 +1,46 @@ /* XPM */ static char * close_prelight_xpm[] = { -"24 24 43 1", +"24 24 40 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", -"# c #3F3A40", -"$ c #945B61", -"% c #CE7177", -"& c #EB7C81", -"* c #CE7175", -"= c #935B60", -"- c #704D53", -"; c #E97C81", -"> c #F48085", -", c #6F4D53", -"' c #F37F84", -") c #F5878C", -"! c #E97B80", -"~ c #3F3A41", -"{ c #FFFDFD", -"] c #FBCDCF", -"^ c #F48186", -"/ c #FBCBCD", -"( c #FFFEFE", -"_ c #925A60", -": c #CF7176", -"< c #FAC0C3", -"[ c #FFFFFF", -"} c #FBCFD1", -"| c #FAC4C7", -"1 c #FAC3C5", -"2 c #FAC6C8", -"3 c #FBD0D2", -"4 c #FBD4D6", -"5 c #F48287", -"6 c #FBCED0", -"7 c #FAC0C2", -"8 c #FEF4F4", -"9 c #F9BCBF", -"0 c #925A5F", -"a c #E87B80", -"b c #3E3940", -"c c #6E4C53", -"d c #CD7176", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #3D3944", +"$ c #85575F", +"% c #B86A70", +"& c #CF757A", +"* c #B66A71", +"= c #84575E", +"- c #674A54", +"; c #CE7479", +"> c #D7787D", +", c #664A53", +"' c #D6777C", +") c #CD7479", +"! c #3D3943", +"~ c #32343F", +"{ c #704E57", +"] c #D5777C", +"^ c #734F58", +"/ c #30343F", +"( c #85565F", +"_ c #B86B71", +": c #82555D", +"< c #6E4D56", +"[ c #6F4E56", +"} c #7C535B", +"| c #7E545B", +"1 c #7A525A", +"2 c #6D4D56", +"3 c #674A53", +"4 c #D4767C", +"5 c #6F4E57", +"6 c #83565E", +"7 c #875760", +"8 c #3C3844", +"9 c #654A52", +"0 c #B66970", +"a c #CF747A", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", @@ -52,17 +49,17 @@ static char * close_prelight_xpm[] = { "@@@@@@@@#$%&&*=#@@@@@@@@", "@@@@@@@-;>>>>>>;,@@@@@@@", "@@@@@@-'>>>>>>>>',@@@@@@", -"@@@@@#;>>)>>>>)>>!~@@@@@", -"@@@@@$>>>{]^^/(>>>_@@@@@", -"@@@@@:>>><[}}[|>>>*@@@@@", -"@@@@@&>>>>1[[2>>>>;@@@@@", -"@@@@@;>>>^3[[45>>>!@@@@@", -"@@@@@%>>>6[77[6>>>*@@@@@", -"@@@@@=>>>89>>98>>>0@@@@@", -"@@@@@#;>>>>>>>>>>ab@@@@@", -"@@@@@@,'>>>>>>>>'c@@@@@@", -"@@@@@@@,!>>>>>>ac@@@@@@@", -"@@@@@@@@~_d&&d0b@@@@@@@@", +"@@@@@#;>>)>>>>)>>)!@@@@@", +"@@@@@$>>>~{]]^/>>>(@@@@@", +"@@@@@_>>>:@<[@}>>>*@@@@@", +"@@@@@;>>>>|@@1>>>>;@@@@@", +"@@@@@;>>>]2@@34>>>)@@@@@", +"@@@@@%>>>5@66@[>>>*@@@@@", +"@@@@@=>>>#7>>7#>>>6@@@@@", +"@@@@@#;>>>>>>>>>>)8@@@@@", +"@@@@@@,'>>>>>>>>'9@@@@@@", +"@@@@@@@,)>>>>>>)9@@@@@@@", +"@@@@@@@@!(0aa068@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/close-pressed.xpm b/common/xfwm4-dark/close-pressed.xpm index ef26fab..984b951 100644 --- a/common/xfwm4-dark/close-pressed.xpm +++ b/common/xfwm4-dark/close-pressed.xpm @@ -1,71 +1,65 @@ /* XPM */ static char * close_pressed_xpm[] = { -"24 24 46 1", +"24 24 40 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", -"# c #3E3239", -"$ c #8D2D34", -"% c #C32831", -"& c #DE262F", -"* c #C22831", -"= c #6C2F37", -"- c #DC262F", -"; c #E6262F", -"> c #6B2F36", -", c #E5262F", -"' c #E7333B", -") c #E7323A", -"! c #DB262F", -"~ c #3E323A", -"{ c #FFFBFB", -"] c #F5AAAD", -"^ c #E62831", -"/ c #F5A6AA", -"( c #FFFDFD", -"_ c #8C2C34", -": c #C42831", -"< c #F39498", -"[ c #FFFFFF", -"} c #F6ADB1", -"| c #F5ACB0", -"1 c #F39B9F", -"2 c #DD262F", -"3 c #F3989C", -"4 c #F49DA1", -"5 c #E62931", -"6 c #F6AEB2", -"7 c #F7B6B9", -"8 c #E62932", -"9 c #F5ABAE", -"0 c #F39397", -"a c #F5ACAF", -"b c #FDECED", -"c c #F28D92", -"d c #8B2C34", -"e c #3D323A", -"f c #692F37", -"g c #C22931", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #3A343F", +"$ c #783640", +"% c #A33640", +"& c #B73740", +"* c #A13741", +"= c #78363F", +"- c #5E3540", +"; c #B63740", +"> c #BE3841", +", c #5E343F", +"' c #BD3740", +") c #B53740", +"! c #3B343E", +"~ c #32333E", +"{ c #67353F", +"] c #BC3740", +"^ c #683540", +"/ c #2F333F", +"( c #773640", +"_ c #A33740", +": c #75363F", +"< c #65353F", +"[ c #653540", +"} c #71353F", +"| c #72363F", +"1 c #6F353F", +"2 c #64353F", +"3 c #5F353F", +"4 c #BB3740", +"5 c #66353F", +"6 c #763640", +"7 c #7A3540", +"8 c #773540", +"9 c #3A333F", +"0 c #5C353F", +"a c #A13740", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@#$%&&*$#@@@@@@@@", -"@@@@@@@=-;;;;;;->@@@@@@@", -"@@@@@@=,;;;;;;;;,>@@@@@@", -"@@@@@#-;;';;;;);;!~@@@@@", -"@@@@@$;;;{]^^/(;;;_@@@@@", -"@@@@@:;;;<[}|[1;;;*@@@@@", -"@@@@@2;;;;3[[4;;;;-@@@@@", -"@@@@@-;;;56[[78;;;!@@@@@", -"@@@@@%;;;9[00[a;;;*@@@@@", -"@@@@@$;;;bc;;cb;;;d@@@@@", -"@@@@@#-;;;;;;;;;;!e@@@@@", -"@@@@@@>,;;;;;;;;,f@@@@@@", -"@@@@@@@>!;;;;;;!f@@@@@@@", -"@@@@@@@@~_g22gde@@@@@@@@", +"@@@@@@@@#$%&&*=#@@@@@@@@", +"@@@@@@@-;>>>>>>;,@@@@@@@", +"@@@@@@-'>>>>>>>>',@@@@@@", +"@@@@@#;>>)>>>>;>>;!@@@@@", +"@@@@@$>>>~{]]^/>>>(@@@@@", +"@@@@@_>>>:@<[@}>>>*@@@@@", +"@@@@@;>>>>|@@1>>>>;@@@@@", +"@@@@@;>>>]2@@34>>>;@@@@@", +"@@@@@%>>>5@66@<>>>*@@@@@", +"@@@@@=>>>#7>>7#>>>8@@@@@", +"@@@@@#;>>>>>>>>>>)9@@@@@", +"@@@@@@,'>>>>>>>>'0@@@@@@", +"@@@@@@@,;>>>>>>)0@@@@@@@", +"@@@@@@@@!(a&&a89@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/hide-active.xpm b/common/xfwm4-dark/hide-active.xpm index 8cddaa7..931ff30 100644 --- a/common/xfwm4-dark/hide-active.xpm +++ b/common/xfwm4-dark/hide-active.xpm @@ -1,54 +1,30 @@ /* XPM */ static char * hide_active_xpm[] = { -"24 24 29 1", +"24 24 5 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", -"# c #2D3239", -"$ c #23272D", -"% c #1D2125", -"& c #1A1D22", -"* c #1D2126", -"= c #23282D", -"- c #282C32", -"; c #1B1E23", -"> c #21242A", -", c #272A30", -"' c #272B30", -") c #282D32", -"! c #1A1E24", -"~ c #252A30", -"{ c #272C32", -"] c #262A30", -"^ c #21252A", -"/ c #1E2125", -"( c #1A1E22", -"_ c #272B31", -": c #939CA8", -"< c #1B1E22", -"[ c #23282E", -"} c #292D33", -"| c #262A2F", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #8F939A", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@#$%&&*=#@@@@@@@@", -"@@@@@@@-;>,'',>;)@@@@@@@", -"@@@@@@-!~{{{{{{];)@@@@@@", -"@@@@@#;~{{{{{{{{];#@@@@@", -"@@@@@$>{{{{{{{{{{^=@@@@@", -"@@@@@/]{{{{{{{{{{,*@@@@@", -"@@@@@(_{{::::::{{_(@@@@@", -"@@@@@(_{{::::::{{_<@@@@@", -"@@@@@%]{{{{{{{{{{,*@@@@@", -"@@@@@=>{{{{{{{{{{^[@@@@@", -"@@@@@#;]{{{{{{{{]<#@@@@@", -"@@@@@@)!]{{{{{{];}@@@@@@", -"@@@@@@@);^,__|^<}@@@@@@@", -"@@@@@@@@#=*((*[#@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@######@@@@@@@@@", +"@@@@@@@@@######@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/hide-inactive.xpm b/common/xfwm4-dark/hide-inactive.xpm index ee41358..94254c2 100644 --- a/common/xfwm4-dark/hide-inactive.xpm +++ b/common/xfwm4-dark/hide-inactive.xpm @@ -1,53 +1,30 @@ /* XPM */ static char * hide_inactive_xpm[] = { -"24 24 28 1", +"24 24 5 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", -"# c #2D3139", -"$ c #262B31", -"% c #22272B", -"& c #1F2428", -"* c #2A2E34", -"= c #20242A", -"- c #24282F", -"; c #282D33", -"> c #2A2E35", -", c #21252B", -"' c #292E34", -") c #282C33", -"! c #21252A", -"~ c #2D3239", -"{ c #22262B", -"] c #282C32", -"^ c #282D32", -"/ c #1F2429", -"( c #676D76", -"_ c #202429", -": c #282D34", -"< c #202529", -"[ c #272B32", -"} c #22272C", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #666A73", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@#$%&&%$#@@@@@@@@", -"@@@@@@@*=-;;;;-=>@@@@@@@", -"@@@@@@*,;'''''')!>@@@@@@", -"@@@@@#=;'''''''')=~@@@@@", -"@@@@@$-''''''''''-$@@@@@", -"@@@@@{]''''''''''^%@@@@@", -"@@@@@/;''(((((('';_@@@@@", -"@@@@@_;''(((((('':<@@@@@", -"@@@@@%]''''''''''^%@@@@@", -"@@@@@$-''''''''''-[@@@@@", -"@@@@@#=)'''''''')<~@@@@@", -"@@@@@@>,)'''''')!>@@@@@@", -"@@@@@@@>=-^;;^-<>@@@@@@@", -"@@@@@@@@~$}//}[~@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@######@@@@@@@@@", +"@@@@@@@@@######@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/hide-prelight.xpm b/common/xfwm4-dark/hide-prelight.xpm index f32045d..16f49a6 100644 --- a/common/xfwm4-dark/hide-prelight.xpm +++ b/common/xfwm4-dark/hide-prelight.xpm @@ -1,62 +1,47 @@ /* XPM */ static char * hide_prelight_xpm[] = { -"24 24 37 1", +"24 24 22 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", -"# c #313C48", -"$ c #406691", -"% c #4C81C1", -"& c #508FDA", -"* c #4B82C2", -"= c #406590", -"- c #3A5372", -"; c #4F8CD4", -"> c #416898", -", c #324459", -"' c #282E38", -") c #416998", -"! c #3A5371", -"~ c #4D88CF", -"{ c #2F3E54", -"] c #262A31", -"^ c #2F4054", -"/ c #323B49", -"( c #416999", -"_ c #406490", -": c #4B82C3", -"< c #304258", -"[ c #324359", -"} c #282F3A", -"| c #AFB8C5", -"1 c #508FD8", -"2 c #28313B", -"3 c #4F8ED8", -"4 c #40648E", -"5 c #313B48", -"6 c #395371", -"7 c #32445A", -"8 c #4B81C1", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #2E333E", +"$ c #2A2E37", +"% c #262B34", +"& c #252932", +"* c #2A2E38", +"= c #2C303A", +"- c #262A34", +"; c #2F3641", +"> c #3D4250", +", c #424959", +"' c #282B35", +") c #3D4353", +"! c #444B5B", +"~ c #3D4252", +"{ c #262B33", +"] c #3B4250", +"^ c #C4C7CC", +"/ c #252933", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@#$%&&*=#@@@@@@@@", -"@@@@@@@-;>,'',);!@@@@@@@", -"@@@@@@-~{]]]]]]^~!@@@@@@", -"@@@@@#;{]]]]]]]]^;/@@@@@", -"@@@@@$>]]]]]]]]]](_@@@@@", -"@@@@@:<]]]]]]]]]][*@@@@@", -"@@@@@&}]]||||||]]}1@@@@@", -"@@@@@1}]]||||||]]23@@@@@", -"@@@@@%<]]]]]]]]]][*@@@@@", -"@@@@@=)]]]]]]]]]](4@@@@@", -"@@@@@#;^]]]]]]]]^;5@@@@@", -"@@@@@@!~^]]]]]]^~6@@@@@@", -"@@@@@@@!;([}}7(;6@@@@@@@", -"@@@@@@@@/_8&&845@@@@@@@@", +"@@@@@@@@#$%&&%*#@@@@@@@@", +"@@@@@@@=-;>,,>;-=@@@@@@@", +"@@@@@@=')!!!!!!~'=@@@@@@", +"@@@@@#-)!!!!!!!!~-#@@@@@", +"@@@@@$;!!!!!!!!!!;*@@@@@", +"@@@@@{]!!!!!!!!!!]%@@@@@", +"@@@@@&,!!^^^^^^!!,/@@@@@", +"@@@@@/,!!^^^^^^!!,/@@@@@", +"@@@@@%]!!!!!!!!!!]%@@@@@", +"@@@@@*;!!!!!!!!!!;*@@@@@", +"@@@@@#-~!!!!!!!!~%#@@@@@", +"@@@@@@='~!!!!!!~'=@@@@@@", +"@@@@@@@=-;],,];%=@@@@@@@", +"@@@@@@@@#*%&&%*#@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/left-active.xpm b/common/xfwm4-dark/left-active.xpm index 7910439..b94d67f 100644 --- a/common/xfwm4-dark/left-active.xpm +++ b/common/xfwm4-dark/left-active.xpm @@ -2,7 +2,7 @@ static char * left_active_xpm[] = { "1 12 2 1", " c None", -". c #111215", +". c #21252B", ".", ".", ".", diff --git a/common/xfwm4-dark/left-inactive.xpm b/common/xfwm4-dark/left-inactive.xpm index 9c1ba36..17f9acf 100644 --- a/common/xfwm4-dark/left-inactive.xpm +++ b/common/xfwm4-dark/left-inactive.xpm @@ -2,7 +2,7 @@ static char * left_inactive_xpm[] = { "1 12 2 1", " c None", -". c #111215", +". c #21252B", ".", ".", ".", diff --git a/common/xfwm4-dark/maximize-active.xpm b/common/xfwm4-dark/maximize-active.xpm index 9c6462a..be458f3 100644 --- a/common/xfwm4-dark/maximize-active.xpm +++ b/common/xfwm4-dark/maximize-active.xpm @@ -1,63 +1,37 @@ /* XPM */ static char * maximize_active_xpm[] = { -"24 24 38 1", +"24 24 12 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", -"# c #2D3239", -"$ c #23272D", -"% c #1D2125", -"& c #1A1D22", -"* c #1D2126", -"= c #23282D", -"- c #282C32", -"; c #1B1E23", -"> c #21242A", -", c #272A30", -"' c #272B30", -") c #282D32", -"! c #1A1E24", -"~ c #252A30", -"{ c #272C32", -"] c #262A30", -"^ c #282E34", -"/ c #717882", -"( c #939CA8", -"_ c #7F8690", -": c #21252A", -"< c #1E2125", -"[ c #1A1E22", -"} c #272B31", -"| c #282D34", -"1 c #747B85", -"2 c #2A2F35", -"3 c #292E34", -"4 c #6E757E", -"5 c #1B1E22", -"6 c #7F8892", -"7 c #23282E", -"8 c #292D33", -"9 c #262A2F", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #313641", +"$ c #70757E", +"% c #8F939A", +"& c #7D8089", +"* c #73777F", +"= c #323641", +"- c #6E717B", +"; c #7E818A", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@#$%&&*=#@@@@@@@@", -"@@@@@@@-;>,'',>;)@@@@@@@", -"@@@@@@-!~{{{{{{];)@@@@@@", -"@@@@@#;~{{{{{{{{];#@@@@@", -"@@@@@$>{{{^/((_{{:=@@@@@", -"@@@@@<]{{^{^/(({{,*@@@@@", -"@@@@@[}{|12{34({{}[@@@@@", -"@@@@@[}{|(12{34{{}5@@@@@", -"@@@@@%]{|((/^{^{{,*@@@@@", -"@@@@@=>{{6((/^{{{:7@@@@@", -"@@@@@#;]{{{{{{{{]5#@@@@@", -"@@@@@@)!]{{{{{{];8@@@@@@", -"@@@@@@@);:,}}9:58@@@@@@@", -"@@@@@@@@#=*[[*7#@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@#$%%&@@@@@@@@@", +"@@@@@@@@@#@#$%%@@@@@@@@@", +"@@@@@@@@@*=@@-%@@@@@@@@@", +"@@@@@@@@@%*=@@-@@@@@@@@@", +"@@@@@@@@@%%$#@#@@@@@@@@@", +"@@@@@@@@@;%%$#@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/maximize-inactive.xpm b/common/xfwm4-dark/maximize-inactive.xpm index 6b08d2f..579b2ff 100644 --- a/common/xfwm4-dark/maximize-inactive.xpm +++ b/common/xfwm4-dark/maximize-inactive.xpm @@ -1,59 +1,37 @@ /* XPM */ static char * maximize_inactive_xpm[] = { -"24 24 34 1", +"24 24 12 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", -"# c #2D3139", -"$ c #262B31", -"% c #22272B", -"& c #1F2428", -"* c #2A2E34", -"= c #20242A", -"- c #24282F", -"; c #282D33", -"> c #2A2E35", -", c #21252B", -"' c #292E34", -") c #282C33", -"! c #21252A", -"~ c #2D3239", -"{ c #2A3035", -"] c #525962", -"^ c #676D76", -"/ c #5B606A", -"( c #22262B", -"_ c #282C32", -": c #282D32", -"< c #1F2429", -"[ c #545B62", -"} c #525760", -"| c #202429", -"1 c #282D34", -"2 c #202529", -"3 c #5C626B", -"4 c #272B32", -"5 c #22272C", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #303540", +"$ c #545862", +"% c #666A73", +"& c #5C5F68", +"* c #2E333F", +"= c #555A64", +"- c #525761", +"; c #5B5F69", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@#$%&&%$#@@@@@@@@", -"@@@@@@@*=-;;;;-=>@@@@@@@", -"@@@@@@*,;'''''')!>@@@@@@", -"@@@@@#=;'''''''')=~@@@@@", -"@@@@@$-'''{]^^/''-$@@@@@", -"@@@@@(_''{'{]^^'':%@@@@@", -"@@@@@<;'*[>'*}^'';|@@@@@", -"@@@@@|;'*^[>'*}''12@@@@@", -"@@@@@%_'*^^]{'{'':%@@@@@", -"@@@@@$-''3^^]{'''-4@@@@@", -"@@@@@#=)'''''''')2~@@@@@", -"@@@@@@>,)'''''')!>@@@@@@", -"@@@@@@@>=-:;;:-2>@@@@@@@", -"@@@@@@@@~$5<<54~@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@#$%%&@@@@@@@@@", +"@@@@@@@@@#@#$%%@@@@@@@@@", +"@@@@@@@@*=#@@-%@@@@@@@@@", +"@@@@@@@@*%=#@@-@@@@@@@@@", +"@@@@@@@@*%%$#@#@@@@@@@@@", +"@@@@@@@@@;%%$#@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/maximize-prelight.xpm b/common/xfwm4-dark/maximize-prelight.xpm index 1e592a8..840b6c9 100644 --- a/common/xfwm4-dark/maximize-prelight.xpm +++ b/common/xfwm4-dark/maximize-prelight.xpm @@ -1,71 +1,56 @@ /* XPM */ static char * maximize_prelight_xpm[] = { -"24 24 46 1", +"24 24 31 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", -"# c #313C48", -"$ c #406691", -"% c #4C81C1", -"& c #508FDA", -"* c #4B82C2", -"= c #406590", -"- c #3A5372", -"; c #4F8CD4", -"> c #416898", -", c #324459", -"' c #282E38", -") c #416998", -"! c #3A5371", -"~ c #4D88CF", -"{ c #2F3E54", -"] c #262A31", -"^ c #2F4054", -"/ c #323B49", -"( c #282D33", -"_ c #838A96", -": c #AFB8C5", -"< c #949BA6", -"[ c #416999", -"} c #406490", -"| c #4B82C3", -"1 c #304258", -"2 c #324359", -"3 c #282F3A", -"4 c #272B32", -"5 c #878E99", -"6 c #2A2E34", -"7 c #282C31", -"8 c #818691", -"9 c #508FD8", -"0 c #28313B", -"a c #4F8ED8", -"b c #959DA9", -"c c #40648E", -"d c #313B48", -"e c #395371", -"f c #32445A", -"g c #4B81C1", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", +"# c #2E333E", +"$ c #2A2E37", +"% c #262B34", +"& c #252932", +"* c #2A2E38", +"= c #2C303A", +"- c #262A34", +"; c #2F3641", +"> c #3D4250", +", c #424959", +"' c #282B35", +") c #3D4353", +"! c #444B5B", +"~ c #3D4252", +"{ c #474D5E", +"] c #9B9FA6", +"^ c #C4C7CC", +"/ c #ABAEB5", +"( c #262B33", +"_ c #3B4250", +": c #464D5D", +"< c #9EA2AB", +"[ c #484E5E", +"} c #454C5B", +"| c #979BA6", +"1 c #252933", +"2 c #ACAFB7", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@#$%&&*=#@@@@@@@@", -"@@@@@@@-;>,'',);!@@@@@@@", -"@@@@@@-~{]]]]]]^~!@@@@@@", -"@@@@@#;{]]]]]]]]^;/@@@@@", -"@@@@@$>]]](_::<]][}@@@@@", -"@@@@@|1]](](_::]]2*@@@@@", -"@@@@@&3]456]78:]]39@@@@@", -"@@@@@93]4:56]78]]0a@@@@@", -"@@@@@%1]4::_(](]]2*@@@@@", -"@@@@@=)]]b::_(]]][c@@@@@", -"@@@@@#;^]]]]]]]]^;d@@@@@", -"@@@@@@!~^]]]]]]^~e@@@@@@", -"@@@@@@@!;[233f[;e@@@@@@@", -"@@@@@@@@/}g&&gcd@@@@@@@@", +"@@@@@@@@#$%&&%*#@@@@@@@@", +"@@@@@@@=-;>,,>;-=@@@@@@@", +"@@@@@@=')!!!!!!~'=@@@@@@", +"@@@@@#-)!!!!!!!!~-#@@@@@", +"@@@@@$;!!!{]^^/!!;*@@@@@", +"@@@@@(_!!{!{]^^!!_%@@@@@", +"@@@@@&,!:<[!}|^!!,1@@@@@", +"@@@@@1,!:^<[!}|!!,1@@@@@", +"@@@@@%_!:^^]{!{!!_%@@@@@", +"@@@@@*;!!2^^]{!!!;*@@@@@", +"@@@@@#-~!!!!!!!!~%#@@@@@", +"@@@@@@='~!!!!!!~'=@@@@@@", +"@@@@@@@=-;_,,_;%=@@@@@@@", +"@@@@@@@@#*%&&%*#@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/menu-active.xpm b/common/xfwm4-dark/menu-active.xpm index 4c79ef4..47d7968 100644 --- a/common/xfwm4-dark/menu-active.xpm +++ b/common/xfwm4-dark/menu-active.xpm @@ -2,7 +2,7 @@ static char * menu_active_xpm[] = { "16 22 3 1", " c None", -". c #2F343B", +". c #2F343F", "+ c #A4AAB7", "................", "................", diff --git a/common/xfwm4-dark/menu-inactive.xpm b/common/xfwm4-dark/menu-inactive.xpm index 419d85a..3a4e8bf 100644 --- a/common/xfwm4-dark/menu-inactive.xpm +++ b/common/xfwm4-dark/menu-inactive.xpm @@ -2,7 +2,7 @@ static char * menu_inactive_xpm[] = { "16 22 3 1", " c None", -". c #2F343B", +". c #2F343F", "+ c #797D87", "................", "................", diff --git a/common/xfwm4-dark/menu-pressed.xpm b/common/xfwm4-dark/menu-pressed.xpm index d676c4b..2a297fb 100644 --- a/common/xfwm4-dark/menu-pressed.xpm +++ b/common/xfwm4-dark/menu-pressed.xpm @@ -2,7 +2,7 @@ static char * menu_pressed_xpm[] = { "16 22 3 1", " c None", -". c #2F343B", +". c #2F343F", "+ c #5294E2", "................", "................", diff --git a/common/xfwm4-dark/right-active.xpm b/common/xfwm4-dark/right-active.xpm index 123b2c5..6f08d57 100644 --- a/common/xfwm4-dark/right-active.xpm +++ b/common/xfwm4-dark/right-active.xpm @@ -2,7 +2,7 @@ static char * right_active_xpm[] = { "1 12 2 1", " c None", -". c #111215", +". c #21252B", ".", ".", ".", diff --git a/common/xfwm4-dark/right-inactive.xpm b/common/xfwm4-dark/right-inactive.xpm index ee0338d..86b8f45 100644 --- a/common/xfwm4-dark/right-inactive.xpm +++ b/common/xfwm4-dark/right-inactive.xpm @@ -2,7 +2,7 @@ static char * right_inactive_xpm[] = { "1 12 2 1", " c None", -". c #111215", +". c #21252B", ".", ".", ".", diff --git a/common/xfwm4-dark/shade-active.xpm b/common/xfwm4-dark/shade-active.xpm index aec634b..35243b3 100644 --- a/common/xfwm4-dark/shade-active.xpm +++ b/common/xfwm4-dark/shade-active.xpm @@ -2,7 +2,7 @@ static char * shade_active_xpm[] = { "16 22 3 1", " c None", -". c #2F343B", +". c #2F343F", "+ c #A4AAB7", "................", "................", diff --git a/common/xfwm4-dark/shade-inactive.xpm b/common/xfwm4-dark/shade-inactive.xpm index c199c04..3e099fd 100644 --- a/common/xfwm4-dark/shade-inactive.xpm +++ b/common/xfwm4-dark/shade-inactive.xpm @@ -2,7 +2,7 @@ static char * shade_inactive_xpm[] = { "16 22 3 1", " c None", -". c #2F343B", +". c #2F343F", "+ c #797D87", "................", "................", diff --git a/common/xfwm4-dark/shade-pressed.xpm b/common/xfwm4-dark/shade-pressed.xpm index 845f56f..56d8e49 100644 --- a/common/xfwm4-dark/shade-pressed.xpm +++ b/common/xfwm4-dark/shade-pressed.xpm @@ -2,7 +2,7 @@ static char * shade_pressed_xpm[] = { "16 22 3 1", " c None", -". c #2F343B", +". c #2F343F", "+ c #5294E2", "................", "................", diff --git a/common/xfwm4-dark/stick-active.xpm b/common/xfwm4-dark/stick-active.xpm index 96d5f02..cdea9f2 100644 --- a/common/xfwm4-dark/stick-active.xpm +++ b/common/xfwm4-dark/stick-active.xpm @@ -2,7 +2,7 @@ static char * stick_active_xpm[] = { "16 22 3 1", " c None", -". c #2F343B", +". c #2F343F", "+ c #A4AAB7", "................", "................", diff --git a/common/xfwm4-dark/stick-inactive.xpm b/common/xfwm4-dark/stick-inactive.xpm index b7e71a9..57fcc10 100644 --- a/common/xfwm4-dark/stick-inactive.xpm +++ b/common/xfwm4-dark/stick-inactive.xpm @@ -2,7 +2,7 @@ static char * stick_inactive_xpm[] = { "16 22 3 1", " c None", -". c #2F343B", +". c #2F343F", "+ c #797D87", "................", "................", diff --git a/common/xfwm4-dark/stick-pressed.xpm b/common/xfwm4-dark/stick-pressed.xpm index 0f311ab..c83dc82 100644 --- a/common/xfwm4-dark/stick-pressed.xpm +++ b/common/xfwm4-dark/stick-pressed.xpm @@ -2,7 +2,7 @@ static char * stick_pressed_xpm[] = { "16 22 3 1", " c None", -". c #2F343B", +". c #2F343F", "+ c #5294E2", "................", "................", diff --git a/common/xfwm4-dark/title-1-active-shaded.xpm b/common/xfwm4-dark/title-1-active-shaded.xpm index 57f3ffe..4285a1f 100644 --- a/common/xfwm4-dark/title-1-active-shaded.xpm +++ b/common/xfwm4-dark/title-1-active-shaded.xpm @@ -2,9 +2,9 @@ static char * title_1_active_shaded_xpm[] = { "24 24 4 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/title-1-active.xpm b/common/xfwm4-dark/title-1-active.xpm index 29a863c..22da8da 100644 --- a/common/xfwm4-dark/title-1-active.xpm +++ b/common/xfwm4-dark/title-1-active.xpm @@ -2,9 +2,9 @@ static char * title_1_active_xpm[] = { "24 24 4 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/title-1-inactive.xpm b/common/xfwm4-dark/title-1-inactive.xpm index c596666..8e30fbf 100644 --- a/common/xfwm4-dark/title-1-inactive.xpm +++ b/common/xfwm4-dark/title-1-inactive.xpm @@ -2,9 +2,9 @@ static char * title_1_inactive_xpm[] = { "24 24 4 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/title-2-active.xpm b/common/xfwm4-dark/title-2-active.xpm index b47656c..11878e7 100644 --- a/common/xfwm4-dark/title-2-active.xpm +++ b/common/xfwm4-dark/title-2-active.xpm @@ -2,9 +2,9 @@ static char * title_2_active_xpm[] = { "24 24 4 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/title-2-inactive.xpm b/common/xfwm4-dark/title-2-inactive.xpm index 994c9df..1d7694a 100644 --- a/common/xfwm4-dark/title-2-inactive.xpm +++ b/common/xfwm4-dark/title-2-inactive.xpm @@ -2,9 +2,9 @@ static char * title_2_inactive_xpm[] = { "24 24 4 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/title-3-active.xpm b/common/xfwm4-dark/title-3-active.xpm index 6636d55..ce86c3b 100644 --- a/common/xfwm4-dark/title-3-active.xpm +++ b/common/xfwm4-dark/title-3-active.xpm @@ -2,9 +2,9 @@ static char * title_3_active_xpm[] = { "24 24 4 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/title-3-inactive.xpm b/common/xfwm4-dark/title-3-inactive.xpm index 2ba62f1..0bb562c 100644 --- a/common/xfwm4-dark/title-3-inactive.xpm +++ b/common/xfwm4-dark/title-3-inactive.xpm @@ -2,9 +2,9 @@ static char * title_3_inactive_xpm[] = { "24 24 4 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/title-4-active.xpm b/common/xfwm4-dark/title-4-active.xpm index f166460..bc56ba8 100644 --- a/common/xfwm4-dark/title-4-active.xpm +++ b/common/xfwm4-dark/title-4-active.xpm @@ -2,9 +2,9 @@ static char * title_4_active_xpm[] = { "24 24 4 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/title-4-inactive.xpm b/common/xfwm4-dark/title-4-inactive.xpm index 4aac53c..499d6f3 100644 --- a/common/xfwm4-dark/title-4-inactive.xpm +++ b/common/xfwm4-dark/title-4-inactive.xpm @@ -2,9 +2,9 @@ static char * title_4_inactive_xpm[] = { "24 24 4 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/title-5-active.xpm b/common/xfwm4-dark/title-5-active.xpm index 6f0d325..210d06c 100644 --- a/common/xfwm4-dark/title-5-active.xpm +++ b/common/xfwm4-dark/title-5-active.xpm @@ -2,9 +2,9 @@ static char * title_5_active_xpm[] = { "24 24 4 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/title-5-inactive.xpm b/common/xfwm4-dark/title-5-inactive.xpm index 8be09f3..ec89d56 100644 --- a/common/xfwm4-dark/title-5-inactive.xpm +++ b/common/xfwm4-dark/title-5-inactive.xpm @@ -2,9 +2,9 @@ static char * title_5_inactive_xpm[] = { "24 24 4 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", "........................", "++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@", diff --git a/common/xfwm4-dark/top-left-active-shaded.xpm b/common/xfwm4-dark/top-left-active-shaded.xpm index 0580dcd..2208363 100644 --- a/common/xfwm4-dark/top-left-active-shaded.xpm +++ b/common/xfwm4-dark/top-left-active-shaded.xpm @@ -2,9 +2,9 @@ static char * top_left_active_shaded_xpm[] = { "5 24 4 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", " ....", ".++++", ".@@@@", diff --git a/common/xfwm4-dark/top-left-active.xpm b/common/xfwm4-dark/top-left-active.xpm index c80f1ba..3fd1897 100644 --- a/common/xfwm4-dark/top-left-active.xpm +++ b/common/xfwm4-dark/top-left-active.xpm @@ -2,9 +2,9 @@ static char * top_left_active_xpm[] = { "5 24 4 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", " ....", ".++++", ".@@@@", diff --git a/common/xfwm4-dark/top-left-inactive.xpm b/common/xfwm4-dark/top-left-inactive.xpm index 61397b7..78f4191 100644 --- a/common/xfwm4-dark/top-left-inactive.xpm +++ b/common/xfwm4-dark/top-left-inactive.xpm @@ -2,9 +2,9 @@ static char * top_left_inactive_xpm[] = { "5 24 4 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", " ....", ".++++", ".@@@@", diff --git a/common/xfwm4-dark/top-right-active-shaded.xpm b/common/xfwm4-dark/top-right-active-shaded.xpm index 47c1c24..23b0b0a 100644 --- a/common/xfwm4-dark/top-right-active-shaded.xpm +++ b/common/xfwm4-dark/top-right-active-shaded.xpm @@ -2,9 +2,9 @@ static char * top_right_active_shaded_xpm[] = { "5 24 4 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", ".... ", "++++.", "@@@@.", diff --git a/common/xfwm4-dark/top-right-active.xpm b/common/xfwm4-dark/top-right-active.xpm index 76421cd..0339c30 100644 --- a/common/xfwm4-dark/top-right-active.xpm +++ b/common/xfwm4-dark/top-right-active.xpm @@ -2,9 +2,9 @@ static char * top_right_active_xpm[] = { "5 24 4 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", ".... ", "++++.", "@@@@.", diff --git a/common/xfwm4-dark/top-right-inactive.xpm b/common/xfwm4-dark/top-right-inactive.xpm index d9ff024..abeee0f 100644 --- a/common/xfwm4-dark/top-right-inactive.xpm +++ b/common/xfwm4-dark/top-right-inactive.xpm @@ -2,9 +2,9 @@ static char * top_right_inactive_xpm[] = { "5 24 4 1", " c None", -". c #111215", -"+ c #353B44", -"@ c #2F343B", +". c #21252B", +"+ c #353B48", +"@ c #2F343F", ".... ", "++++.", "@@@@.", diff --git a/common/xfwm4/close-active.xpm b/common/xfwm4/close-active.xpm index 975bc1f..dd3161c 100644 --- a/common/xfwm4/close-active.xpm +++ b/common/xfwm4/close-active.xpm @@ -1,66 +1,64 @@ /* XPM */ static char * close_active_xpm[] = { -"24 24 41 1", +"24 24 39 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"@ c #E8DDE0", -"# c #EDA9AE", -"$ c #F0868C", -"% c #F3757B", -"& c #EDAAAF", -"* c #EBBFC3", -"= c #F2767B", -"- c #F37076", -"; c #EAC0C4", -"> c #F27076", -", c #F4787E", -"' c #F2767D", -") c #E7DDE1", -"! c #FFFCFC", -"~ c #FAC7C9", -"{ c #F37177", -"] c #FAC5C7", -"^ c #FFFEFE", -"/ c #F0868B", -"( c #F9B8BB", -"_ c #FFFFFF", -": c #FAC9CB", -"< c #F9BDC0", -"[ c #F2757B", -"} c #F9BBBE", -"| c #FABFC1", -"1 c #F37278", -"2 c #FBCACC", -"3 c #FBCFD1", -"4 c #FAC7CA", -"5 c #FAC8CA", -"6 c #FEF3F3", -"7 c #F9B4B7", -"8 c #EDABB0", -"9 c #F2777C", -"0 c #E7DEE1", -"a c #EAC1C5", -"b c #F0878C", +"@ c #E8DCDF", +"# c #EDA2A6", +"$ c #F1797F", +"% c #F3656C", +"& c #F17A80", +"* c #EDA1A7", +"= c #EBBABE", +"- c #F3666D", +"; c #F46067", +"> c #EABBBF", +", c #F36067", +"' c #F36E74", +") c #F36C73", +"! c #F3676E", +"~ c #E7DCDF", +"{ c #F7F7F8", +"] c #F4D3D6", +"^ c #F36269", +"/ c #F4D2D4", +"( c #EDA2A8", +"_ c #F4C4C8", +": c #F7F8F9", +"< c #F4D5D8", +"[ c #F4C9CD", +"} c #F4C8CB", +"| c #F3CBCE", +"1 c #F4D9DC", +"2 c #F3646B", +"3 c #F3C3C7", +"4 c #F6F2F3", +"5 c #F3BFC3", +"6 c #EDA3A8", +"7 c #F3686E", +"8 c #E7DDE0", +"9 c #EABCC0", +"0 c #F4656D", "........................", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", -"++++++++@#$%%$&@++++++++", -"+++++++*=------=;+++++++", -"++++++*>-------->;++++++", -"+++++@=--,----,--')+++++", -"+++++#---!~{{]^---&+++++", -"+++++/---(_::_<---$+++++", -"+++++[----}__|----=+++++", -"+++++=---12__31---'+++++", -"+++++$---4_((_5---$+++++", -"+++++&---67--76---8+++++", -"+++++@=----------90+++++", -"++++++;>-------->a++++++", -"+++++++;'------9a+++++++", -"++++++++)&b[[b80++++++++", +"++++++++@#$%%&*@++++++++", +"+++++++=-;;;;;;->+++++++", +"++++++=,;;;;;;;;,>++++++", +"+++++@-;;';;;;);;!~+++++", +"+++++#;;;{]^^/{;;;(+++++", +"+++++$;;;_:<<:[;;;&+++++", +"+++++-;;;;}::|;;;;-+++++", +"+++++-;;;^<::12;;;!+++++", +"+++++$;;;]:33:<;;;&+++++", +"+++++*;;;45;;54;;;6+++++", +"+++++@-;;;;;;;;;;78+++++", +"++++++>,;;;;;;;;,9++++++", +"+++++++>!;;;;;;79+++++++", +"++++++++~(&00&68++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", diff --git a/common/xfwm4/close-inactive.xpm b/common/xfwm4/close-inactive.xpm index 2928832..706c3ca 100644 --- a/common/xfwm4/close-inactive.xpm +++ b/common/xfwm4/close-inactive.xpm @@ -1,58 +1,59 @@ /* XPM */ static char * close_inactive_xpm[] = { -"24 24 33 1", +"24 24 34 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"@ c #E1E3E6", -"# c #DFE0E4", -"$ c #DDDEE3", -"% c #DEE0E4", -"& c #E3E4E8", -"* c #DCDEE3", -"= c #F0F1F2", -"- c #F5F5F7", -"; c #E8E8EB", -"> c #F0F1F3", -", c #F6F6F7", -"' c #F3F3F4", -") c #BBBFC9", -"! c #D2D5DB", -"~ c #D3D5DC", -"{ c #BBBEC8", -"] c #F1F1F3", -"^ c #D7D9DF", -"/ c #BABEC7", -"( c #D0D3D9", -"_ c #D2D4DB", -": c #D5D7DD", -"< c #F4F4F7", -"[ c #CDD1D8", -"} c #F5F5F6", -"| c #D7DADF", -"1 c #D0D4DB", -"2 c #BFC3CC", -"3 c #D9DADF", -"4 c #EFF0F2", +"@ c #E2E3E6", +"# c #CCCFD3", +"$ c #BFC1C8", +"% c #B8BBC1", +"& c #CDCFD4", +"* c #D6D8DC", +"= c #B8BBC2", +"- c #B5B8C0", +"; c #B5B8BE", +"> c #BBBDC3", +", c #BABCC3", +"' c #B8BAC1", +") c #E3E4E7", +"! c #DFE1E4", +"~ c #B6B9C0", +"{ c #BEC1C7", +"] c #DBDCDF", +"^ c #E1E2E6", +"/ c #DDDEE1", +"( c #DCDEE1", +"_ c #DEDEE2", +": c #E4E4E7", +"< c #B7BAC0", +"[ c #E1E1E6", +"} c #DADCDF", +"| c #ECECEE", +"1 c #CED0D5", +"2 c #B9BBC2", +"3 c #D7D8DC", +"4 c #BFC2C9", +"5 c #B7BBC1", "........................", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", -"+++++++++@#$$%@+++++++++", -"+++++++&*+=--=;*&+++++++", -"++++++&%>,,,,,,>%&++++++", -"++++++*>,',,,,',>*++++++", -"+++++@+,,)!,,~{,,+@+++++", -"+++++#],,^/(_/:,,>%+++++", -"+++++$<,,,^//:,,,<$+++++", -"+++++$<,,,(//[,,,}$+++++", -"+++++#],,!/||/1,,>%+++++", -"+++++@;,,23,,32,,+@+++++", -"++++++*>,,,,,,,,>*++++++", -"++++++&%>,,,,,,>%&++++++", -"+++++++&*+><<4+*&+++++++", -"+++++++++@%$$%@+++++++++", +"++++++++@#$%%$&@++++++++", +"+++++++*=------=*+++++++", +"++++++*;--------;*++++++", +"+++++@=-->----,--')+++++", +"+++++#---.!~~!.---&+++++", +"+++++{---].^^./---$+++++", +"+++++=----(.._----=+++++", +"+++++=---~^..:<---'+++++", +"+++++$---[.}}.^---$+++++", +"+++++&---|}--}|---1+++++", +"+++++@=----------2)+++++", +"++++++*;--------;3++++++", +"+++++++*'------23+++++++", +"++++++++)&45541)++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", diff --git a/common/xfwm4/close-prelight.xpm b/common/xfwm4/close-prelight.xpm index 75c171f..da9b649 100644 --- a/common/xfwm4/close-prelight.xpm +++ b/common/xfwm4/close-prelight.xpm @@ -1,65 +1,68 @@ /* XPM */ static char * close_prelight_xpm[] = { -"24 24 40 1", +"24 24 43 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"@ c #E8E1E4", -"# c #EFC0C4", -"$ c #F4AAAE", -"% c #F6A0A4", -"& c #F4ABAF", -"* c #EFC1C5", -"= c #ECCED2", -"- c #F79DA1", -"; c #EBCFD2", -"> c #F69DA1", -", c #F7A3A7", -"' c #F7A2A6", -") c #F6A1A5", -"! c #E7E1E4", -"~ c #FFFDFD", -"{ c #FCD9DA", -"] c #F79EA2", -"^ c #FCD7D9", -"/ c #FFFEFE", -"( c #F3AAAE", -"_ c #FBCFD1", -": c #FFFFFF", -"< c #FCDADC", -"[ c #FCDADB", -"} c #FBD2D3", -"| c #FBD0D2", -"1 c #FBD3D5", -"2 c #FCDEDF", -"3 c #F79FA2", -"4 c #FCD9DB", -"5 c #FBCED0", -"6 c #FEF7F7", -"7 c #FBCBCE", -"8 c #F6A1A6", -"9 c #E7E1E5", -"0 c #EBCFD3", -"a c #F4ABAE", +"@ c #E8DFE2", +"# c #EEB2B6", +"$ c #F39399", +"% c #F5848A", +"& c #EEB2B7", +"* c #ECC5C9", +"= c #F5858B", +"- c #F68086", +"; c #EBC5C9", +"> c #F58086", +", c #F68A91", +"' c #F58A8F", +") c #F4858B", +"! c #E7DFE2", +"~ c #F7F7F8", +"{ c #F4DADD", +"] c #F58186", +"^ c #F4D8DB", +"/ c #F39398", +"( c #F4CFD1", +"_ c #F7F8F9", +": c #F4DCDD", +"< c #F5DCDF", +"[ c #F5D3D5", +"} c #F4D1D4", +"| c #F4D4D7", +"1 c #F58288", +"2 c #F4DCDF", +"3 c #F4DFE1", +"4 c #F58388", +"5 c #F5DADD", +"6 c #F4CDD0", +"7 c #F5DCDD", +"8 c #F6F3F4", +"9 c #F4CCCE", +"0 c #EEB3B7", +"a c #F6868B", +"b c #E7DFE3", +"c c #EBC6CA", +"d c #F39499", "........................", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", -"++++++++@#$%%&*@++++++++", -"+++++++=%------%;+++++++", -"++++++=>-------->;++++++", -"+++++@%--,----'--)!+++++", -"+++++#---~{]]^/---*+++++", -"+++++(---_:<[:}---&+++++", -"+++++%----|::1----%+++++", -"+++++%---]<::23---)+++++", -"+++++$---4:55:4---&+++++", -"+++++*---67--76---*+++++", -"+++++@%----------89+++++", -"++++++;>-------->0++++++", -"+++++++;)------80+++++++", -"++++++++!*a%%a*9++++++++", +"++++++++@#$%%$&@++++++++", +"+++++++*=------=;+++++++", +"++++++*>-------->;++++++", +"+++++@=--,----'--)!+++++", +"+++++#---~{]]^~---&+++++", +"+++++/---(_:<_[---$+++++", +"+++++=----}__|----=+++++", +"+++++=---12__34---)+++++", +"+++++$---5_66_7---$+++++", +"+++++&---89--98---0+++++", +"+++++@=----------ab+++++", +"++++++;>-------->c++++++", +"+++++++;)------ac+++++++", +"++++++++!&d%%d0b++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", diff --git a/common/xfwm4/close-pressed.xpm b/common/xfwm4/close-pressed.xpm index 51b8843..5675773 100644 --- a/common/xfwm4/close-pressed.xpm +++ b/common/xfwm4/close-pressed.xpm @@ -1,48 +1,52 @@ /* XPM */ static char * close_pressed_xpm[] = { -"24 24 42 1", +"24 24 46 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"@ c #E8DADC", -"# c #EB9196", -"$ c #ED5F65", -"% c #EE474F", -"& c #ED6067", -"* c #EB9197", -"= c #EAAFB4", -"- c #EE4850", -"; c #EF4048", -"> c #E9B0B5", -", c #EE4048", -"' c #F04B53", -") c #F04A52", -"! c #E7D9DD", -"~ c #FFFBFB", -"{ c #F9B4B7", -"] c #EF4149", -"^ c #F8B1B4", -"/ c #FFFDFE", -"( c #EB9298", -"_ c #ED5E66", -": c #F7A1A5", -"< c #FFFFFF", -"[ c #F9B7BA", -"} c #F9B6B9", -"| c #F8A7AA", -"1 c #F7A4A8", -"2 c #F8A9AC", -"3 c #EF424A", -"4 c #F9B8BB", -"5 c #FABFC1", -"6 c #EF434B", -"7 c #F9B5B8", -"8 c #F7A0A4", -"9 c #FEEFEF", -"0 c #F79B9F", -"a c #EE4951", -"b c #E7DADE", -"c c #E9B2B6", +"@ c #E8D7DB", +"# c #EC888F", +"$ c #EF525A", +"% c #F03740", +"& c #EF535B", +"* c #EC898F", +"= c #EAAAAF", +"- c #F03942", +"; c #F13039", +"> c #E9ABB0", +", c #F03039", +"' c #F23C45", +") c #F23B44", +"! c #F03A42", +"~ c #E7D8DC", +"{ c #FFFBFB", +"] c #FAAEB1", +"^ c #F1323B", +"/ c #F9ABAE", +"( c #FFFDFD", +"_ c #EC8990", +": c #EF5158", +"< c #F8999D", +"[ c #FFFFFF", +"} c #FAB1B4", +"| c #FAB0B4", +"1 c #F99FA3", +"2 c #F03841", +"3 c #F89DA1", +"4 c #F9A2A6", +"5 c #FAB2B5", +"6 c #FAB9BC", +"7 c #F1333C", +"8 c #FAAFB2", +"9 c #F8989C", +"0 c #FAAFB3", +"a c #FEEDEE", +"b c #F89297", +"c c #EC8A90", +"d c #F03A43", +"e c #E7D9DC", +"f c #E9ACB1", +"g c #EF545B", "........................", "++++++++++++++++++++++++", "++++++++++++++++++++++++", @@ -51,17 +55,17 @@ static char * close_pressed_xpm[] = { "++++++++@#$%%&*@++++++++", "+++++++=-;;;;;;->+++++++", "++++++=,;;;;;;;;,>++++++", -"+++++@-;;';;;;);;-!+++++", -"+++++#;;;~{]]^/;;;(+++++", -"+++++_;;;:<[}<|;;;&+++++", -"+++++%;;;;1<<2;;;;-+++++", -"+++++-;;;34<<56;;;-+++++", -"+++++$;;;7<88<};;;&+++++", -"+++++*;;;90;;09;;;(+++++", -"+++++@-;;;;;;;;;;ab+++++", -"++++++>,;;;;;;;;,c++++++", -"+++++++>-;;;;;;ac+++++++", -"++++++++!(&%%&(b++++++++", +"+++++@-;;';;;;);;!~+++++", +"+++++#;;;{]^^/(;;;_+++++", +"+++++:;;;<[}|[1;;;&+++++", +"+++++2;;;;3[[4;;;;-+++++", +"+++++-;;;^5[[67;;;!+++++", +"+++++$;;;8[99[0;;;&+++++", +"+++++*;;;ab;;ba;;;c+++++", +"+++++@-;;;;;;;;;;de+++++", +"++++++>,;;;;;;;;,f++++++", +"+++++++>!;;;;;;df+++++++", +"++++++++~_g22gce++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", diff --git a/common/xfwm4/hide-active.xpm b/common/xfwm4/hide-active.xpm index a7aaf36..5907b58 100644 --- a/common/xfwm4/hide-active.xpm +++ b/common/xfwm4/hide-active.xpm @@ -1,46 +1,29 @@ /* XPM */ static char * hide_active_xpm[] = { -"24 24 21 1", +"24 24 4 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"@ c #E6E7EA", -"# c #DFE1E5", -"$ c #DBDCE1", -"% c #D9DBDF", -"& c #DADCE1", -"* c #E2E3E7", -"= c #D9DBE1", -"- c #E8E8EC", -"; c #F5F5F6", -"> c #FAFAFB", -", c #DCDDE2", -"' c #F5F6F6", -") c #FCFCFD", -"! c #E7E8EC", -"~ c #F5F5F7", -"{ c #FAFAFC", -"] c #A7ACB9", -"^ c #F3F4F6", +"@ c #90949E", "........................", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", -"++++++++@#$%%&#@++++++++", -"+++++++*=-;>>;-=*+++++++", -"++++++*,'))))))',*++++++", -"+++++@='))))))))'=@+++++", -"+++++#-))))))))))!#+++++", -"+++++$;))))))))))~&+++++", -"+++++%{))]]]]]])){%+++++", -"+++++%{))]]]]]])){%+++++", -"+++++$;))))))))))~&+++++", -"+++++#-))))))))))!#+++++", -"+++++@='))))))))'=@+++++", -"++++++*,'))))))',*++++++", -"+++++++*=!~{{^!=*+++++++", -"++++++++@#&%%&#@++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"+++++++++@@@@@@+++++++++", +"+++++++++@@@@@@+++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", diff --git a/common/xfwm4/hide-inactive.xpm b/common/xfwm4/hide-inactive.xpm index c815749..5c146d2 100644 --- a/common/xfwm4/hide-inactive.xpm +++ b/common/xfwm4/hide-inactive.xpm @@ -1,44 +1,29 @@ /* XPM */ static char * hide_inactive_xpm[] = { -"24 24 19 1", +"24 24 4 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"@ c #E1E3E6", -"# c #DFE0E4", -"$ c #DDDEE3", -"% c #DEE0E4", -"& c #E3E4E8", -"* c #DCDEE3", -"= c #F0F1F2", -"- c #F5F5F7", -"; c #E8E8EB", -"> c #F0F1F3", -", c #F6F6F7", -"' c #F1F1F3", -") c #F4F4F7", -"! c #BABEC7", -"~ c #F5F5F6", -"{ c #EFF0F2", +"@ c #B5B8C0", "........................", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", -"+++++++++@#$$%@+++++++++", -"+++++++&*+=--=;*&+++++++", -"++++++&%>,,,,,,>%&++++++", -"++++++*>,,,,,,,,>*++++++", -"+++++@+,,,,,,,,,,+@+++++", -"+++++#',,,,,,,,,,>%+++++", -"+++++$),,!!!!!!,,)$+++++", -"+++++$),,!!!!!!,,~$+++++", -"+++++#',,,,,,,,,,>%+++++", -"+++++@;,,,,,,,,,,+@+++++", -"++++++*>,,,,,,,,>*++++++", -"++++++&%>,,,,,,>%&++++++", -"+++++++&*+>)){+*&+++++++", -"+++++++++@%$$%@+++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"+++++++++@@@@@@+++++++++", +"+++++++++@@@@@@+++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", diff --git a/common/xfwm4/hide-prelight.xpm b/common/xfwm4/hide-prelight.xpm index 447d70a..215a039 100644 --- a/common/xfwm4/hide-prelight.xpm +++ b/common/xfwm4/hide-prelight.xpm @@ -1,62 +1,48 @@ /* XPM */ static char * hide_prelight_xpm[] = { -"24 24 37 1", +"24 24 23 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"@ c #DAE1E9", -"# c #99BDE6", -"$ c #6EA3E2", -"% c #5897E2", -"& c #6EA4E4", -"* c #9ABCE6", -"= c #B5CBE7", -"- c #5D9AE2", -"; c #96BBE9", -"> c #D4E2F4", -", c #F4F6FB", -"' c #95BBE8", -") c #B5CCE7", -"! c #629EE2", -"~ c #D9E6F5", -"{ c #FCFCFD", -"] c #D8E6F5", -"^ c #639DE2", -"/ c #DAE0EA", -"( c #94BBE8", -"_ c #9BBCE6", -": c #6DA3E3", -"< c #D3E1F4", -"[ c #5997E2", -"} c #747C90", -"| c #5998E1", -"1 c #F1F5FA", -"2 c #5998E2", -"3 c #9BBDE5", -"4 c #5E9AE2", -"5 c #DAE1EA", -"6 c #B6CDE8", -"7 c #D2E1F4", -"8 c #6FA4E3", +"@ c #E5E6E9", +"# c #DADCE1", +"$ c #D4D6DC", +"% c #D2D4DA", +"& c #DFE1E5", +"* c #D2D5DB", +"= c #E3E4E8", +"- c #F3F4F6", +"; c #FCFCFC", +"> c #E2E4E8", +", c #D5D7DD", +"' c #F5F6F6", +") c #FDFDFE", +"! c #DBDDE2", +"~ c #FBFCFC", +"{ c #7A7F8B", +"] c #FBFBFC", +"^ c #D1D4DA", +"/ c #E0E1E5", +"( c #F3F3F6", "........................", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", -"++++++++@#$%%&*@++++++++", -"+++++++=-;>,,>'-)+++++++", -"++++++=!~{{{{{{]^)++++++", -"+++++@-~{{{{{{{{]-/+++++", -"+++++#;{{{{{{{{{{(_+++++", -"+++++:>{{{{{{{{{{<&+++++", -"+++++[,{{}}}}}}{{,|+++++", -"+++++|,{{}}}}}}{{12+++++", -"+++++$>{{{{{{{{{{<&+++++", -"+++++*'{{{{{{{{{{(3+++++", -"+++++@-]{{{{{{{{]45+++++", -"++++++)!]{{{{{{]^6++++++", -"+++++++)-(<,,7(46+++++++", -"++++++++/_8[[835++++++++", +"++++++++@#$%%$#@++++++++", +"+++++++&*=-;;->*&+++++++", +"++++++&,'))))))',&++++++", +"+++++@*'))))))))'*@+++++", +"+++++#=))))))))))>!+++++", +"+++++$-))))))))))-$+++++", +"+++++%~)){{{{{{))~%+++++", +"+++++%~)){{{{{{))]^+++++", +"+++++$-))))))))))-$+++++", +"+++++#>))))))))))>!+++++", +"+++++@*'))))))))'*@+++++", +"++++++&,'))))))',/++++++", +"+++++++&*>-~~(>*/+++++++", +"++++++++@!$%%$!@++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", diff --git a/common/xfwm4/maximize-active.xpm b/common/xfwm4/maximize-active.xpm index 0c5e497..8f978fc 100644 --- a/common/xfwm4/maximize-active.xpm +++ b/common/xfwm4/maximize-active.xpm @@ -1,53 +1,38 @@ /* XPM */ static char * maximize_active_xpm[] = { -"24 24 28 1", +"24 24 13 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"@ c #E6E7EA", -"# c #DFE1E5", -"$ c #DBDCE1", -"% c #D9DBDF", -"& c #DADCE1", -"* c #E2E3E7", -"= c #D9DBE1", -"- c #E8E8EC", -"; c #F5F5F6", -"> c #FAFAFB", -", c #DCDDE2", -"' c #F5F6F6", -") c #FCFCFD", -"! c #C2C6CE", -"~ c #A7ACB9", -"{ c #B7BCC7", -"] c #E7E8EC", -"^ c #F5F5F7", -"/ c #FAFAFC", -"( c #C0C4CD", -"_ c #F9FAFB", -": c #FBFBFC", -"< c #C4C8D0", -"[ c #B7BBC6", -"} c #F3F4F6", +"@ c #E5E6E9", +"# c #ACAFB7", +"$ c #90949E", +"% c #A0A5AD", +"& c #E6E7EA", +"* c #A9ADB4", +"= c #E3E4E8", +"- c #E6E7EB", +"; c #ADB0B8", +"> c #A0A4AB", "........................", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", -"++++++++@#$%%&#@++++++++", -"+++++++*=-;>>;-=*+++++++", -"++++++*,'))))))',*++++++", -"+++++@='))))))))'=@+++++", -"+++++#-)))>!~~{))]#+++++", -"+++++$;))>)>!~~))^&+++++", -"+++++%/))(_):<~))/%+++++", -"+++++%/))~(_):<))/%+++++", -"+++++$;))~~!>)>))^&+++++", -"+++++#-))[~~!>)))]#+++++", -"+++++@='))))))))'=@+++++", -"++++++*,'))))))',*++++++", -"+++++++*=]^//}]=*+++++++", -"++++++++@#&%%&#@++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++@#$$%+++++++++", +"+++++++++@+@#$$+++++++++", +"++++++++&*=+-;$+++++++++", +"++++++++&$*=+-;+++++++++", +"++++++++&$$#@+@+++++++++", +"+++++++++>$$#@++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", diff --git a/common/xfwm4/maximize-inactive.xpm b/common/xfwm4/maximize-inactive.xpm index 54bab72..b067a66 100644 --- a/common/xfwm4/maximize-inactive.xpm +++ b/common/xfwm4/maximize-inactive.xpm @@ -1,50 +1,37 @@ /* XPM */ static char * maximize_inactive_xpm[] = { -"24 24 25 1", +"24 24 12 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"@ c #E1E3E6", -"# c #DFE0E4", -"$ c #DDDEE3", -"% c #DEE0E4", -"& c #E3E4E8", -"* c #DCDEE3", -"= c #F0F1F2", -"- c #F5F5F7", -"; c #E8E8EB", -"> c #F0F1F3", -", c #F6F6F7", -"' c #F4F5F6", -") c #CCD0D7", -"! c #BABEC7", -"~ c #C6CAD1", -"{ c #F1F1F3", -"] c #F4F4F7", -"^ c #CBCED5", -"/ c #CED2D8", -"( c #F5F5F6", -"_ c #C6C9D1", -": c #EFF0F2", +"@ c #E6E7EA", +"# c #C5C8CD", +"$ c #B5B8C0", +"% c #BFC2C9", +"& c #C4C7CC", +"* c #E5E6EA", +"= c #E6E7EB", +"- c #C6C8CE", +"; c #BEC1C7", "........................", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", -"+++++++++@#$$%@+++++++++", -"+++++++&*+=--=;*&+++++++", -"++++++&%>,,,,,,>%&++++++", -"++++++*>,,,,,,,,>*++++++", -"+++++@+,,,')!!~,,+@+++++", -"+++++#{,,',')!!,,>%+++++", -"+++++$],,^',,/!,,]$+++++", -"+++++$],,!^',,/,,($+++++", -"+++++#{,,!!)',',,>%+++++", -"+++++@;,,_!!)',,,+@+++++", -"++++++*>,,,,,,,,>*++++++", -"++++++&%>,,,,,,>%&++++++", -"+++++++&*+>]]:+*&+++++++", -"+++++++++@%$$%@+++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++@#$$%+++++++++", +"+++++++++@+@#$$+++++++++", +"++++++++@&*+=-$+++++++++", +"++++++++@$&*+=-+++++++++", +"++++++++@$$#@+@+++++++++", +"+++++++++;$$#@++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", +"++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", diff --git a/common/xfwm4/maximize-prelight.xpm b/common/xfwm4/maximize-prelight.xpm index 354c8b6..0b69086 100644 --- a/common/xfwm4/maximize-prelight.xpm +++ b/common/xfwm4/maximize-prelight.xpm @@ -1,70 +1,56 @@ /* XPM */ static char * maximize_prelight_xpm[] = { -"24 24 45 1", +"24 24 31 1", " c None", ". c #EEEFF1", "+ c #E7E8EB", -"@ c #DAE1E9", -"# c #99BDE6", -"$ c #6EA3E2", -"% c #5897E2", -"& c #6EA4E4", -"* c #9ABCE6", -"= c #B5CBE7", -"- c #5D9AE2", -"; c #96BBE9", -"> c #D4E2F4", -", c #F4F6FB", -"' c #95BBE8", -") c #B5CCE7", -"! c #629EE2", -"~ c #D9E6F5", -"{ c #FCFCFD", -"] c #D8E6F5", -"^ c #639DE2", -"/ c #DAE0EA", -"( c #FAFAFB", -"_ c #A1A5B4", -": c #747C90", -"< c #8F96A6", -"[ c #94BBE8", -"} c #9BBCE6", -"| c #6DA3E3", -"1 c #D3E1F4", -"2 c #5997E2", -"3 c #FBFBFC", -"4 c #9CA3AF", -"5 c #F9F9F9", -"6 c #A3A9B5", -"7 c #5998E1", -"8 c #F1F5FA", -"9 c #5998E2", -"0 c #8E95A5", -"a c #9BBDE5", -"b c #5E9AE2", -"c c #DAE1EA", -"d c #B6CDE8", -"e c #D2E1F4", -"f c #6FA4E3", +"@ c #E5E6E9", +"# c #DADCE1", +"$ c #D4D6DC", +"% c #D2D4DA", +"& c #DFE1E5", +"* c #D2D5DB", +"= c #E3E4E8", +"- c #F3F4F6", +"; c #FCFCFC", +"> c #E2E4E8", +", c #D5D7DD", +"' c #F5F6F6", +") c #FDFDFE", +"! c #FBFBFC", +"~ c #A5A8AF", +"{ c #7A7F8B", +"] c #9397A1", +"^ c #DBDDE2", +"/ c #FBFCFC", +"( c #FCFCFD", +"_ c #A1A5AC", +": c #FAFAFB", +"< c #FBFCFD", +"[ c #A8AAB2", +"} c #D1D4DA", +"| c #92969F", +"1 c #E0E1E5", +"2 c #F3F3F6", "........................", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", -"++++++++@#$%%&*@++++++++", -"+++++++=-;>,,>'-)+++++++", -"++++++=!~{{{{{{]^)++++++", -"+++++@-~{{{{{{{{]-/+++++", -"+++++#;{{{(_::<{{[}+++++", -"+++++|>{{({(_::{{1&+++++", -"+++++2,{345{36:{{,7+++++", -"+++++7,{3:45{36{{89+++++", -"+++++$>{3::_({({{1&+++++", -"+++++*'{{0::_({{{[a+++++", -"+++++@-]{{{{{{{{]bc+++++", -"++++++)!]{{{{{{]^d++++++", -"+++++++)-[1,,e[bd+++++++", -"++++++++/}f22fac++++++++", +"++++++++@#$%%$#@++++++++", +"+++++++&*=-;;->*&+++++++", +"++++++&,'))))))',&++++++", +"+++++@*'))))))))'*@+++++", +"+++++#=)))!~{{]))>^+++++", +"+++++$-))!)!~{{))-$+++++", +"+++++%/)(_:)<[{))/%+++++", +"+++++%/)({_:)<[))!}+++++", +"+++++$-)({{~!)!))-$+++++", +"+++++#>))|{{~!)))>^+++++", +"+++++@*'))))))))'*@+++++", +"++++++&,'))))))',1++++++", +"+++++++&*>-//2>*1+++++++", +"++++++++@^$%%$^@++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", "++++++++++++++++++++++++", diff --git a/extra/Arc-Plank/dock.theme b/extra/Arc-Plank/dock.theme index dd13b0e..4c77c81 100644 --- a/extra/Arc-Plank/dock.theme +++ b/extra/Arc-Plank/dock.theme @@ -10,13 +10,13 @@ BottomRoundness=0 #The thickness (in pixels) of lines drawn. LineWidth=1 #The color (RGBA) of the outer stroke. -OuterStrokeColor=16;;17;;20;;255 +OuterStrokeColor=22;;26;;38;;255 #The starting color (RGBA) of the fill gradient. -FillStartColor=37;;39;;45;;222 +FillStartColor=53;;57;;69;;242 #The ending color (RGBA) of the fill gradient. -FillEndColor=37;;39;;45;;222 +FillEndColor=53;;57;;69;;242 #The color (RGBA) of the inner stroke. -InnerStrokeColor=37;;39;;45;;0 +InnerStrokeColor=53;;57;;69;;0 [PlankDrawingDockTheme] #The padding on the left/right dock edges, in tenths of a percent of IconSize. diff --git a/extra/Chrome/arc-darker-theme.crx b/extra/Chrome/arc-darker-theme.crx index e8e939c..c2ba9e0 100644 Binary files a/extra/Chrome/arc-darker-theme.crx and b/extra/Chrome/arc-darker-theme.crx differ diff --git a/extra/Chrome/arc-darker-theme/images/theme_frame.png b/extra/Chrome/arc-darker-theme/images/theme_frame.png index 69fc3d1..8368110 100644 Binary files a/extra/Chrome/arc-darker-theme/images/theme_frame.png and b/extra/Chrome/arc-darker-theme/images/theme_frame.png differ diff --git a/extra/Chrome/arc-darker-theme/images/theme_frame_inactive.png b/extra/Chrome/arc-darker-theme/images/theme_frame_inactive.png index c174735..5e47c88 100644 Binary files a/extra/Chrome/arc-darker-theme/images/theme_frame_inactive.png and b/extra/Chrome/arc-darker-theme/images/theme_frame_inactive.png differ -- cgit v1.2.3 From 86cfa12fc487818e505bbd2d33d1306f8795e134 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 11 Sep 2015 16:49:52 +0200 Subject: darken window-frame a bit --- 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/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/sass/_common.scss | 4 ++-- 10 files changed, 20 insertions(+), 20 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 bde4cd5..59e9bef 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -2364,11 +2364,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.35); + box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.35); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } + box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { 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 c39202e..61d7ec7 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -2364,11 +2364,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.2); + box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.2); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } + box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { 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 0bfa4ce..29c65f7 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 @@ -2364,11 +2364,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px #22262d, 0 8px 8px 0 rgba(0, 0, 0, 0.35); + box-shadow: 0 0 0 1px #20232b, 0 8px 8px 0 rgba(0, 0, 0, 0.35); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } + box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { 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 c6114a2..2f16442 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 @@ -2364,11 +2364,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px #22262d, 0 8px 8px 0 rgba(0, 0, 0, 0.2); + box-shadow: 0 0 0 1px #20232b, 0 8px 8px 0 rgba(0, 0, 0, 0.2); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } + box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index 576eb9d..a03fe63 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -2624,14 +2624,14 @@ GtkVolumeButton.button { padding: 8px; } // see bug #722563 $_wm_border: if($variant=='light', transparentize(black, 0.9), transparentize(black, 0.45)); - box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', darken($header_bg, 6%), $_wm_border), + box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), $_wm_border), 0 8px 8px 0 if($variant == 'light', opacify($_wm_border, 0.1), transparentize($_wm_border, 0.2)); /* this is used for the resize cursor area */ margin: 10px; &:backdrop { - box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', transparentize(darken($header_bg, 6%), 0.1), $_wm_border), + box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', transparentize(darken($header_bg, 7%), 0.1), $_wm_border), 0 5px 5px 0 if($variant == 'light', opacify($_wm_border, 0.1), transparentize($_wm_border, 0.2)); } &.tiled { 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 cd560eb..ef496ff 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -2442,11 +2442,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.35); + box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.35); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } + box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } .window-frame.ssd { 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 7350ce8..16018ab 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -2442,11 +2442,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.2); + box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.2); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } + box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } .window-frame.ssd { 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 e05a091..1fcf21d 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 @@ -2442,11 +2442,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px #22262d, 0 8px 8px 0 rgba(0, 0, 0, 0.35); + box-shadow: 0 0 0 1px #20232b, 0 8px 8px 0 rgba(0, 0, 0, 0.35); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } + box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } .window-frame.ssd { 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 5e82c4d..2e07f45 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 @@ -2442,11 +2442,11 @@ GtkVolumeButton.button { .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; - box-shadow: 0 0 0 1px #22262d, 0 8px 8px 0 rgba(0, 0, 0, 0.2); + box-shadow: 0 0 0 1px #20232b, 0 8px 8px 0 rgba(0, 0, 0, 0.2); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 0 0 1px rgba(34, 38, 45, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } + box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } .window-frame.ssd { diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index ff24b4a..c92eec6 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -2753,14 +2753,14 @@ GtkVolumeButton.button { padding: 8px; } // see bug #722563 $_wm_border: if($variant=='light', transparentize(black, 0.9), transparentize(black, 0.45)); - box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', darken($header_bg, 6%), $_wm_border), + box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), $_wm_border), 0 8px 8px 0 if($variant == 'light', opacify($_wm_border, 0.1), transparentize($_wm_border, 0.2)); /* this is used for the resize cursor area */ margin: 10px; &:backdrop { - box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', transparentize(darken($header_bg, 6%), 0.1), $_wm_border), + box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', transparentize(darken($header_bg, 7%), 0.1), $_wm_border), 0 5px 5px 0 if($variant == 'light', opacify($_wm_border, 0.1), transparentize($_wm_border, 0.2)); } &.tiled { -- cgit v1.2.3 From bfb5522a14aa11878fa5ece17d0a847727507133 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 11 Sep 2015 17:03:25 +0200 Subject: close button tweaks --- common/gtk-3.0/3.14/assets.svg | 20 ++++++++++---------- .../3.14/assets/titlebutton-close-backdrop.png | Bin 591 -> 603 bytes .../3.14/assets/titlebutton-close-backdrop@2.png | Bin 1129 -> 1130 bytes .../gtk-3.0/3.14/assets/titlebutton-close-hover.png | Bin 543 -> 540 bytes .../3.14/assets/titlebutton-close-hover@2.png | Bin 1048 -> 1061 bytes common/gtk-3.0/3.14/assets/titlebutton-close.png | Bin 554 -> 565 bytes common/gtk-3.0/3.14/assets/titlebutton-close@2.png | Bin 1081 -> 1081 bytes common/gtk-3.0/3.16/assets.svg | 20 ++++++++++---------- .../3.16/assets/titlebutton-close-backdrop.png | Bin 591 -> 603 bytes .../3.16/assets/titlebutton-close-backdrop@2.png | Bin 1129 -> 1130 bytes .../gtk-3.0/3.16/assets/titlebutton-close-hover.png | Bin 543 -> 540 bytes .../3.16/assets/titlebutton-close-hover@2.png | Bin 1048 -> 1061 bytes common/gtk-3.0/3.16/assets/titlebutton-close.png | Bin 554 -> 565 bytes common/gtk-3.0/3.16/assets/titlebutton-close@2.png | Bin 1081 -> 1081 bytes common/unity/window-buttons/close.svg | 16 ++++++++-------- common/unity/window-buttons/close_prelight.svg | 16 ++++++++-------- common/unity/window-buttons/close_unfocused.svg | 16 ++++++++-------- 17 files changed, 44 insertions(+), 44 deletions(-) diff --git a/common/gtk-3.0/3.14/assets.svg b/common/gtk-3.0/3.14/assets.svg index 126a618..b1ca40c 100644 --- a/common/gtk-3.0/3.14/assets.svg +++ b/common/gtk-3.0/3.14/assets.svg @@ -24,17 +24,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="394.75543" - inkscape:cy="181.91127" + inkscape:zoom="8" + inkscape:cx="176.38504" + inkscape:cy="151.27384" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" showborder="false" - inkscape:window-width="1366" - inkscape:window-height="720" - inkscape:window-x="0" - inkscape:window-y="25" + inkscape:window-width="1259" + inkscape:window-height="630" + inkscape:window-x="65" + inkscape:window-y="24" inkscape:window-maximized="1" inkscape:snap-nodes="true" inkscape:snap-bbox="true" @@ -2649,7 +2649,7 @@ inkscape:connector-curvature="0" d="m 650.00003,-180.71594 0.75,0 c 0.008,-9e-5 0.0156,-3.5e-4 0.0234,0 0.19122,0.008 0.3824,0.0964 0.51563,0.23437 l 1.71093,1.71094 1.73438,-1.71094 c 0.19922,-0.17287 0.335,-0.22912 0.51562,-0.23437 l 0.75,0 0,0.75 c 0,0.21485 -0.0257,0.41298 -0.1875,0.5625 l -1.71093,1.71093 1.6875,1.6875 c 0.14114,0.14113 0.21093,0.34009 0.21093,0.53907 l 0,0.75 -0.75,0 c -0.19897,-1e-5 -0.39793,-0.0698 -0.53906,-0.21094 l -1.71094,-1.71094 -1.71093,1.71094 c -0.14113,0.14114 -0.3401,0.21094 -0.53907,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.0698,-0.39794 0.21094,-0.53907 l 1.71094,-1.6875 -1.71094,-1.71093 c -0.15805,-0.14598 -0.22737,-0.35194 -0.21094,-0.5625 l 0,-0.75 z" id="path10839-9-2-2-7-9-7" - style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:0.70588235;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f8f8f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f8f8f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f8f8f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f8f8f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f8f8f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f8f8f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> image/svg+xml - + @@ -213,7 +213,7 @@ inkscape:connector-curvature="0" d="m 650.00003,-180.71594 0.75,0 c 0.008,-9e-5 0.0156,-3.5e-4 0.0234,0 0.19122,0.008 0.3824,0.0964 0.51563,0.23437 l 1.71093,1.71094 1.73438,-1.71094 c 0.19922,-0.17287 0.335,-0.22912 0.51562,-0.23437 l 0.75,0 0,0.75 c 0,0.21485 -0.0257,0.41298 -0.1875,0.5625 l -1.71093,1.71093 1.6875,1.6875 c 0.14114,0.14113 0.21093,0.34009 0.21093,0.53907 l 0,0.75 -0.75,0 c -0.19897,-1e-5 -0.39793,-0.0698 -0.53906,-0.21094 l -1.71094,-1.71094 -1.71093,1.71094 c -0.14113,0.14114 -0.3401,0.21094 -0.53907,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.0698,-0.39794 0.21094,-0.53907 l 1.71094,-1.6875 -1.71094,-1.71093 c -0.15805,-0.14598 -0.22737,-0.35194 -0.21094,-0.5625 l 0,-0.75 z" id="path10839-9-2-2-7-9-7" - style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:0.70588235;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f8f8f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> diff --git a/common/unity/window-buttons/close_prelight.svg b/common/unity/window-buttons/close_prelight.svg index 6f2670e..dae52d6 100644 --- a/common/unity/window-buttons/close_prelight.svg +++ b/common/unity/window-buttons/close_prelight.svg @@ -82,17 +82,17 @@ inkscape:pageopacity="1" inkscape:pageshadow="2" inkscape:zoom="22.627418" - inkscape:cx="12.382889" - inkscape:cy="11.054563" + inkscape:cx="5.6211807" + inkscape:cy="10.966175" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" showguides="true" inkscape:guide-bbox="true" - inkscape:window-width="1366" - inkscape:window-height="721" - inkscape:window-x="0" - inkscape:window-y="25" + inkscape:window-width="1259" + inkscape:window-height="630" + inkscape:window-x="65" + inkscape:window-y="24" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:snap-global="true" @@ -124,7 +124,7 @@ image/svg+xml - + @@ -213,7 +213,7 @@ inkscape:connector-curvature="0" d="m 547.00004,-180.71594 0.75,0 c 0.008,-9e-5 0.0156,-3.5e-4 0.0234,0 0.19122,0.008 0.3824,0.0964 0.51563,0.23437 l 1.71093,1.71094 1.73438,-1.71094 c 0.19922,-0.17287 0.335,-0.22912 0.51562,-0.23437 l 0.75,0 0,0.75 c 0,0.21485 -0.0257,0.41298 -0.1875,0.5625 l -1.71093,1.71093 1.6875,1.6875 c 0.14114,0.14113 0.21093,0.34009 0.21093,0.53907 l 0,0.75 -0.75,0 c -0.19897,-1e-5 -0.39793,-0.0698 -0.53906,-0.21094 L 550,-176.63782 l -1.71093,1.71094 c -0.14113,0.14114 -0.3401,0.21094 -0.53907,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.0698,-0.39794 0.21094,-0.53907 l 1.71094,-1.6875 -1.71094,-1.71093 c -0.15805,-0.14598 -0.22737,-0.35194 -0.21094,-0.5625 l 0,-0.75 z" id="path10839-9-2-2-7-9-7-4-9" - style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:0.70588235;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f8f8f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> diff --git a/common/unity/window-buttons/close_unfocused.svg b/common/unity/window-buttons/close_unfocused.svg index aca7fa1..1d493e6 100644 --- a/common/unity/window-buttons/close_unfocused.svg +++ b/common/unity/window-buttons/close_unfocused.svg @@ -82,17 +82,17 @@ inkscape:pageopacity="1" inkscape:pageshadow="2" inkscape:zoom="22.627418" - inkscape:cx="12.382889" - inkscape:cy="11.054563" + inkscape:cx="5.6211807" + inkscape:cy="10.966175" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" showguides="true" inkscape:guide-bbox="true" - inkscape:window-width="1366" - inkscape:window-height="721" - inkscape:window-x="0" - inkscape:window-y="25" + inkscape:window-width="1259" + inkscape:window-height="630" + inkscape:window-x="65" + inkscape:window-y="24" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:snap-global="true" @@ -124,7 +124,7 @@ image/svg+xml - + @@ -213,7 +213,7 @@ inkscape:connector-curvature="0" d="m 650.00004,-180.71594 0.75,0 c 0.008,-9e-5 0.0156,-3.5e-4 0.0234,0 0.19122,0.008 0.3824,0.0964 0.51563,0.23437 l 1.71093,1.71094 1.73438,-1.71094 c 0.19922,-0.17287 0.335,-0.22912 0.51562,-0.23437 l 0.75,0 0,0.75 c 0,0.21485 -0.0257,0.41298 -0.1875,0.5625 l -1.71093,1.71093 1.6875,1.6875 c 0.14114,0.14113 0.21093,0.34009 0.21093,0.53907 l 0,0.75 -0.75,0 c -0.19897,-1e-5 -0.39793,-0.0698 -0.53906,-0.21094 L 653,-176.63782 l -1.71093,1.71094 c -0.14113,0.14114 -0.3401,0.21094 -0.53907,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.0698,-0.39794 0.21094,-0.53907 l 1.71094,-1.6875 -1.71094,-1.71093 c -0.15805,-0.14598 -0.22737,-0.35194 -0.21094,-0.5625 l 0,-0.75 z" id="path10839-9-2-2-7-9-7-4" - style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:0.70588235;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f8f8f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> -- cgit v1.2.3 From 0396308d9d49c565a99f687bfb71c6832a216800 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 11 Sep 2015 17:12:52 +0200 Subject: make unity panel backdrop color readable --- common/gtk-3.0/3.14/gtk-contained-dark.css | 3 +++ common/gtk-3.0/3.14/gtk-contained-darker.css | 3 +++ common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 3 +++ common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 3 +++ common/gtk-3.0/3.14/gtk-contained-solid.css | 3 +++ common/gtk-3.0/3.14/gtk-contained.css | 3 +++ common/gtk-3.0/3.14/sass/_unity.scss | 2 ++ common/gtk-3.0/3.16/gtk-contained-dark.css | 3 +++ common/gtk-3.0/3.16/gtk-contained-darker.css | 3 +++ common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 3 +++ common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 3 +++ common/gtk-3.0/3.16/gtk-contained-solid.css | 3 +++ common/gtk-3.0/3.16/gtk-contained.css | 3 +++ common/gtk-3.0/3.16/sass/_unity.scss | 2 ++ 14 files changed, 40 insertions(+) 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 59e9bef..c9d01a8 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -3319,6 +3319,9 @@ UnityPanelWidget, background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } + UnityPanelWidget:backdrop, + .unity-panel:backdrop { + color: #bdc6d1; } .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { 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 61d7ec7..f3852bd 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -3319,6 +3319,9 @@ UnityPanelWidget, background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } + UnityPanelWidget:backdrop, + .unity-panel:backdrop { + color: #bdc6d1; } .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { 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 29c65f7..ce47778 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 @@ -3319,6 +3319,9 @@ UnityPanelWidget, background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } + UnityPanelWidget:backdrop, + .unity-panel:backdrop { + color: #bdc6d1; } .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { 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 2f16442..3470145 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 @@ -3319,6 +3319,9 @@ UnityPanelWidget, background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } + UnityPanelWidget:backdrop, + .unity-panel:backdrop { + color: #bdc6d1; } .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { 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 48870e6..c93e5bd 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -3319,6 +3319,9 @@ UnityPanelWidget, background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } + UnityPanelWidget:backdrop, + .unity-panel:backdrop { + color: #bdc6d1; } .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index c9a2b74..78a2e91 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -3319,6 +3319,9 @@ UnityPanelWidget, background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } + UnityPanelWidget:backdrop, + .unity-panel:backdrop { + color: #bdc6d1; } .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { diff --git a/common/gtk-3.0/3.14/sass/_unity.scss b/common/gtk-3.0/3.14/sass/_unity.scss index d88377a..c0b9060 100644 --- a/common/gtk-3.0/3.14/sass/_unity.scss +++ b/common/gtk-3.0/3.14/sass/_unity.scss @@ -46,6 +46,8 @@ UnityPanelWidget, background-image: linear-gradient(to bottom, opacify($panel_bg, 1)); color: lighten($panel_fg, 20%); box-shadow: none; + + &:backdrop { color: lighten($panel_fg, 1%); } } .unity-panel.menubar.menuitem:hover, 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 ef496ff..2b04430 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -3275,6 +3275,9 @@ UnityPanelWidget, background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } + UnityPanelWidget:backdrop, + .unity-panel:backdrop { + color: #abb6c5; } .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { 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 16018ab..890275e 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -3275,6 +3275,9 @@ UnityPanelWidget, background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } + UnityPanelWidget:backdrop, + .unity-panel:backdrop { + color: #abb6c5; } .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { 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 1fcf21d..c4e16cb 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 @@ -3275,6 +3275,9 @@ UnityPanelWidget, background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } + UnityPanelWidget:backdrop, + .unity-panel:backdrop { + color: #abb6c5; } .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { 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 2e07f45..6a648aa 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 @@ -3275,6 +3275,9 @@ UnityPanelWidget, background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } + UnityPanelWidget:backdrop, + .unity-panel:backdrop { + color: #abb6c5; } .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { 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 5f07578..824024f 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -3275,6 +3275,9 @@ UnityPanelWidget, background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } + UnityPanelWidget:backdrop, + .unity-panel:backdrop { + color: #abb6c5; } .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index f96b988..3d8150f 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -3275,6 +3275,9 @@ UnityPanelWidget, background-image: linear-gradient(to bottom, #2b2e37); color: #f6f7f9; box-shadow: none; } + UnityPanelWidget:backdrop, + .unity-panel:backdrop { + color: #abb6c5; } .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { diff --git a/common/gtk-3.0/3.16/sass/_unity.scss b/common/gtk-3.0/3.16/sass/_unity.scss index d88377a..89439d2 100644 --- a/common/gtk-3.0/3.16/sass/_unity.scss +++ b/common/gtk-3.0/3.16/sass/_unity.scss @@ -46,6 +46,8 @@ UnityPanelWidget, background-image: linear-gradient(to bottom, opacify($panel_bg, 1)); color: lighten($panel_fg, 20%); box-shadow: none; + + &:backdrop { color: darken($panel_fg, 5%); } } .unity-panel.menubar.menuitem:hover, -- cgit v1.2.3 From 1d8d918f58a1cbe1f251ac26647370f330acb775 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 11 Sep 2015 17:47:13 +0200 Subject: some gnome-shell fixes --- common/gnome-shell/3.14/gnome-shell.css | 42 ++++++++++++++++++++++-------- common/gnome-shell/3.14/sass/_common.scss | 22 ++++++++++++++++ common/gnome-shell/3.14/sass/_drawing.scss | 6 ++--- 3 files changed, 56 insertions(+), 14 deletions(-) diff --git a/common/gnome-shell/3.14/gnome-shell.css b/common/gnome-shell/3.14/gnome-shell.css index 467c822..fb4b7bb 100644 --- a/common/gnome-shell/3.14/gnome-shell.css +++ b/common/gnome-shell/3.14/gnome-shell.css @@ -31,6 +31,13 @@ stage { font-size: 1em; font-weight: normal; } +.app-well-app.running > .overview-icon, .app-well-app.running:hover > .overview-icon, .app-well-app.running:active > .overview-icon, +.app-well-app.running:checked > .overview-icon { + background-color: transparent !important; + background-gradient-direction: none !important; + border: none !important; + border-radius: 0 !important; } + .popup-menu .modal-dialog-button { font-size: 1em; min-height: 20px; @@ -91,7 +98,7 @@ stage { border-radius: 2px; text-shadow: 0 1px rgba(255, 255, 255, 0); color: #BAC3CF; - border: 1px solid rgba(26, 28, 34, 0.35); + border: 1px solid rgba(0, 0, 0, 0.35); background-color: rgba(102, 109, 132, 0.35); } .candidate-page-button:hover, .hotplug-notification-item:hover, @@ -99,7 +106,7 @@ stage { .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); color: #BAC3CF; - border: 1px solid rgba(26, 28, 34, 0.35); + border: 1px solid rgba(0, 0, 0, 0.35); background-color: rgba(119, 127, 151, 0.45); } .candidate-page-button:focus, .hotplug-notification-item:focus, @@ -120,7 +127,7 @@ stage { .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); color: #5d626e; - border: 1px solid rgba(26, 28, 34, 0.35); + border: 1px solid rgba(0, 0, 0, 0.35); background-color: rgba(102, 109, 132, 0.2); } StEntry { @@ -1272,16 +1279,17 @@ StScrollBar { background-gradient-direction: none; text-shadow: 0 1px rgba(255, 255, 255, 0); color: #BAC3CF; - border: 1px solid rgba(26, 28, 34, 0.35); + border: 1px solid rgba(0, 0, 0, 0.35); background-color: rgba(102, 109, 132, 0.35); } .app-view-control:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #BAC3CF; - border: 1px solid rgba(26, 28, 34, 0.35); + border: 1px solid rgba(0, 0, 0, 0.35); background-color: rgba(119, 127, 151, 0.45); } .app-view-control:checked { color: #ffffff; - background-color: #5294E2; } + background-color: #5294E2; + border-color: #5294E2; } .app-view-control:first-child:ltr, .app-view-control:last-child:rtl { border-radius: 2px 0 0 2px; @@ -1326,6 +1334,18 @@ StScrollBar { border-image: none; background-image: none; } +.app-well-app.running > .overview-icon { + background: none !important; + text-shadow: black 0px 0px; + border-image: url("common-assets/dash/button-running-bottom.svg") 5 5 5 5; } + +.app-well-app.running:hover > .overview-icon { + border-image: url("common-assets/dash/button-running-hover-bottom.svg") 5 5 5 5; } + +.app-well-app.running:active > .overview-icon, +.app-well-app.running:checked > .overview-icon { + border-image: url("common-assets/dash/button-running-active-bottom.svg") 5 5 5 5; } + .search-provider-icon, .list-search-result, .app-well-app .overview-icon, .app-well-app.app-folder .overview-icon, @@ -1490,12 +1510,12 @@ StScrollBar { .summary-source-button .summary-source { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #BAC3CF; - border: 1px solid rgba(26, 28, 34, 0.35); + border: 1px solid rgba(0, 0, 0, 0.35); background-color: rgba(102, 109, 132, 0.35); } .summary-source-button:hover .summary-source { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #BAC3CF; - border: 1px solid rgba(26, 28, 34, 0.35); + border: 1px solid rgba(0, 0, 0, 0.35); background-color: rgba(119, 127, 151, 0.45); } .summary-source-button:focus .summary-source, .summary-source-button:selected .summary-source { @@ -1683,12 +1703,12 @@ StEntry.chat-response { background-gradient-direction: none; text-shadow: 0 1px rgba(255, 255, 255, 0); color: #BAC3CF; - border: 1px solid rgba(26, 28, 34, 0.35); + border: 1px solid rgba(0, 0, 0, 0.35); background-color: rgba(102, 109, 132, 0.35); } .keyboard-key:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #BAC3CF; - border: 1px solid rgba(26, 28, 34, 0.35); + border: 1px solid rgba(0, 0, 0, 0.35); background-color: rgba(119, 127, 151, 0.45); } .keyboard-key:active, .keyboard-key:checked { text-shadow: 0 1px rgba(255, 255, 255, 0); @@ -1698,7 +1718,7 @@ StEntry.chat-response { .keyboard-key:grayed { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #5d626e; - border: 1px solid rgba(26, 28, 34, 0.35); + border: 1px solid rgba(0, 0, 0, 0.35); background-color: rgba(102, 109, 132, 0.2); } .keyboard-subkeys { diff --git a/common/gnome-shell/3.14/sass/_common.scss b/common/gnome-shell/3.14/sass/_common.scss index 29b7953..d8d6780 100644 --- a/common/gnome-shell/3.14/sass/_common.scss +++ b/common/gnome-shell/3.14/sass/_common.scss @@ -1622,6 +1622,7 @@ StScrollBar { &:checked { color: $selected_fg_color; background-color: $selected_bg_color; + border-color: $selected_bg_color; } &:first-child:ltr, @@ -1669,6 +1670,27 @@ StScrollBar { } } +.app-well-app.running { + > .overview-icon { + @extend %reset_style; + background: none !important; + + text-shadow: black 0px 0px; + border-image: url("common-assets/dash/button-running-bottom.svg") 5 5 5 5; + } + &:hover > .overview-icon { + @extend %reset_style; + + border-image: url("common-assets/dash/button-running-hover-bottom.svg") 5 5 5 5; + } + &:active > .overview-icon, + &:checked > .overview-icon { + @extend %reset_style; + + border-image: url("common-assets/dash/button-running-active-bottom.svg") 5 5 5 5; + } +} + %icon_tile { color: $selected_fg_color; border-radius: 2px; diff --git a/common/gnome-shell/3.14/sass/_drawing.scss b/common/gnome-shell/3.14/sass/_drawing.scss index 738a69d..7301495 100644 --- a/common/gnome-shell/3.14/sass/_drawing.scss +++ b/common/gnome-shell/3.14/sass/_drawing.scss @@ -134,7 +134,7 @@ // normal osd button // color: $osd_fg_color; - border: 1px solid $osd_button_border; + border: 1px solid darken($osd_button_border, 12%); background-color: $osd_button_bg; } @@ -143,7 +143,7 @@ // active osd button // color: $osd_fg_color; - border: 1px solid $osd_button_border; + border: 1px solid darken($osd_button_border, 22%); background-color: opacify(lighten($osd_button_bg, 7%), 0.1); } @@ -161,7 +161,7 @@ // insensitive osd button // color: $osd_insensitive_fg_color; - border: 1px solid $osd_button_border; + border: 1px solid darken($osd_button_border, 12%); background-color: transparentize($osd_button_bg, 0.15); } } -- cgit v1.2.3 From 200498e4ecc6877d6d70ac0784b0862e67840988 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 11 Sep 2015 22:05:29 +0200 Subject: remove custom combobox style --- common/gtk-3.0/3.14/gtk-contained-dark.css | 34 ++++++++++------------ common/gtk-3.0/3.14/gtk-contained-darker.css | 34 ++++++++++------------ common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 34 ++++++++++------------ common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 34 ++++++++++------------ common/gtk-3.0/3.14/gtk-contained-solid.css | 34 ++++++++++------------ common/gtk-3.0/3.14/gtk-contained.css | 34 ++++++++++------------ common/gtk-3.0/3.14/sass/_common.scss | 28 +++++++++++------- common/gtk-3.0/3.16/gtk-contained-dark.css | 32 ++++++++++---------- common/gtk-3.0/3.16/gtk-contained-darker.css | 32 ++++++++++---------- common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 32 ++++++++++---------- common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 32 ++++++++++---------- common/gtk-3.0/3.16/gtk-contained-solid.css | 32 ++++++++++---------- common/gtk-3.0/3.16/gtk-contained.css | 32 ++++++++++---------- common/gtk-3.0/3.16/sass/_common.scss | 28 +++++++++++------- 14 files changed, 214 insertions(+), 238 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 c9d01a8..824f097 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -857,26 +857,22 @@ GtkComboBox { color: rgba(211, 218, 227, 0.45); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { -GtkWidget-wide-separators: true; } - GtkComboBox.combobox-entry .entry { + GtkComboBox.combobox-entry .entry:dir(ltr) { border-right-style: none; } - GtkComboBox.combobox-entry .entry:dir(rtl) { - border-left-style: none; } - GtkComboBox.combobox-entry .button { - color: rgba(211, 218, 227, 0.6); - background-color: #2b2e39; - border-color: #2b2e39; } - GtkComboBox.combobox-entry .button:hover { - background-color: #363a47; - border-color: #363a47; } - GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #8b98b0; - background-color: #8b98b0; - border-color: transparent; - background-color: #5294E2; } - GtkComboBox.combobox-entry .button:insensitive { - opacity: 0.5; } + GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: 1px 0 #5294E2; } + GtkComboBox.combobox-entry .entry:dir(rtl) { + border-left-style: none; } + GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: -1px 0 #5294E2; } + GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 #2b2e39; } + GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(43, 46, 57, 0.55); } + GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 #2b2e39; } + GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(43, 46, 57, 0.55); } /************ * Toolbars * 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 f3852bd..ccbfdc0 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -857,26 +857,22 @@ GtkComboBox { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { -GtkWidget-wide-separators: true; } - GtkComboBox.combobox-entry .entry { + GtkComboBox.combobox-entry .entry:dir(ltr) { border-right-style: none; } - GtkComboBox.combobox-entry .entry:dir(rtl) { - border-left-style: none; } - GtkComboBox.combobox-entry .button { - color: rgba(92, 97, 108, 0.6); - background-color: #cfd6e6; - border-color: #cfd6e6; } - GtkComboBox.combobox-entry .button:hover { - background-color: #e0e4ef; - border-color: #e0e4ef; } - GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; - border-color: transparent; - background-color: #5294E2; } - GtkComboBox.combobox-entry .button:insensitive { - opacity: 0.5; } + GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: 1px 0 #5294E2; } + GtkComboBox.combobox-entry .entry:dir(rtl) { + border-left-style: none; } + GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: -1px 0 #5294E2; } + GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 #cfd6e6; } + GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); } + GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 #cfd6e6; } + GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); } /************ * Toolbars * 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 ce47778..4c6cc87 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 @@ -857,26 +857,22 @@ GtkComboBox { color: rgba(211, 218, 227, 0.45); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { -GtkWidget-wide-separators: true; } - GtkComboBox.combobox-entry .entry { + GtkComboBox.combobox-entry .entry:dir(ltr) { border-right-style: none; } - GtkComboBox.combobox-entry .entry:dir(rtl) { - border-left-style: none; } - GtkComboBox.combobox-entry .button { - color: rgba(211, 218, 227, 0.6); - background-color: #2b2e39; - border-color: #2b2e39; } - GtkComboBox.combobox-entry .button:hover { - background-color: #363a47; - border-color: #363a47; } - GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #8b98b0; - background-color: #8b98b0; - border-color: transparent; - background-color: #5294E2; } - GtkComboBox.combobox-entry .button:insensitive { - opacity: 0.5; } + GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: 1px 0 #5294E2; } + GtkComboBox.combobox-entry .entry:dir(rtl) { + border-left-style: none; } + GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: -1px 0 #5294E2; } + GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 #2b2e39; } + GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(43, 46, 57, 0.55); } + GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 #2b2e39; } + GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(43, 46, 57, 0.55); } /************ * Toolbars * 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 3470145..122bf64 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 @@ -857,26 +857,22 @@ GtkComboBox { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { -GtkWidget-wide-separators: true; } - GtkComboBox.combobox-entry .entry { + GtkComboBox.combobox-entry .entry:dir(ltr) { border-right-style: none; } - GtkComboBox.combobox-entry .entry:dir(rtl) { - border-left-style: none; } - GtkComboBox.combobox-entry .button { - color: rgba(92, 97, 108, 0.6); - background-color: #cfd6e6; - border-color: #cfd6e6; } - GtkComboBox.combobox-entry .button:hover { - background-color: #e0e4ef; - border-color: #e0e4ef; } - GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; - border-color: transparent; - background-color: #5294E2; } - GtkComboBox.combobox-entry .button:insensitive { - opacity: 0.5; } + GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: 1px 0 #5294E2; } + GtkComboBox.combobox-entry .entry:dir(rtl) { + border-left-style: none; } + GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: -1px 0 #5294E2; } + GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 #cfd6e6; } + GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); } + GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 #cfd6e6; } + GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); } /************ * Toolbars * 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 c93e5bd..df24f99 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -857,26 +857,22 @@ GtkComboBox { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { -GtkWidget-wide-separators: true; } - GtkComboBox.combobox-entry .entry { + GtkComboBox.combobox-entry .entry:dir(ltr) { border-right-style: none; } - GtkComboBox.combobox-entry .entry:dir(rtl) { - border-left-style: none; } - GtkComboBox.combobox-entry .button { - color: rgba(92, 97, 108, 0.6); - background-color: #cfd6e6; - border-color: #cfd6e6; } - GtkComboBox.combobox-entry .button:hover { - background-color: #e0e4ef; - border-color: #e0e4ef; } - GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; - border-color: #5294E2; - background-color: #5294E2; } - GtkComboBox.combobox-entry .button:insensitive { - opacity: 0.5; } + GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: 1px 0 #5294E2; } + GtkComboBox.combobox-entry .entry:dir(rtl) { + border-left-style: none; } + GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: -1px 0 #5294E2; } + GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 #cfd6e6; } + GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); } + GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 #cfd6e6; } + GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); } /************ * Toolbars * diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 78a2e91..0f6a4e6 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -857,26 +857,22 @@ GtkComboBox { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { -GtkWidget-wide-separators: true; } - GtkComboBox.combobox-entry .entry { + GtkComboBox.combobox-entry .entry:dir(ltr) { border-right-style: none; } - GtkComboBox.combobox-entry .entry:dir(rtl) { - border-left-style: none; } - GtkComboBox.combobox-entry .button { - color: rgba(92, 97, 108, 0.6); - background-color: #cfd6e6; - border-color: #cfd6e6; } - GtkComboBox.combobox-entry .button:hover { - background-color: #e0e4ef; - border-color: #e0e4ef; } - GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; - border-color: #5294E2; - background-color: #5294E2; } - GtkComboBox.combobox-entry .button:insensitive { - opacity: 0.5; } + GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: 1px 0 #5294E2; } + GtkComboBox.combobox-entry .entry:dir(rtl) { + border-left-style: none; } + GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: -1px 0 #5294E2; } + GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 #cfd6e6; } + GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); } + GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 #cfd6e6; } + GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); } /************ * Toolbars * diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index a03fe63..eda6e01 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -928,25 +928,31 @@ GtkComboBox { &.combobox-entry .entry { @extend %linked; - border-right-style: none; - &:dir(rtl) { border-left-style: none; } + &:dir(ltr) { + border-right-style: none; + + &:focus { box-shadow: 1px 0 $selected_bg_color; } + } + &:dir(rtl) { + border-left-style: none; + + &:focus { box-shadow: -1px 0 $selected_bg_color; } + } } &.combobox-entry .button { @extend %linked; - color: transparentize($fg_color, 0.4); - background-color: $button_border; - border-color: $button_border; + &:dir(ltr) { + box-shadow: inset 1px 0 $button_border; - &:hover { - background-color: lighten($button_border, 5%); - border-color: lighten($button_border, 5%); + &:insensitive { box-shadow: inset 1px 0 transparentize($button_border, 0.45); } } + &:dir(rtl) { + box-shadow: inset -1px 0 $button_border; - &:active, &:checked { @include button(active); } - - &:insensitive { opacity: 0.5 } + &:insensitive { box-shadow: inset -1px 0 transparentize($button_border, 0.45); } + } } } 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 2b04430..bb75e66 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -849,24 +849,22 @@ GtkComboBox { color: rgba(211, 218, 227, 0.45); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { -GtkWidget-wide-separators: true; } - GtkComboBox.combobox-entry .entry { + GtkComboBox.combobox-entry .entry:dir(ltr) { border-right-style: none; } - GtkComboBox.combobox-entry .entry:dir(rtl) { - border-left-style: none; } - GtkComboBox.combobox-entry .button { - color: rgba(211, 218, 227, 0.6); - background-color: #2b2e39; - border-color: #2b2e39; } - GtkComboBox.combobox-entry .button:hover { - background-color: #363a47; - border-color: #363a47; } - GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: transparent; - background-color: #5294E2; } - GtkComboBox.combobox-entry .button:insensitive { - opacity: 0.5; } + GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: 1px 0 #5294E2; } + GtkComboBox.combobox-entry .entry:dir(rtl) { + border-left-style: none; } + GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: -1px 0 #5294E2; } + GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 #2b2e39; } + GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(43, 46, 57, 0.55); } + GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 #2b2e39; } + GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(43, 46, 57, 0.55); } /************ * Toolbars * 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 890275e..5258c4c 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -849,24 +849,22 @@ GtkComboBox { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { -GtkWidget-wide-separators: true; } - GtkComboBox.combobox-entry .entry { + GtkComboBox.combobox-entry .entry:dir(ltr) { border-right-style: none; } - GtkComboBox.combobox-entry .entry:dir(rtl) { - border-left-style: none; } - GtkComboBox.combobox-entry .button { - color: rgba(92, 97, 108, 0.6); - background-color: #cfd6e6; - border-color: #cfd6e6; } - GtkComboBox.combobox-entry .button:hover { - background-color: #e0e4ef; - border-color: #e0e4ef; } - GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: transparent; - background-color: #5294E2; } - GtkComboBox.combobox-entry .button:insensitive { - opacity: 0.5; } + GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: 1px 0 #5294E2; } + GtkComboBox.combobox-entry .entry:dir(rtl) { + border-left-style: none; } + GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: -1px 0 #5294E2; } + GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 #cfd6e6; } + GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); } + GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 #cfd6e6; } + GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); } /************ * Toolbars * 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 c4e16cb..d3e4f0e 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 @@ -849,24 +849,22 @@ GtkComboBox { color: rgba(211, 218, 227, 0.45); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { -GtkWidget-wide-separators: true; } - GtkComboBox.combobox-entry .entry { + GtkComboBox.combobox-entry .entry:dir(ltr) { border-right-style: none; } - GtkComboBox.combobox-entry .entry:dir(rtl) { - border-left-style: none; } - GtkComboBox.combobox-entry .button { - color: rgba(211, 218, 227, 0.6); - background-color: #2b2e39; - border-color: #2b2e39; } - GtkComboBox.combobox-entry .button:hover { - background-color: #363a47; - border-color: #363a47; } - GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: transparent; - background-color: #5294E2; } - GtkComboBox.combobox-entry .button:insensitive { - opacity: 0.5; } + GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: 1px 0 #5294E2; } + GtkComboBox.combobox-entry .entry:dir(rtl) { + border-left-style: none; } + GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: -1px 0 #5294E2; } + GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 #2b2e39; } + GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(43, 46, 57, 0.55); } + GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 #2b2e39; } + GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(43, 46, 57, 0.55); } /************ * Toolbars * 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 6a648aa..ecd99ac 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 @@ -849,24 +849,22 @@ GtkComboBox { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { -GtkWidget-wide-separators: true; } - GtkComboBox.combobox-entry .entry { + GtkComboBox.combobox-entry .entry:dir(ltr) { border-right-style: none; } - GtkComboBox.combobox-entry .entry:dir(rtl) { - border-left-style: none; } - GtkComboBox.combobox-entry .button { - color: rgba(92, 97, 108, 0.6); - background-color: #cfd6e6; - border-color: #cfd6e6; } - GtkComboBox.combobox-entry .button:hover { - background-color: #e0e4ef; - border-color: #e0e4ef; } - GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: transparent; - background-color: #5294E2; } - GtkComboBox.combobox-entry .button:insensitive { - opacity: 0.5; } + GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: 1px 0 #5294E2; } + GtkComboBox.combobox-entry .entry:dir(rtl) { + border-left-style: none; } + GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: -1px 0 #5294E2; } + GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 #cfd6e6; } + GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); } + GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 #cfd6e6; } + GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); } /************ * Toolbars * 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 824024f..0648b7f 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -849,24 +849,22 @@ GtkComboBox { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { -GtkWidget-wide-separators: true; } - GtkComboBox.combobox-entry .entry { + GtkComboBox.combobox-entry .entry:dir(ltr) { border-right-style: none; } - GtkComboBox.combobox-entry .entry:dir(rtl) { - border-left-style: none; } - GtkComboBox.combobox-entry .button { - color: rgba(92, 97, 108, 0.6); - background-color: #cfd6e6; - border-color: #cfd6e6; } - GtkComboBox.combobox-entry .button:hover { - background-color: #e0e4ef; - border-color: #e0e4ef; } - GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; - background-color: #5294E2; } - GtkComboBox.combobox-entry .button:insensitive { - opacity: 0.5; } + GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: 1px 0 #5294E2; } + GtkComboBox.combobox-entry .entry:dir(rtl) { + border-left-style: none; } + GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: -1px 0 #5294E2; } + GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 #cfd6e6; } + GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); } + GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 #cfd6e6; } + GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); } /************ * Toolbars * diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 3d8150f..9dbadcd 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -849,24 +849,22 @@ GtkComboBox { color: rgba(92, 97, 108, 0.55); } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .vertical.view.separator, GtkPlacesSidebar.sidebar GtkComboBox .vertical.view.separator { -GtkWidget-wide-separators: true; } - GtkComboBox.combobox-entry .entry { + GtkComboBox.combobox-entry .entry:dir(ltr) { border-right-style: none; } - GtkComboBox.combobox-entry .entry:dir(rtl) { - border-left-style: none; } - GtkComboBox.combobox-entry .button { - color: rgba(92, 97, 108, 0.6); - background-color: #cfd6e6; - border-color: #cfd6e6; } - GtkComboBox.combobox-entry .button:hover { - background-color: #e0e4ef; - border-color: #e0e4ef; } - GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; - background-color: #5294E2; } - GtkComboBox.combobox-entry .button:insensitive { - opacity: 0.5; } + GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: 1px 0 #5294E2; } + GtkComboBox.combobox-entry .entry:dir(rtl) { + border-left-style: none; } + GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: -1px 0 #5294E2; } + GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 #cfd6e6; } + GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); } + GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 #cfd6e6; } + GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); } /************ * Toolbars * diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index c92eec6..7011eac 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -928,25 +928,31 @@ GtkComboBox { &.combobox-entry .entry { @extend %linked; - border-right-style: none; - &:dir(rtl) { border-left-style: none; } + &:dir(ltr) { + border-right-style: none; + + &:focus { box-shadow: 1px 0 $selected_bg_color; } + } + &:dir(rtl) { + border-left-style: none; + + &:focus { box-shadow: -1px 0 $selected_bg_color; } + } } &.combobox-entry .button { @extend %linked; - color: transparentize($fg_color, 0.4); - background-color: $button_border; - border-color: $button_border; + &:dir(ltr) { + box-shadow: inset 1px 0 $button_border; - &:hover { - background-color: lighten($button_border, 5%); - border-color: lighten($button_border, 5%); + &:insensitive { box-shadow: inset 1px 0 transparentize($button_border, 0.45); } } + &:dir(rtl) { + box-shadow: inset -1px 0 $button_border; - &:active, &:checked { @include button(active); } - - &:insensitive { opacity: 0.5 } + &:insensitive { box-shadow: inset -1px 0 transparentize($button_border, 0.45); } + } } } -- cgit v1.2.3 From 12f6457901bafaef767bf60cd86d74ae583ca4ac Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 11 Sep 2015 22:08:41 +0200 Subject: fix flat button transition --- common/gtk-3.0/3.14/gtk-contained-dark.css | 3 ++- common/gtk-3.0/3.14/gtk-contained-darker.css | 3 ++- common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 3 ++- common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 3 ++- common/gtk-3.0/3.14/gtk-contained-solid.css | 3 ++- common/gtk-3.0/3.14/gtk-contained.css | 3 ++- common/gtk-3.0/3.14/sass/_common.scss | 3 ++- common/gtk-3.0/3.16/gtk-contained-dark.css | 3 ++- common/gtk-3.0/3.16/gtk-contained-darker.css | 3 ++- common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 3 ++- common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 3 ++- common/gtk-3.0/3.16/gtk-contained-solid.css | 3 ++- common/gtk-3.0/3.16/gtk-contained.css | 3 ++- common/gtk-3.0/3.16/sass/_common.scss | 3 ++- 14 files changed, 28 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 824f097..3ffe7ca 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -285,7 +285,8 @@ GtkSearchEntry.entry { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(56, 60, 74, 0); + background-color: rgba(68, 74, 88, 0); + border-color: rgba(43, 46, 57, 0); transition: none; } .button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); 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 ccbfdc0..4c6afb5 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -285,7 +285,8 @@ GtkSearchEntry.entry { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(245, 246, 247, 0); + background-color: rgba(251, 251, 252, 0); + border-color: rgba(207, 214, 230, 0); transition: none; } .button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); 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 4c6cc87..3142a1a 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 @@ -285,7 +285,8 @@ GtkSearchEntry.entry { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(56, 60, 74, 0); + background-color: rgba(68, 74, 88, 0); + border-color: rgba(43, 46, 57, 0); transition: none; } .button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); 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 122bf64..6176a1c 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 @@ -285,7 +285,8 @@ GtkSearchEntry.entry { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(245, 246, 247, 0); + background-color: rgba(251, 251, 252, 0); + border-color: rgba(207, 214, 230, 0); transition: none; } .button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); 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 df24f99..36cc18d 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -285,7 +285,8 @@ GtkSearchEntry.entry { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(245, 246, 247, 0); + background-color: rgba(251, 251, 252, 0); + border-color: rgba(207, 214, 230, 0); transition: none; } .button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 0f6a4e6..c7d3966 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -285,7 +285,8 @@ GtkSearchEntry.entry { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(245, 246, 247, 0); + background-color: rgba(251, 251, 252, 0); + border-color: rgba(207, 214, 230, 0); transition: none; } .button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index eda6e01..6a7ed8a 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -398,7 +398,8 @@ $_dot_color: $selected_bg_color; &.flat { @include button(undecorated); - background-color: transparentize($bg_color, 1); + background-color: transparentize($button_bg, 1); + border-color: transparentize($button_border, 1); // to avoid adiacent buttons borders clashing when transitioning, the transition on the normal state is set // to none, while it's added back in the hover state, so the button decoration will fade in on hover, but // it won't fade out when the pointer leave the button allocation area. To make the transition more evident 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 bb75e66..560be11 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -285,7 +285,8 @@ GtkSearchEntry.entry { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(56, 60, 74, 0); + background-color: rgba(68, 74, 88, 0); + border-color: rgba(43, 46, 57, 0); transition: none; } .button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); 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 5258c4c..c417df6 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -285,7 +285,8 @@ GtkSearchEntry.entry { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(245, 246, 247, 0); + background-color: rgba(251, 251, 252, 0); + border-color: rgba(207, 214, 230, 0); transition: none; } .button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); 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 d3e4f0e..238d770 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 @@ -285,7 +285,8 @@ GtkSearchEntry.entry { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(56, 60, 74, 0); + background-color: rgba(68, 74, 88, 0); + border-color: rgba(43, 46, 57, 0); transition: none; } .button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); 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 ecd99ac..d31566f 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 @@ -285,7 +285,8 @@ GtkSearchEntry.entry { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(245, 246, 247, 0); + background-color: rgba(251, 251, 252, 0); + border-color: rgba(207, 214, 230, 0); transition: none; } .button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); 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 0648b7f..5c70769 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -285,7 +285,8 @@ GtkSearchEntry.entry { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(245, 246, 247, 0); + background-color: rgba(251, 251, 252, 0); + border-color: rgba(207, 214, 230, 0); transition: none; } .button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 9dbadcd..15a8376 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -285,7 +285,8 @@ GtkSearchEntry.entry { border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(245, 246, 247, 0); + background-color: rgba(251, 251, 252, 0); + border-color: rgba(207, 214, 230, 0); transition: none; } .button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 7011eac..ae6da28 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -398,7 +398,8 @@ $_dot_color: $selected_bg_color; &.flat { @include button(undecorated); - background-color: transparentize($bg_color, 1); + background-color: transparentize($button_bg, 1); + border-color: transparentize($button_border, 1); // to avoid adiacent buttons borders clashing when transitioning, the transition on the normal state is set // to none, while it's added back in the hover state, so the button decoration will fade in on hover, but // it won't fade out when the pointer leave the button allocation area. To make the transition more evident -- cgit v1.2.3 From 6cb7e75cf54fb8335cc98771d8f4984cf8e17a82 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 11 Sep 2015 22:11:36 +0200 Subject: fix gnome-documents entry-tag --- common/gtk-3.0/3.14/gtk-contained-dark.css | 2 ++ common/gtk-3.0/3.14/gtk-contained-darker.css | 2 ++ common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 2 ++ common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 2 ++ common/gtk-3.0/3.14/gtk-contained-solid.css | 2 ++ common/gtk-3.0/3.14/gtk-contained.css | 2 ++ common/gtk-3.0/3.14/sass/_applications.scss | 10 ++++++++-- common/gtk-3.0/3.16/gtk-contained-dark.css | 3 ++- common/gtk-3.0/3.16/gtk-contained-darker.css | 3 ++- common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 3 ++- common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 3 ++- common/gtk-3.0/3.16/gtk-contained-solid.css | 3 ++- common/gtk-3.0/3.16/gtk-contained.css | 3 ++- common/gtk-3.0/3.16/sass/_applications.scss | 10 ++++++++-- 14 files changed, 40 insertions(+), 10 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 3ffe7ca..6ce7ac3 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -3040,8 +3040,10 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { + color: #ffffff; background-color: #639fe5; } .documents-entry-tag:active { + color: #ffffff; background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { background: none; 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 4c6afb5..0ce2e76 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -3040,8 +3040,10 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { + color: #ffffff; background-color: #639fe5; } .documents-entry-tag:active { + color: #ffffff; background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { background: none; 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 3142a1a..e73b850 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 @@ -3040,8 +3040,10 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { + color: #ffffff; background-color: #639fe5; } .documents-entry-tag:active { + color: #ffffff; background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { background: none; 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 6176a1c..5fca89f 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 @@ -3040,8 +3040,10 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { + color: #ffffff; background-color: #639fe5; } .documents-entry-tag:active { + color: #ffffff; background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { background: none; 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 36cc18d..cfc638c 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -3040,8 +3040,10 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { + color: #ffffff; background-color: #639fe5; } .documents-entry-tag:active { + color: #ffffff; background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { background: none; diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index c7d3966..58ac33c 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -3040,8 +3040,10 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { + color: #ffffff; background-color: #639fe5; } .documents-entry-tag:active { + color: #ffffff; background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { background: none; diff --git a/common/gtk-3.0/3.14/sass/_applications.scss b/common/gtk-3.0/3.14/sass/_applications.scss index beeb698..33821eb 100644 --- a/common/gtk-3.0/3.14/sass/_applications.scss +++ b/common/gtk-3.0/3.14/sass/_applications.scss @@ -388,8 +388,14 @@ EphyWindow .floating-bar { // Epiphany overrides the floating-bar style, so rese margin: 2px; padding: 4px; - &:hover { background-color: lighten($selected_bg_color, 4%) } - &:active { background-color: darken($selected_bg_color, 4%) } + &:hover { + color: $selected_fg_color; + background-color: lighten($selected_bg_color, 4%); + } + &:active { + color: $selected_fg_color; + background-color: darken($selected_bg_color, 4%); + } .toolbar .linked &.button { background: none; 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 560be11..632aa7d 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -2998,7 +2998,8 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { - background-color: #639fe5; } + background-color: #639fe5; + color: #ffffff; } .documents-entry-tag:active { background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { 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 c417df6..374ba50 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -2998,7 +2998,8 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { - background-color: #639fe5; } + background-color: #639fe5; + color: #ffffff; } .documents-entry-tag:active { background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { 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 238d770..a8c897e 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 @@ -2998,7 +2998,8 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { - background-color: #639fe5; } + background-color: #639fe5; + color: #ffffff; } .documents-entry-tag:active { background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { 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 d31566f..d41c66a 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 @@ -2998,7 +2998,8 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { - background-color: #639fe5; } + background-color: #639fe5; + color: #ffffff; } .documents-entry-tag:active { background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { 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 5c70769..de1d2ca 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -2998,7 +2998,8 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { - background-color: #639fe5; } + background-color: #639fe5; + color: #ffffff; } .documents-entry-tag:active { background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 15a8376..c6623df 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -2998,7 +2998,8 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { - background-color: #639fe5; } + background-color: #639fe5; + color: #ffffff; } .documents-entry-tag:active { background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { diff --git a/common/gtk-3.0/3.16/sass/_applications.scss b/common/gtk-3.0/3.16/sass/_applications.scss index b408053..0cf9435 100644 --- a/common/gtk-3.0/3.16/sass/_applications.scss +++ b/common/gtk-3.0/3.16/sass/_applications.scss @@ -436,8 +436,14 @@ EphyWindow .floating-bar { // Epiphany overrides the floating-bar style, so rese margin: 2px; padding: 4px; - &:hover { background-color: lighten($selected_bg_color, 4%) } - &:active { background-color: darken($selected_bg_color, 4%) } + &:hover { + color: $selected_fg_color; + background-color: lighten($selected_bg_color, 4%); + } + &:active { + color: $selected_fg_color; + background-color: darken($selected_bg_color, 4%); + } .toolbar .linked &.button { background: none; -- cgit v1.2.3 From de484ff96465cf13f30153eba33d6f987705000d Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 11 Sep 2015 22:18:19 +0200 Subject: fix header-bar comboboxes --- common/gtk-3.0/3.14/gtk-contained-dark.css | 16 ++++++++++++++++ common/gtk-3.0/3.14/gtk-contained-darker.css | 16 ++++++++++++++++ common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 16 ++++++++++++++++ common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 16 ++++++++++++++++ common/gtk-3.0/3.14/gtk-contained-solid.css | 16 ++++++++++++++++ common/gtk-3.0/3.14/gtk-contained.css | 16 ++++++++++++++++ common/gtk-3.0/3.14/sass/_common.scss | 21 +++++++++++++++++++++ common/gtk-3.0/3.16/gtk-contained-dark.css | 21 +++++++++++++++++++-- common/gtk-3.0/3.16/gtk-contained-darker.css | 21 +++++++++++++++++++-- common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 21 +++++++++++++++++++-- common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 21 +++++++++++++++++++-- common/gtk-3.0/3.16/gtk-contained-solid.css | 21 +++++++++++++++++++-- common/gtk-3.0/3.16/gtk-contained.css | 21 +++++++++++++++++++-- common/gtk-3.0/3.16/sass/_common.scss | 21 +++++++++++++++++++++ 14 files changed, 252 insertions(+), 12 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 6ce7ac3..2446e4e 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -1276,6 +1276,22 @@ GtkComboBox { color: rgba(207, 218, 231, 0.35); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0); } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0); } + .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } 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 0ce2e76..41bb058 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -1276,6 +1276,22 @@ GtkComboBox { color: rgba(207, 218, 231, 0.35); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0); } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0); } + .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } 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 e73b850..f7eb6fd 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 @@ -1276,6 +1276,22 @@ GtkComboBox { color: rgba(207, 218, 231, 0.35); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0); } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0); } + .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } 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 5fca89f..d6b78d7 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 @@ -1276,6 +1276,22 @@ GtkComboBox { color: rgba(207, 218, 231, 0.35); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0); } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0); } + .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } 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 cfc638c..063c06f 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -1276,6 +1276,22 @@ GtkComboBox { color: rgba(82, 93, 118, 0.35); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0); } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0); } + .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 58ac33c..f6c1ffc 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -1276,6 +1276,22 @@ GtkComboBox { color: rgba(82, 93, 118, 0.35); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0); } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0); } + .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index 6a7ed8a..ff8a53c 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -1324,6 +1324,27 @@ GtkComboBox { &:hover { @include entry(header-focus); box-shadow: none; } &:insensitive { @include entry(header-insensitive); } } + &.combobox-entry .entry { + &:dir(ltr) { + &:focus { box-shadow: none; } + } + &:dir(rtl) { + &:focus { box-shadow: none; } + } + } + &.combobox-entry .button { + + &:dir(ltr) { + box-shadow: inset 1px 0 $header_button_border; + + &:insensitive { box-shadow: inset 1px 0 transparentize($header_button_border, 0.45); } + } + &:dir(rtl) { + box-shadow: inset -1px 0 $header_button_border; + + &:insensitive { box-shadow: inset -1px 0 transparentize($header_button_border, 0.45); } + } + } } // Header-bar Switches 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 632aa7d..54914f7 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -1275,6 +1275,22 @@ GtkComboBox { color: rgba(207, 218, 231, 0.35); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0); } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0); } + .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } @@ -2998,9 +3014,10 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { - background-color: #639fe5; - color: #ffffff; } + color: #ffffff; + background-color: #639fe5; } .documents-entry-tag:active { + color: #ffffff; background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { background: none; 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 374ba50..e60fd79 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -1275,6 +1275,22 @@ GtkComboBox { color: rgba(207, 218, 231, 0.35); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); } +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0); } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0); } + .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } @@ -2998,9 +3014,10 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { - background-color: #639fe5; - color: #ffffff; } + color: #ffffff; + background-color: #639fe5; } .documents-entry-tag:active { + color: #ffffff; background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { background: none; 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 a8c897e..1ac520a 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 @@ -1275,6 +1275,22 @@ GtkComboBox { color: rgba(207, 218, 231, 0.35); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0); } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0); } + .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } @@ -2998,9 +3014,10 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { - background-color: #639fe5; - color: #ffffff; } + color: #ffffff; + background-color: #639fe5; } .documents-entry-tag:active { + color: #ffffff; background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { background: none; 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 d41c66a..74d2fc0 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 @@ -1275,6 +1275,22 @@ GtkComboBox { color: rgba(207, 218, 231, 0.35); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); } +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0); } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0); } + .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } @@ -2998,9 +3014,10 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { - background-color: #639fe5; - color: #ffffff; } + color: #ffffff; + background-color: #639fe5; } .documents-entry-tag:active { + color: #ffffff; background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { background: none; 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 de1d2ca..18abdb6 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -1275,6 +1275,22 @@ GtkComboBox { color: rgba(82, 93, 118, 0.35); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0); } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0); } + .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } @@ -2998,9 +3014,10 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { - background-color: #639fe5; - color: #ffffff; } + color: #ffffff; + background-color: #639fe5; } .documents-entry-tag:active { + color: #ffffff; background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { background: none; diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index c6623df..a1eacd8 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -1275,6 +1275,22 @@ GtkComboBox { color: rgba(82, 93, 118, 0.35); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); } +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus { + box-shadow: none; } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0); } + +.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); } + .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0); } + .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop { opacity: 0.75; } @@ -2998,9 +3014,10 @@ EphyWindow .floating-bar { margin: 2px; padding: 4px; } .documents-entry-tag:hover { - background-color: #639fe5; - color: #ffffff; } + color: #ffffff; + background-color: #639fe5; } .documents-entry-tag:active { + color: #ffffff; background-color: #4189df; } .toolbar .linked .documents-entry-tag.button, .inline-toolbar .linked .documents-entry-tag.button { background: none; diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index ae6da28..4ceb343 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -1333,6 +1333,27 @@ GtkComboBox { &:hover { @include entry(header-focus); box-shadow: none; } &:insensitive { @include entry(header-insensitive); } } + &.combobox-entry .entry { + &:dir(ltr) { + &:focus { box-shadow: none; } + } + &:dir(rtl) { + &:focus { box-shadow: none; } + } + } + &.combobox-entry .button { + + &:dir(ltr) { + box-shadow: inset 1px 0 $header_button_border; + + &:insensitive { box-shadow: inset 1px 0 transparentize($header_button_border, 0.45); } + } + &:dir(rtl) { + box-shadow: inset -1px 0 $header_button_border; + + &:insensitive { box-shadow: inset -1px 0 transparentize($header_button_border, 0.45); } + } + } } // Header-bar Switches -- cgit v1.2.3 From 421b8c7d1008998490f24691712220cd6c8a4d51 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 11 Sep 2015 22:27:25 +0200 Subject: fix header-bar spinbuttons --- common/gtk-3.0/3.14/gtk-contained-dark.css | 7 ++++++- common/gtk-3.0/3.14/gtk-contained-darker.css | 7 ++++++- common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 7 ++++++- common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 7 ++++++- common/gtk-3.0/3.14/gtk-contained-solid.css | 7 ++++++- common/gtk-3.0/3.14/gtk-contained.css | 7 ++++++- common/gtk-3.0/3.14/sass/_common.scss | 16 ++++++++++------ common/gtk-3.0/3.16/gtk-contained-dark.css | 7 ++++++- common/gtk-3.0/3.16/gtk-contained-darker.css | 7 ++++++- common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 7 ++++++- common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 7 ++++++- common/gtk-3.0/3.16/gtk-contained-solid.css | 7 ++++++- common/gtk-3.0/3.16/gtk-contained.css | 7 ++++++- common/gtk-3.0/3.16/sass/_common.scss | 16 ++++++++++------ 14 files changed, 92 insertions(+), 24 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 2446e4e..62db47b 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -1246,11 +1246,16 @@ GtkComboBox { .primary-toolbar .spinbutton:focus .button, .header-bar .spinbutton:focus .button { color: #ffffff; } + .primary-toolbar .spinbutton:focus .button:hover, .header-bar .spinbutton:focus .button:hover { + background-color: rgba(255, 255, 255, 0.1); + border-color: transparent; } + .primary-toolbar .spinbutton:focus .button:insensitive, .header-bar .spinbutton:focus .button:insensitive { + color: rgba(255, 255, 255, 0.4); } .primary-toolbar .spinbutton .button, .header-bar .spinbutton .button { color: rgba(207, 218, 231, 0.8); } .primary-toolbar .spinbutton .button:hover, .header-bar .spinbutton .button:hover { - background-color: rgba(255, 255, 255, 0.1); + background-color: rgba(207, 218, 231, 0.05); border-color: transparent; } .primary-toolbar .spinbutton .button:insensitive, .header-bar .spinbutton .button:insensitive { color: rgba(207, 218, 231, 0.5); } 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 41bb058..77c92ac 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -1246,11 +1246,16 @@ GtkComboBox { .primary-toolbar .spinbutton:focus .button, .header-bar .spinbutton:focus .button { color: #ffffff; } + .primary-toolbar .spinbutton:focus .button:hover, .header-bar .spinbutton:focus .button:hover { + background-color: rgba(255, 255, 255, 0.1); + border-color: transparent; } + .primary-toolbar .spinbutton:focus .button:insensitive, .header-bar .spinbutton:focus .button:insensitive { + color: rgba(255, 255, 255, 0.4); } .primary-toolbar .spinbutton .button, .header-bar .spinbutton .button { color: rgba(207, 218, 231, 0.8); } .primary-toolbar .spinbutton .button:hover, .header-bar .spinbutton .button:hover { - background-color: rgba(255, 255, 255, 0.1); + background-color: rgba(207, 218, 231, 0.05); border-color: transparent; } .primary-toolbar .spinbutton .button:insensitive, .header-bar .spinbutton .button:insensitive { color: rgba(207, 218, 231, 0.5); } 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 f7eb6fd..e3f1200 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 @@ -1246,11 +1246,16 @@ GtkComboBox { .primary-toolbar .spinbutton:focus .button, .header-bar .spinbutton:focus .button { color: #ffffff; } + .primary-toolbar .spinbutton:focus .button:hover, .header-bar .spinbutton:focus .button:hover { + background-color: rgba(255, 255, 255, 0.1); + border-color: transparent; } + .primary-toolbar .spinbutton:focus .button:insensitive, .header-bar .spinbutton:focus .button:insensitive { + color: rgba(255, 255, 255, 0.4); } .primary-toolbar .spinbutton .button, .header-bar .spinbutton .button { color: rgba(207, 218, 231, 0.8); } .primary-toolbar .spinbutton .button:hover, .header-bar .spinbutton .button:hover { - background-color: rgba(255, 255, 255, 0.1); + background-color: rgba(207, 218, 231, 0.05); border-color: transparent; } .primary-toolbar .spinbutton .button:insensitive, .header-bar .spinbutton .button:insensitive { color: rgba(207, 218, 231, 0.5); } 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 d6b78d7..e0dbb2c 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 @@ -1246,11 +1246,16 @@ GtkComboBox { .primary-toolbar .spinbutton:focus .button, .header-bar .spinbutton:focus .button { color: #ffffff; } + .primary-toolbar .spinbutton:focus .button:hover, .header-bar .spinbutton:focus .button:hover { + background-color: rgba(255, 255, 255, 0.1); + border-color: transparent; } + .primary-toolbar .spinbutton:focus .button:insensitive, .header-bar .spinbutton:focus .button:insensitive { + color: rgba(255, 255, 255, 0.4); } .primary-toolbar .spinbutton .button, .header-bar .spinbutton .button { color: rgba(207, 218, 231, 0.8); } .primary-toolbar .spinbutton .button:hover, .header-bar .spinbutton .button:hover { - background-color: rgba(255, 255, 255, 0.1); + background-color: rgba(207, 218, 231, 0.05); border-color: transparent; } .primary-toolbar .spinbutton .button:insensitive, .header-bar .spinbutton .button:insensitive { color: rgba(207, 218, 231, 0.5); } 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 063c06f..d2f5156 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -1246,11 +1246,16 @@ GtkComboBox { .primary-toolbar .spinbutton:focus .button, .header-bar .spinbutton:focus .button { color: #ffffff; } + .primary-toolbar .spinbutton:focus .button:hover, .header-bar .spinbutton:focus .button:hover { + background-color: rgba(255, 255, 255, 0.1); + border-color: transparent; } + .primary-toolbar .spinbutton:focus .button:insensitive, .header-bar .spinbutton:focus .button:insensitive { + color: rgba(255, 255, 255, 0.4); } .primary-toolbar .spinbutton .button, .header-bar .spinbutton .button { color: rgba(82, 93, 118, 0.8); } .primary-toolbar .spinbutton .button:hover, .header-bar .spinbutton .button:hover { - background-color: rgba(255, 255, 255, 0.1); + background-color: rgba(82, 93, 118, 0.05); border-color: transparent; } .primary-toolbar .spinbutton .button:insensitive, .header-bar .spinbutton .button:insensitive { color: rgba(82, 93, 118, 0.5); } diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index f6c1ffc..7aefef5 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -1246,11 +1246,16 @@ GtkComboBox { .primary-toolbar .spinbutton:focus .button, .header-bar .spinbutton:focus .button { color: #ffffff; } + .primary-toolbar .spinbutton:focus .button:hover, .header-bar .spinbutton:focus .button:hover { + background-color: rgba(255, 255, 255, 0.1); + border-color: transparent; } + .primary-toolbar .spinbutton:focus .button:insensitive, .header-bar .spinbutton:focus .button:insensitive { + color: rgba(255, 255, 255, 0.4); } .primary-toolbar .spinbutton .button, .header-bar .spinbutton .button { color: rgba(82, 93, 118, 0.8); } .primary-toolbar .spinbutton .button:hover, .header-bar .spinbutton .button:hover { - background-color: rgba(255, 255, 255, 0.1); + background-color: rgba(82, 93, 118, 0.05); border-color: transparent; } .primary-toolbar .spinbutton .button:insensitive, .header-bar .spinbutton .button:insensitive { color: rgba(82, 93, 118, 0.5); } diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index ff8a53c..665ae6a 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -1303,14 +1303,18 @@ GtkComboBox { // Header-bar Spinbuttons & .spinbutton { - &:focus .button { color: $selected_fg_color; } + &:focus .button { + color: $selected_fg_color; - .button { - color: $header_fg; + &:hover { background-color: transparentize($selected_fg_color, 0.9); border-color: transparent; } + &:insensitive { color: transparentize($selected_fg_color, 0.6); } + } + .button { + color: $header_fg; - &:hover { background-color: rgba(255,255,255,0.1); border-color: transparent; } - &:insensitive { color: transparentize($header_fg, 0.3); } - &:active { background-color: rgba(0,0,0,0.1); } + &:hover { background-color: transparentize($header_fg, 0.75); border-color: transparent; } + &:insensitive { color: transparentize($header_fg, 0.3); } + &:active { background-color: rgba(0,0,0,0.1); } } } 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 54914f7..6eed2d8 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -1245,11 +1245,16 @@ GtkComboBox { .primary-toolbar .spinbutton:focus .button, .header-bar .spinbutton:focus .button { color: #ffffff; } + .primary-toolbar .spinbutton:focus .button:hover, .header-bar .spinbutton:focus .button:hover { + background-color: rgba(255, 255, 255, 0.1); + border-color: transparent; } + .primary-toolbar .spinbutton:focus .button:insensitive, .header-bar .spinbutton:focus .button:insensitive { + color: rgba(255, 255, 255, 0.4); } .primary-toolbar .spinbutton .button, .header-bar .spinbutton .button { color: rgba(207, 218, 231, 0.8); } .primary-toolbar .spinbutton .button:hover, .header-bar .spinbutton .button:hover { - background-color: rgba(255, 255, 255, 0.1); + background-color: rgba(207, 218, 231, 0.05); border-color: transparent; } .primary-toolbar .spinbutton .button:insensitive, .header-bar .spinbutton .button:insensitive { color: rgba(207, 218, 231, 0.5); } 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 e60fd79..7ad34f1 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -1245,11 +1245,16 @@ GtkComboBox { .primary-toolbar .spinbutton:focus .button, .header-bar .spinbutton:focus .button { color: #ffffff; } + .primary-toolbar .spinbutton:focus .button:hover, .header-bar .spinbutton:focus .button:hover { + background-color: rgba(255, 255, 255, 0.1); + border-color: transparent; } + .primary-toolbar .spinbutton:focus .button:insensitive, .header-bar .spinbutton:focus .button:insensitive { + color: rgba(255, 255, 255, 0.4); } .primary-toolbar .spinbutton .button, .header-bar .spinbutton .button { color: rgba(207, 218, 231, 0.8); } .primary-toolbar .spinbutton .button:hover, .header-bar .spinbutton .button:hover { - background-color: rgba(255, 255, 255, 0.1); + background-color: rgba(207, 218, 231, 0.05); border-color: transparent; } .primary-toolbar .spinbutton .button:insensitive, .header-bar .spinbutton .button:insensitive { color: rgba(207, 218, 231, 0.5); } 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 1ac520a..9dadbbd 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 @@ -1245,11 +1245,16 @@ GtkComboBox { .primary-toolbar .spinbutton:focus .button, .header-bar .spinbutton:focus .button { color: #ffffff; } + .primary-toolbar .spinbutton:focus .button:hover, .header-bar .spinbutton:focus .button:hover { + background-color: rgba(255, 255, 255, 0.1); + border-color: transparent; } + .primary-toolbar .spinbutton:focus .button:insensitive, .header-bar .spinbutton:focus .button:insensitive { + color: rgba(255, 255, 255, 0.4); } .primary-toolbar .spinbutton .button, .header-bar .spinbutton .button { color: rgba(207, 218, 231, 0.8); } .primary-toolbar .spinbutton .button:hover, .header-bar .spinbutton .button:hover { - background-color: rgba(255, 255, 255, 0.1); + background-color: rgba(207, 218, 231, 0.05); border-color: transparent; } .primary-toolbar .spinbutton .button:insensitive, .header-bar .spinbutton .button:insensitive { color: rgba(207, 218, 231, 0.5); } 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 74d2fc0..e3d6c15 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 @@ -1245,11 +1245,16 @@ GtkComboBox { .primary-toolbar .spinbutton:focus .button, .header-bar .spinbutton:focus .button { color: #ffffff; } + .primary-toolbar .spinbutton:focus .button:hover, .header-bar .spinbutton:focus .button:hover { + background-color: rgba(255, 255, 255, 0.1); + border-color: transparent; } + .primary-toolbar .spinbutton:focus .button:insensitive, .header-bar .spinbutton:focus .button:insensitive { + color: rgba(255, 255, 255, 0.4); } .primary-toolbar .spinbutton .button, .header-bar .spinbutton .button { color: rgba(207, 218, 231, 0.8); } .primary-toolbar .spinbutton .button:hover, .header-bar .spinbutton .button:hover { - background-color: rgba(255, 255, 255, 0.1); + background-color: rgba(207, 218, 231, 0.05); border-color: transparent; } .primary-toolbar .spinbutton .button:insensitive, .header-bar .spinbutton .button:insensitive { color: rgba(207, 218, 231, 0.5); } 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 18abdb6..24c6232 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -1245,11 +1245,16 @@ GtkComboBox { .primary-toolbar .spinbutton:focus .button, .header-bar .spinbutton:focus .button { color: #ffffff; } + .primary-toolbar .spinbutton:focus .button:hover, .header-bar .spinbutton:focus .button:hover { + background-color: rgba(255, 255, 255, 0.1); + border-color: transparent; } + .primary-toolbar .spinbutton:focus .button:insensitive, .header-bar .spinbutton:focus .button:insensitive { + color: rgba(255, 255, 255, 0.4); } .primary-toolbar .spinbutton .button, .header-bar .spinbutton .button { color: rgba(82, 93, 118, 0.8); } .primary-toolbar .spinbutton .button:hover, .header-bar .spinbutton .button:hover { - background-color: rgba(255, 255, 255, 0.1); + background-color: rgba(82, 93, 118, 0.05); border-color: transparent; } .primary-toolbar .spinbutton .button:insensitive, .header-bar .spinbutton .button:insensitive { color: rgba(82, 93, 118, 0.5); } diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index a1eacd8..24f3671 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -1245,11 +1245,16 @@ GtkComboBox { .primary-toolbar .spinbutton:focus .button, .header-bar .spinbutton:focus .button { color: #ffffff; } + .primary-toolbar .spinbutton:focus .button:hover, .header-bar .spinbutton:focus .button:hover { + background-color: rgba(255, 255, 255, 0.1); + border-color: transparent; } + .primary-toolbar .spinbutton:focus .button:insensitive, .header-bar .spinbutton:focus .button:insensitive { + color: rgba(255, 255, 255, 0.4); } .primary-toolbar .spinbutton .button, .header-bar .spinbutton .button { color: rgba(82, 93, 118, 0.8); } .primary-toolbar .spinbutton .button:hover, .header-bar .spinbutton .button:hover { - background-color: rgba(255, 255, 255, 0.1); + background-color: rgba(82, 93, 118, 0.05); border-color: transparent; } .primary-toolbar .spinbutton .button:insensitive, .header-bar .spinbutton .button:insensitive { color: rgba(82, 93, 118, 0.5); } diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 4ceb343..4505d9a 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -1312,14 +1312,18 @@ GtkComboBox { // Header-bar Spinbuttons & .spinbutton { - &:focus .button { color: $selected_fg_color; } + &:focus .button { + color: $selected_fg_color; - .button { - color: $header_fg; + &:hover { background-color: transparentize($selected_fg_color, 0.9); border-color: transparent; } + &:insensitive { color: transparentize($selected_fg_color, 0.6); } + } + .button { + color: $header_fg; - &:hover { background-color: rgba(255,255,255,0.1); border-color: transparent; } - &:insensitive { color: transparentize($header_fg, 0.3); } - &:active { background-color: rgba(0,0,0,0.1); } + &:hover { background-color: transparentize($header_fg, 0.75); border-color: transparent; } + &:insensitive { color: transparentize($header_fg, 0.3); } + &:active { background-color: rgba(0,0,0,0.1); } } } -- cgit v1.2.3 From 9cb321a1102ec758d404b1d39622cd58b731bb21 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 11 Sep 2015 23:48:06 +0200 Subject: update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bb719c9..ee63b88 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,15 @@ Arc is a flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell. #####Arc -![alt tag](http://i.imgur.com/aRTIvO9.png) +![alt tag](http://i.imgur.com/Ph5ObOa.png) #####Arc-Darker -![alt tag](http://i.imgur.com/6s8L7fm.png) +![alt tag](http://i.imgur.com/NC6dqyl.png) #####Arc-Dark -![alt tag](http://i.imgur.com/ZpI1AAf.png) +![alt tag](http://i.imgur.com/5AGlCnA.png) ### Requirements -- cgit v1.2.3 From bcfca23b54dc2a4340c6d69bc23edc25a473efeb Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 11 Sep 2015 23:51:06 +0200 Subject: bump version --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5bfec79..e88fdaa 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_INIT( [arc-theme], - [20150826], + [20150911], [https://github.com/horst3180/Arc-theme/issues], [arc-theme], [https://github.com/horst3180/Arc-theme], -- cgit v1.2.3 From e9461f1f573136f66212bb5c882ba266f919f8b2 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 11 Sep 2015 23:58:30 +0200 Subject: update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ee63b88..d927f56 100644 --- a/README.md +++ b/README.md @@ -141,4 +141,4 @@ If you get artifacts like black or invisible backgrounds under Unity, disable ov If you find a bug, please report it at https://github.com/horst3180/arc-theme/issues ### Full Preview -![alt tag](http://i.imgur.com/wzneKCh.png) +![alt tag](http://i.imgur.com/tD1OBQ3.png) -- cgit v1.2.3 From 853e9eeadd88da1d650f7e4dd2ea9119dfbc8a08 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sat, 12 Sep 2015 00:22:28 +0200 Subject: tweak standalone osd buttons --- common/gtk-3.0/3.14/gtk-contained-dark.css | 12 +++--------- common/gtk-3.0/3.14/gtk-contained-darker.css | 12 +++--------- common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 12 +++--------- common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 12 +++--------- common/gtk-3.0/3.14/gtk-contained-solid.css | 12 +++--------- common/gtk-3.0/3.14/gtk-contained.css | 12 +++--------- common/gtk-3.0/3.14/sass/_common.scss | 6 +++--- common/gtk-3.0/3.16/gtk-contained-dark.css | 12 +++--------- common/gtk-3.0/3.16/gtk-contained-darker.css | 12 +++--------- common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 12 +++--------- common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 12 +++--------- common/gtk-3.0/3.16/gtk-contained-solid.css | 12 +++--------- common/gtk-3.0/3.16/gtk-contained.css | 12 +++--------- common/gtk-3.0/3.16/sass/_common.scss | 6 +++--- 14 files changed, 42 insertions(+), 114 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 62db47b..42b858f 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -330,20 +330,14 @@ GtkSearchEntry.entry { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(186, 195, 207, 0.3); color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: rgba(102, 109, 132, 0.35); - background-color: rgba(53, 57, 69, 0.95); } + background-color: rgba(53, 57, 69, 0.95); + border-color: rgba(35, 38, 46, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: rgba(119, 127, 151, 0.45); - background-color: rgba(53, 57, 69, 0.95); } + color: #5294E2; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); 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 77c92ac..2d2523f 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -330,20 +330,14 @@ GtkSearchEntry.entry { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(186, 195, 207, 0.3); color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: rgba(102, 109, 132, 0.35); - background-color: rgba(53, 57, 69, 0.95); } + background-color: rgba(53, 57, 69, 0.95); + border-color: rgba(35, 38, 46, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: rgba(119, 127, 151, 0.45); - background-color: rgba(53, 57, 69, 0.95); } + color: #5294E2; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); 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 e3f1200..be60037 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 @@ -330,20 +330,14 @@ GtkSearchEntry.entry { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(186, 195, 207, 0.3); color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: rgba(102, 109, 132, 0.4); - background-color: #353945; } + background-color: #353945; + border-color: #23262e; } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: rgba(119, 127, 151, 0.5); - background-color: #353945; } + color: #5294E2; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); 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 e0dbb2c..249859f 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 @@ -330,20 +330,14 @@ GtkSearchEntry.entry { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(186, 195, 207, 0.3); color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: rgba(102, 109, 132, 0.4); - background-color: #353945; } + background-color: #353945; + border-color: #23262e; } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: rgba(119, 127, 151, 0.5); - background-color: #353945; } + color: #5294E2; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); 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 d2f5156..2fe72f4 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -330,20 +330,14 @@ GtkSearchEntry.entry { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(186, 195, 207, 0.3); color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: rgba(102, 109, 132, 0.4); - background-color: #353945; } + background-color: #353945; + border-color: #23262e; } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: rgba(119, 127, 151, 0.5); - background-color: #353945; } + color: #5294E2; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 7aefef5..eb43577 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -330,20 +330,14 @@ GtkSearchEntry.entry { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(186, 195, 207, 0.3); color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: rgba(102, 109, 132, 0.35); - background-color: rgba(53, 57, 69, 0.95); } + background-color: rgba(53, 57, 69, 0.95); + border-color: rgba(35, 38, 46, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: rgba(119, 127, 151, 0.45); - background-color: rgba(53, 57, 69, 0.95); } + color: #5294E2; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index 665ae6a..f97c1bc 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -437,14 +437,14 @@ $_dot_color: $selected_bg_color; } // big standalone buttons like in Documents pager &.osd { + color: $osd_fg_color; outline-color: transparentize($osd_fg_color, 0.7); - - @include button(osd); background-color: $osd_bg_color; + border-color: darken($osd_bg_color, 8%); &.image-button { padding: 10px; } - &:hover { @include button(osd-hover); background-color: $osd_bg_color; } + &:hover { color: $selected_bg_color; } &:active, &:checked { @include button(osd-active); } &:insensitive { @include button(osd-insensitive); } } 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 6eed2d8..194213a 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -328,20 +328,14 @@ GtkSearchEntry.entry { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(186, 195, 207, 0.3); color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: rgba(102, 109, 132, 0.35); - background-color: rgba(53, 57, 69, 0.95); } + background-color: rgba(53, 57, 69, 0.95); + border-color: rgba(35, 38, 46, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: rgba(119, 127, 151, 0.45); - background-color: rgba(53, 57, 69, 0.95); } + color: #5294E2; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); 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 7ad34f1..aebf17f 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -328,20 +328,14 @@ GtkSearchEntry.entry { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(186, 195, 207, 0.3); color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: rgba(102, 109, 132, 0.35); - background-color: rgba(53, 57, 69, 0.95); } + background-color: rgba(53, 57, 69, 0.95); + border-color: rgba(35, 38, 46, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: rgba(119, 127, 151, 0.45); - background-color: rgba(53, 57, 69, 0.95); } + color: #5294E2; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); 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 9dadbbd..8a92fd0 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 @@ -328,20 +328,14 @@ GtkSearchEntry.entry { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(186, 195, 207, 0.3); color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: rgba(102, 109, 132, 0.4); - background-color: #353945; } + background-color: #353945; + border-color: #23262e; } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: rgba(119, 127, 151, 0.5); - background-color: #353945; } + color: #5294E2; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); 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 e3d6c15..15cb1c4 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 @@ -328,20 +328,14 @@ GtkSearchEntry.entry { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(186, 195, 207, 0.3); color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: rgba(102, 109, 132, 0.4); - background-color: #353945; } + background-color: #353945; + border-color: #23262e; } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: rgba(119, 127, 151, 0.5); - background-color: #353945; } + color: #5294E2; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); 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 24c6232..5eed3fb 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -328,20 +328,14 @@ GtkSearchEntry.entry { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(186, 195, 207, 0.3); color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: rgba(102, 109, 132, 0.4); - background-color: #353945; } + background-color: #353945; + border-color: #23262e; } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.4); - background-color: rgba(119, 127, 151, 0.5); - background-color: #353945; } + color: #5294E2; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 24f3671..94ff0bc 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -328,20 +328,14 @@ GtkSearchEntry.entry { .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } .button.osd { - outline-color: rgba(186, 195, 207, 0.3); color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: rgba(102, 109, 132, 0.35); - background-color: rgba(53, 57, 69, 0.95); } + background-color: rgba(53, 57, 69, 0.95); + border-color: rgba(35, 38, 46, 0.95); } .button.osd.image-button { padding: 10px; } .button.osd:hover { - color: #BAC3CF; - outline-color: rgba(186, 195, 207, 0.3); - border-color: rgba(26, 28, 34, 0.35); - background-color: rgba(119, 127, 151, 0.45); - background-color: rgba(53, 57, 69, 0.95); } + color: #5294E2; } .button.osd:active, .button.osd:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 4505d9a..0cf2345 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -437,14 +437,14 @@ $_dot_color: $selected_bg_color; } // big standalone buttons like in Documents pager &.osd { + color: $osd_fg_color; outline-color: transparentize($osd_fg_color, 0.7); - - @include button(osd); background-color: $osd_bg_color; + border-color: darken($osd_bg_color, 8%); &.image-button { padding: 10px; } - &:hover { @include button(osd-hover); background-color: $osd_bg_color; } + &:hover { color: $selected_bg_color; } &:active, &:checked { @include button(osd-active); } &:insensitive { @include button(osd-insensitive); } } -- cgit v1.2.3