From 2afe04636050cc06ed48843c1ee2b852034a092e Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 15 May 2016 12:00:39 +0200 Subject: [PATCH 01/13] remove icon and text shadows from xfce panel (fix #479) --- common/gtk-3.0/3.14/gtk-dark.css | 4 +++- common/gtk-3.0/3.14/gtk-darker.css | 4 +++- common/gtk-3.0/3.14/gtk-solid-dark.css | 4 +++- common/gtk-3.0/3.14/gtk-solid-darker.css | 4 +++- common/gtk-3.0/3.14/gtk-solid.css | 4 +++- common/gtk-3.0/3.14/gtk.css | 4 +++- common/gtk-3.0/3.14/sass/_applications.scss | 3 +++ common/gtk-3.0/3.16/gtk-dark.css | 4 +++- common/gtk-3.0/3.16/gtk-darker.css | 4 +++- common/gtk-3.0/3.16/gtk-solid-dark.css | 4 +++- common/gtk-3.0/3.16/gtk-solid-darker.css | 4 +++- common/gtk-3.0/3.16/gtk-solid.css | 4 +++- common/gtk-3.0/3.16/gtk.css | 4 +++- common/gtk-3.0/3.16/sass/_applications.scss | 3 +++ common/gtk-3.0/3.18/gtk-dark.css | 4 +++- common/gtk-3.0/3.18/gtk-darker.css | 4 +++- common/gtk-3.0/3.18/gtk-solid-dark.css | 4 +++- common/gtk-3.0/3.18/gtk-solid-darker.css | 4 +++- common/gtk-3.0/3.18/gtk-solid.css | 4 +++- common/gtk-3.0/3.18/gtk.css | 4 +++- common/gtk-3.0/3.18/sass/_applications.scss | 3 +++ 21 files changed, 63 insertions(+), 18 deletions(-) diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css index 8684c90..c9b6045 100644 --- a/common/gtk-3.0/3.14/gtk-dark.css +++ b/common/gtk-3.0/3.14/gtk-dark.css @@ -3053,7 +3053,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(43, 46, 55, 0.95); } + background-color: rgba(43, 46, 55, 0.95); + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css index f259f27..2c7de68 100644 --- a/common/gtk-3.0/3.14/gtk-darker.css +++ b/common/gtk-3.0/3.14/gtk-darker.css @@ -3056,7 +3056,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(43, 46, 55, 0.95); } + background-color: rgba(43, 46, 55, 0.95); + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.14/gtk-solid-dark.css b/common/gtk-3.0/3.14/gtk-solid-dark.css index 3acb0b3..959c05b 100644 --- a/common/gtk-3.0/3.14/gtk-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-solid-dark.css @@ -3053,7 +3053,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: #2b2e37; } + background-color: #2b2e37; + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.14/gtk-solid-darker.css b/common/gtk-3.0/3.14/gtk-solid-darker.css index a529278..66d0128 100644 --- a/common/gtk-3.0/3.14/gtk-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-solid-darker.css @@ -3056,7 +3056,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: #2b2e37; } + background-color: #2b2e37; + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css index e3eb932..5176a99 100644 --- a/common/gtk-3.0/3.14/gtk-solid.css +++ b/common/gtk-3.0/3.14/gtk-solid.css @@ -3056,7 +3056,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: #2b2e37; } + background-color: #2b2e37; + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.14/gtk.css b/common/gtk-3.0/3.14/gtk.css index 838218d..d2cf4a8 100644 --- a/common/gtk-3.0/3.14/gtk.css +++ b/common/gtk-3.0/3.14/gtk.css @@ -3056,7 +3056,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(43, 46, 55, 0.95); } + background-color: rgba(43, 46, 55, 0.95); + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.14/sass/_applications.scss b/common/gtk-3.0/3.14/sass/_applications.scss index 3095a78..b40945d 100644 --- a/common/gtk-3.0/3.14/sass/_applications.scss +++ b/common/gtk-3.0/3.14/sass/_applications.scss @@ -491,6 +491,9 @@ ClockBox { .xfce4-panel.panel { background-color: $panel_bg; + text-shadow: none; + icon-shadow: none; + .button.flat { color: $panel_fg; background-color: transparentize($panel_bg, 1); diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css index f70748b..6d9e12a 100644 --- a/common/gtk-3.0/3.16/gtk-dark.css +++ b/common/gtk-3.0/3.16/gtk-dark.css @@ -2930,7 +2930,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(43, 46, 55, 0.95); } + background-color: rgba(43, 46, 55, 0.95); + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css index 242c208..7834b22 100644 --- a/common/gtk-3.0/3.16/gtk-darker.css +++ b/common/gtk-3.0/3.16/gtk-darker.css @@ -2933,7 +2933,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(43, 46, 55, 0.95); } + background-color: rgba(43, 46, 55, 0.95); + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.16/gtk-solid-dark.css b/common/gtk-3.0/3.16/gtk-solid-dark.css index e88b789..cad7d78 100644 --- a/common/gtk-3.0/3.16/gtk-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-solid-dark.css @@ -2930,7 +2930,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: #2b2e37; } + background-color: #2b2e37; + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.16/gtk-solid-darker.css b/common/gtk-3.0/3.16/gtk-solid-darker.css index 470d40f..ffe71d5 100644 --- a/common/gtk-3.0/3.16/gtk-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-solid-darker.css @@ -2933,7 +2933,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: #2b2e37; } + background-color: #2b2e37; + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css index bc3bf76..83c828f 100644 --- a/common/gtk-3.0/3.16/gtk-solid.css +++ b/common/gtk-3.0/3.16/gtk-solid.css @@ -2933,7 +2933,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: #2b2e37; } + background-color: #2b2e37; + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css index 2c43a27..1326f87 100644 --- a/common/gtk-3.0/3.16/gtk.css +++ b/common/gtk-3.0/3.16/gtk.css @@ -2933,7 +2933,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(43, 46, 55, 0.95); } + background-color: rgba(43, 46, 55, 0.95); + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.16/sass/_applications.scss b/common/gtk-3.0/3.16/sass/_applications.scss index abb8cf1..bfcee21 100644 --- a/common/gtk-3.0/3.16/sass/_applications.scss +++ b/common/gtk-3.0/3.16/sass/_applications.scss @@ -542,6 +542,9 @@ ClockBox { .xfce4-panel.panel { background-color: $panel_bg; + text-shadow: none; + icon-shadow: none; + .button.flat { color: $panel_fg; background-color: transparentize($panel_bg, 1); diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index 1d4ef57..9364445 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -3085,7 +3085,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(43, 46, 55, 0.95); } + background-color: rgba(43, 46, 55, 0.95); + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index e2a1fad..14bac0f 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -3088,7 +3088,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(43, 46, 55, 0.95); } + background-color: rgba(43, 46, 55, 0.95); + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index d5a4214..411ea48 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -3085,7 +3085,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: #2b2e37; } + background-color: #2b2e37; + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index 258b29a..a172754 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -3088,7 +3088,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: #2b2e37; } + background-color: #2b2e37; + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index 6f8e832..46f48e1 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -3092,7 +3092,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: #2b2e37; } + background-color: #2b2e37; + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index 9fb09b8..f409ee1 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -3092,7 +3092,9 @@ ClockBox { color: #BAC3CF; } .xfce4-panel.panel { - background-color: rgba(43, 46, 55, 0.95); } + background-color: rgba(43, 46, 55, 0.95); + text-shadow: none; + icon-shadow: none; } .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button { color: #BAC3CF; background-color: rgba(43, 46, 55, 0); diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss index 9d28629..d0c7ff8 100644 --- a/common/gtk-3.0/3.18/sass/_applications.scss +++ b/common/gtk-3.0/3.18/sass/_applications.scss @@ -589,6 +589,9 @@ ClockBox { .xfce4-panel.panel { background-color: $panel_bg; + text-shadow: none; + icon-shadow: none; + .button.flat { color: $panel_fg; background-color: transparentize($panel_bg, 1); From c59e323f2a18d750faf7086e58587d31522a8b38 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 15 May 2016 12:10:09 +0200 Subject: [PATCH 02/13] xfce: fix top menu applet (#155) --- common/gtk-2.0/panel.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/common/gtk-2.0/panel.rc b/common/gtk-2.0/panel.rc index 212c704..b2c2352 100644 --- a/common/gtk-2.0/panel.rc +++ b/common/gtk-2.0/panel.rc @@ -159,6 +159,7 @@ widget_class "*Notif*Brasero*" style "theme-panel" widget "*Xfce*Panel*" style "theme-panel" class "*Xfce*Panel*" style "theme-panel" widget "*WnckPager*" style "workspace-switcher" +widget "*TopMenu*" style "theme-panel" # Fix gtk-entries in the panel widget "*bookmark*GtkEntry" style "panel-entry" # fixes smartbookmark-plugin From c6262bb98d21a1219e70bc4b6aa6fb56c62a3a1b Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 15 May 2016 15:59:36 +0200 Subject: [PATCH 03/13] 3.20: add mate-panel support (#524) --- common/gtk-3.0/3.20/gtk-dark.css | 81 +++++++++-- common/gtk-3.0/3.20/gtk-darker.css | 81 +++++++++-- common/gtk-3.0/3.20/gtk-solid-dark.css | 81 +++++++++-- common/gtk-3.0/3.20/gtk-solid-darker.css | 81 +++++++++-- common/gtk-3.0/3.20/gtk-solid.css | 81 +++++++++-- common/gtk-3.0/3.20/gtk.css | 81 +++++++++-- common/gtk-3.0/3.20/sass/_applications.scss | 145 ++++++++++---------- 7 files changed, 487 insertions(+), 144 deletions(-) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 2cf0003..8af8dd6 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -3389,22 +3389,79 @@ button.documents-favorite:active:hover { .tr-workarea overshoot { border-color: transparent; } +.gnome-panel-menu-bar, .gnome-panel-menu-bar menubar, +.mate-panel-menu-bar, +.mate-panel-menu-bar menubar { + background-color: rgba(43, 46, 55, 0.95); } + +.gnome-panel-menu-bar menubar, +.gnome-panel-menu-bar #PanelApplet label, +.gnome-panel-menu-bar #PanelApplet image, +.mate-panel-menu-bar menubar, +.mate-panel-menu-bar #PanelApplet label, +.mate-panel-menu-bar #PanelApplet image { + color: #BAC3CF; } + +.gnome-panel-menu-bar button label, .gnome-panel-menu-bar button image, +.gnome-panel-menu-bar #tasklist-button label, +.gnome-panel-menu-bar #tasklist-button image, +.mate-panel-menu-bar button label, +.mate-panel-menu-bar button image, +.mate-panel-menu-bar #tasklist-button label, +.mate-panel-menu-bar #tasklist-button image { + color: inherit; } + +.gnome-panel-menu-bar .wnck-pager, +.mate-panel-menu-bar .wnck-pager { + color: #5d6268; + background-color: rgba(20, 22, 27, 0.95); } + .gnome-panel-menu-bar .wnck-pager:hover, + .mate-panel-menu-bar .wnck-pager:hover { + background-color: rgba(54, 58, 70, 0.95); } + .gnome-panel-menu-bar .wnck-pager:selected, + .mate-panel-menu-bar .wnck-pager:selected { + color: #a9caf1; + background-color: #5294E2; } + +.gnome-panel-menu-bar na-tray-applet, +.mate-panel-menu-bar na-tray-applet { + -NaTrayApplet-icon-padding: 0; + -NaTrayApplet-icon-size: 16px; } + .xfce4-panel.panel { background-color: rgba(43, 46, 55, 0.95); text-shadow: none; -gtk-icon-shadow: none; } - .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button { - color: #BAC3CF; - background-color: rgba(43, 46, 55, 0); - border-radius: 0; - border: none; } - .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover { - border: none; - background-color: rgba(65, 70, 84, 0.95); } - .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked { - color: #ffffff; - border: none; - background-color: #5294E2; } + +#tasklist-button { + color: rgba(186, 195, 207, 0.8); + border-radius: 0; + border: none; + background-color: rgba(43, 46, 55, 0); } + #tasklist-button:hover { + color: #d8dde4; + background-color: rgba(0, 0, 0, 0.17); } + #tasklist-button:checked { + color: #ffffff; + background-color: rgba(0, 0, 0, 0.25); + box-shadow: inset 0 -2px #5294E2; } + +.gnome-panel-menu-bar button:not(#tasklist-button), +.mate-panel-menu-bar button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button { + color: #BAC3CF; + border-radius: 0; + border: none; + background-color: rgba(43, 46, 55, 0); } + .gnome-panel-menu-bar button:hover:not(#tasklist-button), + .mate-panel-menu-bar button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover { + border: none; + background-color: rgba(65, 70, 84, 0.95); } + .gnome-panel-menu-bar button:active:not(#tasklist-button), + .mate-panel-menu-bar button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .gnome-panel-menu-bar button:checked:not(#tasklist-button), + .mate-panel-menu-bar button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked { + color: #ffffff; + border: none; + background-color: #5294E2; } .nautilus-window .floating-bar { padding: 1px; diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index ba652bb..e995d5b 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -3387,22 +3387,79 @@ button.documents-favorite:active:hover { .tr-workarea overshoot { border-color: transparent; } +.gnome-panel-menu-bar, .gnome-panel-menu-bar menubar, +.mate-panel-menu-bar, +.mate-panel-menu-bar menubar { + background-color: rgba(43, 46, 55, 0.95); } + +.gnome-panel-menu-bar menubar, +.gnome-panel-menu-bar #PanelApplet label, +.gnome-panel-menu-bar #PanelApplet image, +.mate-panel-menu-bar menubar, +.mate-panel-menu-bar #PanelApplet label, +.mate-panel-menu-bar #PanelApplet image { + color: #BAC3CF; } + +.gnome-panel-menu-bar button label, .gnome-panel-menu-bar button image, +.gnome-panel-menu-bar #tasklist-button label, +.gnome-panel-menu-bar #tasklist-button image, +.mate-panel-menu-bar button label, +.mate-panel-menu-bar button image, +.mate-panel-menu-bar #tasklist-button label, +.mate-panel-menu-bar #tasklist-button image { + color: inherit; } + +.gnome-panel-menu-bar .wnck-pager, +.mate-panel-menu-bar .wnck-pager { + color: #5d6268; + background-color: rgba(20, 22, 27, 0.95); } + .gnome-panel-menu-bar .wnck-pager:hover, + .mate-panel-menu-bar .wnck-pager:hover { + background-color: rgba(54, 58, 70, 0.95); } + .gnome-panel-menu-bar .wnck-pager:selected, + .mate-panel-menu-bar .wnck-pager:selected { + color: #a9caf1; + background-color: #5294E2; } + +.gnome-panel-menu-bar na-tray-applet, +.mate-panel-menu-bar na-tray-applet { + -NaTrayApplet-icon-padding: 0; + -NaTrayApplet-icon-size: 16px; } + .xfce4-panel.panel { background-color: rgba(43, 46, 55, 0.95); text-shadow: none; -gtk-icon-shadow: none; } - .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button { - color: #BAC3CF; - background-color: rgba(43, 46, 55, 0); - border-radius: 0; - border: none; } - .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover { - border: none; - background-color: rgba(65, 70, 84, 0.95); } - .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked { - color: #ffffff; - border: none; - background-color: #5294E2; } + +#tasklist-button { + color: rgba(186, 195, 207, 0.8); + border-radius: 0; + border: none; + background-color: rgba(43, 46, 55, 0); } + #tasklist-button:hover { + color: #d8dde4; + background-color: rgba(0, 0, 0, 0.17); } + #tasklist-button:checked { + color: #ffffff; + background-color: rgba(0, 0, 0, 0.25); + box-shadow: inset 0 -2px #5294E2; } + +.gnome-panel-menu-bar button:not(#tasklist-button), +.mate-panel-menu-bar button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button { + color: #BAC3CF; + border-radius: 0; + border: none; + background-color: rgba(43, 46, 55, 0); } + .gnome-panel-menu-bar button:hover:not(#tasklist-button), + .mate-panel-menu-bar button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover { + border: none; + background-color: rgba(65, 70, 84, 0.95); } + .gnome-panel-menu-bar button:active:not(#tasklist-button), + .mate-panel-menu-bar button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .gnome-panel-menu-bar button:checked:not(#tasklist-button), + .mate-panel-menu-bar button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked { + color: #ffffff; + border: none; + background-color: #5294E2; } .nautilus-window .floating-bar { padding: 1px; diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 82eb666..1f3bf15 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -3389,22 +3389,79 @@ button.documents-favorite:active:hover { .tr-workarea overshoot { border-color: transparent; } +.gnome-panel-menu-bar, .gnome-panel-menu-bar menubar, +.mate-panel-menu-bar, +.mate-panel-menu-bar menubar { + background-color: #2b2e37; } + +.gnome-panel-menu-bar menubar, +.gnome-panel-menu-bar #PanelApplet label, +.gnome-panel-menu-bar #PanelApplet image, +.mate-panel-menu-bar menubar, +.mate-panel-menu-bar #PanelApplet label, +.mate-panel-menu-bar #PanelApplet image { + color: #BAC3CF; } + +.gnome-panel-menu-bar button label, .gnome-panel-menu-bar button image, +.gnome-panel-menu-bar #tasklist-button label, +.gnome-panel-menu-bar #tasklist-button image, +.mate-panel-menu-bar button label, +.mate-panel-menu-bar button image, +.mate-panel-menu-bar #tasklist-button label, +.mate-panel-menu-bar #tasklist-button image { + color: inherit; } + +.gnome-panel-menu-bar .wnck-pager, +.mate-panel-menu-bar .wnck-pager { + color: #5d6268; + background-color: #14161b; } + .gnome-panel-menu-bar .wnck-pager:hover, + .mate-panel-menu-bar .wnck-pager:hover { + background-color: #363a46; } + .gnome-panel-menu-bar .wnck-pager:selected, + .mate-panel-menu-bar .wnck-pager:selected { + color: #a9caf1; + background-color: #5294E2; } + +.gnome-panel-menu-bar na-tray-applet, +.mate-panel-menu-bar na-tray-applet { + -NaTrayApplet-icon-padding: 0; + -NaTrayApplet-icon-size: 16px; } + .xfce4-panel.panel { background-color: #2b2e37; text-shadow: none; -gtk-icon-shadow: none; } - .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button { - color: #BAC3CF; - background-color: rgba(43, 46, 55, 0); - border-radius: 0; - border: none; } - .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover { - border: none; - background-color: #414654; } - .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked { - color: #ffffff; - border: none; - background-color: #5294E2; } + +#tasklist-button { + color: rgba(186, 195, 207, 0.8); + border-radius: 0; + border: none; + background-color: rgba(43, 46, 55, 0); } + #tasklist-button:hover { + color: #d8dde4; + background-color: rgba(0, 0, 0, 0.17); } + #tasklist-button:checked { + color: #ffffff; + background-color: rgba(0, 0, 0, 0.25); + box-shadow: inset 0 -2px #5294E2; } + +.gnome-panel-menu-bar button:not(#tasklist-button), +.mate-panel-menu-bar button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button { + color: #BAC3CF; + border-radius: 0; + border: none; + background-color: rgba(43, 46, 55, 0); } + .gnome-panel-menu-bar button:hover:not(#tasklist-button), + .mate-panel-menu-bar button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover { + border: none; + background-color: #414654; } + .gnome-panel-menu-bar button:active:not(#tasklist-button), + .mate-panel-menu-bar button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .gnome-panel-menu-bar button:checked:not(#tasklist-button), + .mate-panel-menu-bar button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked { + color: #ffffff; + border: none; + background-color: #5294E2; } .nautilus-window .floating-bar { padding: 1px; diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index c5b9b72..d30427c 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -3387,22 +3387,79 @@ button.documents-favorite:active:hover { .tr-workarea overshoot { border-color: transparent; } +.gnome-panel-menu-bar, .gnome-panel-menu-bar menubar, +.mate-panel-menu-bar, +.mate-panel-menu-bar menubar { + background-color: #2b2e37; } + +.gnome-panel-menu-bar menubar, +.gnome-panel-menu-bar #PanelApplet label, +.gnome-panel-menu-bar #PanelApplet image, +.mate-panel-menu-bar menubar, +.mate-panel-menu-bar #PanelApplet label, +.mate-panel-menu-bar #PanelApplet image { + color: #BAC3CF; } + +.gnome-panel-menu-bar button label, .gnome-panel-menu-bar button image, +.gnome-panel-menu-bar #tasklist-button label, +.gnome-panel-menu-bar #tasklist-button image, +.mate-panel-menu-bar button label, +.mate-panel-menu-bar button image, +.mate-panel-menu-bar #tasklist-button label, +.mate-panel-menu-bar #tasklist-button image { + color: inherit; } + +.gnome-panel-menu-bar .wnck-pager, +.mate-panel-menu-bar .wnck-pager { + color: #5d6268; + background-color: #14161b; } + .gnome-panel-menu-bar .wnck-pager:hover, + .mate-panel-menu-bar .wnck-pager:hover { + background-color: #363a46; } + .gnome-panel-menu-bar .wnck-pager:selected, + .mate-panel-menu-bar .wnck-pager:selected { + color: #a9caf1; + background-color: #5294E2; } + +.gnome-panel-menu-bar na-tray-applet, +.mate-panel-menu-bar na-tray-applet { + -NaTrayApplet-icon-padding: 0; + -NaTrayApplet-icon-size: 16px; } + .xfce4-panel.panel { background-color: #2b2e37; text-shadow: none; -gtk-icon-shadow: none; } - .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button { - color: #BAC3CF; - background-color: rgba(43, 46, 55, 0); - border-radius: 0; - border: none; } - .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover { - border: none; - background-color: #414654; } - .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked { - color: #ffffff; - border: none; - background-color: #5294E2; } + +#tasklist-button { + color: rgba(186, 195, 207, 0.8); + border-radius: 0; + border: none; + background-color: rgba(43, 46, 55, 0); } + #tasklist-button:hover { + color: #d8dde4; + background-color: rgba(0, 0, 0, 0.17); } + #tasklist-button:checked { + color: #ffffff; + background-color: rgba(0, 0, 0, 0.25); + box-shadow: inset 0 -2px #5294E2; } + +.gnome-panel-menu-bar button:not(#tasklist-button), +.mate-panel-menu-bar button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button { + color: #BAC3CF; + border-radius: 0; + border: none; + background-color: rgba(43, 46, 55, 0); } + .gnome-panel-menu-bar button:hover:not(#tasklist-button), + .mate-panel-menu-bar button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover { + border: none; + background-color: #414654; } + .gnome-panel-menu-bar button:active:not(#tasklist-button), + .mate-panel-menu-bar button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .gnome-panel-menu-bar button:checked:not(#tasklist-button), + .mate-panel-menu-bar button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked { + color: #ffffff; + border: none; + background-color: #5294E2; } .nautilus-window .floating-bar { padding: 1px; diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 4edd832..5d87391 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -3391,22 +3391,79 @@ button.documents-favorite:active:hover { .tr-workarea overshoot { border-color: transparent; } +.gnome-panel-menu-bar, .gnome-panel-menu-bar menubar, +.mate-panel-menu-bar, +.mate-panel-menu-bar menubar { + background-color: #2b2e37; } + +.gnome-panel-menu-bar menubar, +.gnome-panel-menu-bar #PanelApplet label, +.gnome-panel-menu-bar #PanelApplet image, +.mate-panel-menu-bar menubar, +.mate-panel-menu-bar #PanelApplet label, +.mate-panel-menu-bar #PanelApplet image { + color: #BAC3CF; } + +.gnome-panel-menu-bar button label, .gnome-panel-menu-bar button image, +.gnome-panel-menu-bar #tasklist-button label, +.gnome-panel-menu-bar #tasklist-button image, +.mate-panel-menu-bar button label, +.mate-panel-menu-bar button image, +.mate-panel-menu-bar #tasklist-button label, +.mate-panel-menu-bar #tasklist-button image { + color: inherit; } + +.gnome-panel-menu-bar .wnck-pager, +.mate-panel-menu-bar .wnck-pager { + color: #5d6268; + background-color: #14161b; } + .gnome-panel-menu-bar .wnck-pager:hover, + .mate-panel-menu-bar .wnck-pager:hover { + background-color: #363a46; } + .gnome-panel-menu-bar .wnck-pager:selected, + .mate-panel-menu-bar .wnck-pager:selected { + color: #a9caf1; + background-color: #5294E2; } + +.gnome-panel-menu-bar na-tray-applet, +.mate-panel-menu-bar na-tray-applet { + -NaTrayApplet-icon-padding: 0; + -NaTrayApplet-icon-size: 16px; } + .xfce4-panel.panel { background-color: #2b2e37; text-shadow: none; -gtk-icon-shadow: none; } - .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button { - color: #BAC3CF; - background-color: rgba(43, 46, 55, 0); - border-radius: 0; - border: none; } - .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover { - border: none; - background-color: #414654; } - .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked { - color: #ffffff; - border: none; - background-color: #5294E2; } + +#tasklist-button { + color: rgba(186, 195, 207, 0.8); + border-radius: 0; + border: none; + background-color: rgba(43, 46, 55, 0); } + #tasklist-button:hover { + color: #d8dde4; + background-color: rgba(0, 0, 0, 0.17); } + #tasklist-button:checked { + color: #ffffff; + background-color: rgba(0, 0, 0, 0.25); + box-shadow: inset 0 -2px #5294E2; } + +.gnome-panel-menu-bar button:not(#tasklist-button), +.mate-panel-menu-bar button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button { + color: #BAC3CF; + border-radius: 0; + border: none; + background-color: rgba(43, 46, 55, 0); } + .gnome-panel-menu-bar button:hover:not(#tasklist-button), + .mate-panel-menu-bar button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover { + border: none; + background-color: #414654; } + .gnome-panel-menu-bar button:active:not(#tasklist-button), + .mate-panel-menu-bar button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .gnome-panel-menu-bar button:checked:not(#tasklist-button), + .mate-panel-menu-bar button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked { + color: #ffffff; + border: none; + background-color: #5294E2; } .nautilus-window .floating-bar { padding: 1px; diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 0ff3d6b..39bc725 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -3391,22 +3391,79 @@ button.documents-favorite:active:hover { .tr-workarea overshoot { border-color: transparent; } +.gnome-panel-menu-bar, .gnome-panel-menu-bar menubar, +.mate-panel-menu-bar, +.mate-panel-menu-bar menubar { + background-color: rgba(43, 46, 55, 0.95); } + +.gnome-panel-menu-bar menubar, +.gnome-panel-menu-bar #PanelApplet label, +.gnome-panel-menu-bar #PanelApplet image, +.mate-panel-menu-bar menubar, +.mate-panel-menu-bar #PanelApplet label, +.mate-panel-menu-bar #PanelApplet image { + color: #BAC3CF; } + +.gnome-panel-menu-bar button label, .gnome-panel-menu-bar button image, +.gnome-panel-menu-bar #tasklist-button label, +.gnome-panel-menu-bar #tasklist-button image, +.mate-panel-menu-bar button label, +.mate-panel-menu-bar button image, +.mate-panel-menu-bar #tasklist-button label, +.mate-panel-menu-bar #tasklist-button image { + color: inherit; } + +.gnome-panel-menu-bar .wnck-pager, +.mate-panel-menu-bar .wnck-pager { + color: #5d6268; + background-color: rgba(20, 22, 27, 0.95); } + .gnome-panel-menu-bar .wnck-pager:hover, + .mate-panel-menu-bar .wnck-pager:hover { + background-color: rgba(54, 58, 70, 0.95); } + .gnome-panel-menu-bar .wnck-pager:selected, + .mate-panel-menu-bar .wnck-pager:selected { + color: #a9caf1; + background-color: #5294E2; } + +.gnome-panel-menu-bar na-tray-applet, +.mate-panel-menu-bar na-tray-applet { + -NaTrayApplet-icon-padding: 0; + -NaTrayApplet-icon-size: 16px; } + .xfce4-panel.panel { background-color: rgba(43, 46, 55, 0.95); text-shadow: none; -gtk-icon-shadow: none; } - .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button { - color: #BAC3CF; - background-color: rgba(43, 46, 55, 0); - border-radius: 0; - border: none; } - .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover { - border: none; - background-color: rgba(65, 70, 84, 0.95); } - .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked { - color: #ffffff; - border: none; - background-color: #5294E2; } + +#tasklist-button { + color: rgba(186, 195, 207, 0.8); + border-radius: 0; + border: none; + background-color: rgba(43, 46, 55, 0); } + #tasklist-button:hover { + color: #d8dde4; + background-color: rgba(0, 0, 0, 0.17); } + #tasklist-button:checked { + color: #ffffff; + background-color: rgba(0, 0, 0, 0.25); + box-shadow: inset 0 -2px #5294E2; } + +.gnome-panel-menu-bar button:not(#tasklist-button), +.mate-panel-menu-bar button:not(#tasklist-button), .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button { + color: #BAC3CF; + border-radius: 0; + border: none; + background-color: rgba(43, 46, 55, 0); } + .gnome-panel-menu-bar button:hover:not(#tasklist-button), + .mate-panel-menu-bar button:hover:not(#tasklist-button), .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover { + border: none; + background-color: rgba(65, 70, 84, 0.95); } + .gnome-panel-menu-bar button:active:not(#tasklist-button), + .mate-panel-menu-bar button:active:not(#tasklist-button), .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.sidebar-button:active, .gnome-panel-menu-bar button:checked:not(#tasklist-button), + .mate-panel-menu-bar button:checked:not(#tasklist-button), .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:checked { + color: #ffffff; + border: none; + background-color: #5294E2; } .nautilus-window .floating-bar { padding: 1px; diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss index c709235..df98b94 100644 --- a/common/gtk-3.0/3.20/sass/_applications.scss +++ b/common/gtk-3.0/3.20/sass/_applications.scss @@ -396,65 +396,46 @@ button.documents-favorite:active:hover { } // -// Fallback Mode/Budgie Panel +// Mate/Gnome Flashback Panel // -//.gnome-panel-menu-bar, -//PanelApplet > menubar, -//PanelToplevel, -//PanelWidget, -//PanelAppletFrame, -//PanelApplet { -// color: $panel_fg; -// background-image: linear-gradient(to bottom, $panel_bg); -//} -// -//PanelApplet button, PanelApplet button:backdrop { -// padding: 4px; -// border: 2px solid transparent; -// border-radius: 0; -// background-image: none; -// background-color: transparent; -// color: $panel_fg; -//} -// -//PanelApplet button:hover { -// color: lighten($panel_fg, 10%); -// background-color: transparentize(black, 0.83); -// border-color: transparentize(black, 0.83); -//} -// -//PanelApplet button:active, PanelApplet button:active:backdrop, -//PanelApplet button:checked, PanelApplet button:checked:backdrop { -// background-clip: padding-box; -// color: $selected_fg_color; -// background-color: transparentize(black, 0.75); -// border-radius: 0; -// border-color: transparentize(black, 0.75); -// box-shadow: inset 0 -2px $selected_bg_color; -//} -// -//PanelApplet:hover { -// color: $selected_fg_color; -//} -// -//PanelApplet:active, -//PanelApplet:hover:active { -// color: $selected_bg_color; -//} -// -//WnckPager { -// color: mix($panel_fg, black, 50%); -// &:selected { color: $selected_bg_color } -//} -// -//NaTrayApplet { -// -NaTrayApplet-icon-padding: 12; -// -NaTrayApplet-icon-size: 16; -//} -// -//ClockBox { -// color: $panel_fg; -//} +.gnome-panel-menu-bar, +.mate-panel-menu-bar { + + &, menubar { background-color: $panel_bg; } + + menubar, + #PanelApplet label, + #PanelApplet image { color: $panel_fg; } + + // Panel buttons + button:not(#tasklist-button) { + @extend %panelbutton; + } + + button, + #tasklist-button { + label, image { color: inherit; } + } + + .wnck-pager { + color: mix($panel_fg, black, 50%); + background-color: darken($panel_bg, 10%); + + &:hover { + background-color: lighten($panel_bg, 5%); + } + + &:selected { + color: lighten($selected_bg_color, 20%); + background-color: $selected_bg_color; + } + } + + na-tray-applet { + -NaTrayApplet-icon-padding: 0; + -NaTrayApplet-icon-size: 16px; + } +} // Xfce Panel .xfce4-panel.panel { @@ -463,21 +444,41 @@ button.documents-favorite:active:hover { text-shadow: none; -gtk-icon-shadow: none; - button.flat { - color: $panel_fg; - background-color: transparentize($panel_bg, 1); - border-radius: 0; - border: none; + button.flat { @extend %panelbutton; } +} - &:hover { - border: none; - background-color: lighten($panel_bg, 10%); - } - &:active, &:checked { - color: $selected_fg_color; - border: none; - background-color: $selected_bg_color; - } +#tasklist-button { + color: transparentize($panel_fg, 0.2); + border-radius: 0; + border: none; + background-color: transparentize($panel_bg, 1); + + &:hover { + color: lighten($panel_fg, 10%); + background-color: transparentize(black, 0.83); + } + + &:checked { + color: $selected_fg_color; + background-color: transparentize(black, 0.75); + box-shadow: inset 0 -2px $selected_bg_color; + } +} + +%panelbutton { + color: $panel_fg; + border-radius: 0; + border: none; + background-color: transparentize($panel_bg, 1); + + &:hover { + border: none; + background-color: lighten($panel_bg, 10%); + } + &:active, &:checked { + color: $selected_fg_color; + border: none; + background-color: $selected_bg_color; } } From 0a34ab5e8ec86b58c90939e9fe93a6ee470ce0f9 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 15 May 2016 16:38:40 +0200 Subject: [PATCH 04/13] 3.20: caja fixes --- common/gtk-3.0/3.20/gtk-dark.css | 9 +++++---- common/gtk-3.0/3.20/gtk-darker.css | 9 +++++---- common/gtk-3.0/3.20/gtk-solid-dark.css | 9 +++++---- common/gtk-3.0/3.20/gtk-solid-darker.css | 9 +++++---- common/gtk-3.0/3.20/gtk-solid.css | 9 +++++---- common/gtk-3.0/3.20/gtk.css | 9 +++++---- common/gtk-3.0/3.20/sass/_applications.scss | 14 +++++++++++++- 7 files changed, 43 insertions(+), 25 deletions(-) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 8af8dd6..e8de0f8 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -3104,13 +3104,14 @@ terminal-window notebook > header.top { .nautilus-canvas-item { border-radius: 2px; } -.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item { +.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item, .caja-desktop { color: #ffffff; text-shadow: 1px 1px rgba(0, 0, 0, 0.6); } - .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active { + .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active, .caja-desktop:active { color: #D3DAE3; } - .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected { - color: #ffffff; } + .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected, .caja-desktop:selected { + color: #ffffff; + text-shadow: none; } .nautilus-canvas-item.dim-label, label.nautilus-canvas-item.separator, popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-canvas-item.subtitle, .titlebar:not(headerbar) .nautilus-canvas-item.subtitle, diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index e995d5b..debb117 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -3103,13 +3103,14 @@ terminal-window notebook > header.top { .nautilus-canvas-item { border-radius: 2px; } -.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item { +.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item, .caja-desktop { color: #ffffff; text-shadow: 1px 1px rgba(0, 0, 0, 0.6); } - .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active { + .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active, .caja-desktop:active { color: #5c616c; } - .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected { - color: #ffffff; } + .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected, .caja-desktop:selected { + color: #ffffff; + text-shadow: none; } .nautilus-canvas-item.dim-label, label.nautilus-canvas-item.separator, popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-canvas-item.subtitle, .titlebar:not(headerbar) .nautilus-canvas-item.subtitle, diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 1f3bf15..9cf71fe 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -3104,13 +3104,14 @@ terminal-window notebook > header.top { .nautilus-canvas-item { border-radius: 2px; } -.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item { +.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item, .caja-desktop { color: #ffffff; text-shadow: 1px 1px rgba(0, 0, 0, 0.6); } - .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active { + .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active, .caja-desktop:active { color: #D3DAE3; } - .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected { - color: #ffffff; } + .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected, .caja-desktop:selected { + color: #ffffff; + text-shadow: none; } .nautilus-canvas-item.dim-label, label.nautilus-canvas-item.separator, popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-canvas-item.subtitle, .titlebar:not(headerbar) .nautilus-canvas-item.subtitle, diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index d30427c..5fa5374 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -3103,13 +3103,14 @@ terminal-window notebook > header.top { .nautilus-canvas-item { border-radius: 2px; } -.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item { +.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item, .caja-desktop { color: #ffffff; text-shadow: 1px 1px rgba(0, 0, 0, 0.6); } - .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active { + .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active, .caja-desktop:active { color: #5c616c; } - .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected { - color: #ffffff; } + .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected, .caja-desktop:selected { + color: #ffffff; + text-shadow: none; } .nautilus-canvas-item.dim-label, label.nautilus-canvas-item.separator, popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-canvas-item.subtitle, .titlebar:not(headerbar) .nautilus-canvas-item.subtitle, diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 5d87391..ae2e922 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -3107,13 +3107,14 @@ terminal-window notebook > header.top { .nautilus-canvas-item { border-radius: 2px; } -.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item { +.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item, .caja-desktop { color: #ffffff; text-shadow: 1px 1px rgba(0, 0, 0, 0.6); } - .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active { + .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active, .caja-desktop:active { color: #5c616c; } - .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected { - color: #ffffff; } + .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected, .caja-desktop:selected { + color: #ffffff; + text-shadow: none; } .nautilus-canvas-item.dim-label, label.nautilus-canvas-item.separator, popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-canvas-item.subtitle, .titlebar:not(headerbar) .nautilus-canvas-item.subtitle, diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 39bc725..6957036 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -3107,13 +3107,14 @@ terminal-window notebook > header.top { .nautilus-canvas-item { border-radius: 2px; } -.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item { +.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item, .caja-desktop { color: #ffffff; text-shadow: 1px 1px rgba(0, 0, 0, 0.6); } - .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active { + .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active, .caja-desktop:active { color: #5c616c; } - .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected { - color: #ffffff; } + .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected, .caja-desktop:selected { + color: #ffffff; + text-shadow: none; } .nautilus-canvas-item.dim-label, label.nautilus-canvas-item.separator, popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-canvas-item.subtitle, .titlebar:not(headerbar) .nautilus-canvas-item.subtitle, diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss index df98b94..2a78643 100644 --- a/common/gtk-3.0/3.20/sass/_applications.scss +++ b/common/gtk-3.0/3.20/sass/_applications.scss @@ -39,7 +39,11 @@ terminal-window { text-shadow: 1px 1px transparentize(black, 0.4); &:active { color: $fg_color; } - &:selected { color: $selected_fg_color; } + + &:selected { + color: $selected_fg_color; + text-shadow: none; + } } .nautilus-canvas-item.dim-label, @@ -142,6 +146,14 @@ $disk_space_free: darken($bg_color, 3%); } } +// +// Caja +// +.caja-desktop { @extend .nautilus-desktop.nautilus-canvas-item; } + +.caja-side-pane scrolledwindow.frame, +.caja-notebook scrolledwindow.frame { border-width: 1px 0; } + // // Gedit // From 98360ab3818c80213362043dbf9ff621a993739d Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 15 May 2016 16:47:40 +0200 Subject: [PATCH 05/13] fix the last commit --- common/gtk-3.0/3.20/gtk-dark.css | 4 ++++ common/gtk-3.0/3.20/gtk-darker.css | 4 ++++ common/gtk-3.0/3.20/gtk-solid-dark.css | 4 ++++ common/gtk-3.0/3.20/gtk-solid-darker.css | 4 ++++ common/gtk-3.0/3.20/gtk-solid.css | 4 ++++ common/gtk-3.0/3.20/gtk.css | 4 ++++ common/gtk-3.0/3.20/sass/_applications.scss | 4 ++-- 7 files changed, 26 insertions(+), 2 deletions(-) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index e8de0f8..0cd308e 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -3211,6 +3211,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } +.caja-side-pane .frame, +.caja-notebook .frame { + border-width: 1px 0; } + .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; border-color: #404552; } diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index debb117..9d46ddc 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -3209,6 +3209,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } +.caja-side-pane .frame, +.caja-notebook .frame { + border-width: 1px 0; } + .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; border-color: #ffffff; } diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 9cf71fe..e9ce342 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -3211,6 +3211,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } +.caja-side-pane .frame, +.caja-notebook .frame { + border-width: 1px 0; } + .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; border-color: #404552; } diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index 5fa5374..76a62ba 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -3209,6 +3209,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } +.caja-side-pane .frame, +.caja-notebook .frame { + border-width: 1px 0; } + .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; border-color: #ffffff; } diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index ae2e922..b8947bd 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -3213,6 +3213,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } +.caja-side-pane .frame, +.caja-notebook .frame { + border-width: 1px 0; } + .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; border-color: #ffffff; } diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 6957036..b0e5a63 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -3213,6 +3213,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } +.caja-side-pane .frame, +.caja-notebook .frame { + border-width: 1px 0; } + .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; border-color: #ffffff; } diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss index 2a78643..817defb 100644 --- a/common/gtk-3.0/3.20/sass/_applications.scss +++ b/common/gtk-3.0/3.20/sass/_applications.scss @@ -151,8 +151,8 @@ $disk_space_free: darken($bg_color, 3%); // .caja-desktop { @extend .nautilus-desktop.nautilus-canvas-item; } -.caja-side-pane scrolledwindow.frame, -.caja-notebook scrolledwindow.frame { border-width: 1px 0; } +.caja-side-pane .frame, +.caja-notebook .frame { border-width: 1px 0; } // // Gedit From cc20a2e3217b475f5f60faaa48c5c3b101607135 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 15 May 2016 21:30:55 +0200 Subject: [PATCH 06/13] 3.20: dark sidebars style for caja --- common/gtk-3.0/3.20/gtk-dark.css | 72 ++++++++++++------- common/gtk-3.0/3.20/gtk-darker.css | 72 ++++++++++++------- common/gtk-3.0/3.20/gtk-solid-dark.css | 72 ++++++++++++------- common/gtk-3.0/3.20/gtk-solid-darker.css | 72 ++++++++++++------- common/gtk-3.0/3.20/gtk-solid.css | 72 ++++++++++++------- common/gtk-3.0/3.20/gtk.css | 72 ++++++++++++------- common/gtk-3.0/3.20/sass/_applications.scss | 5 +- .../3.20/sass/_transparent_widgets.scss | 27 ++++++- 8 files changed, 310 insertions(+), 154 deletions(-) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 0cd308e..ad5a2ec 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -3211,9 +3211,14 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } -.caja-side-pane .frame, +.caja-notebook { + border-top: 1px solid #2b2e39; } + +.caja-side-pane .frame { + border-width: 1px 0 0; } + .caja-notebook .frame { - border-width: 1px 0; } + border-width: 0 0 1px; } .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; @@ -4078,6 +4083,23 @@ filechooser.maximized placessidebar.sidebar, .nemo-window .sidebar separator { background-color: transparent; } +.caja-side-pane, +.caja-side-pane > notebook > stack > widget > box, +.caja-side-pane text, +.caja-side-pane treeview { + color: #BAC3CF; + caret-color: #BAC3CF; + background-color: #353945; } + +.caja-side-pane > box button:not(:active):not(:checked) { + color: #BAC3CF; } + +.caja-side-pane .frame { + border-color: #2a2d37; } + +.caja-side-pane junction { + background-color: rgba(42, 45, 55, 0.95); } + filechooser actionbar { color: #BAC3CF; background-color: rgba(53, 57, 69, 0.95); @@ -4113,7 +4135,7 @@ filechooser actionbar button { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(102, 109, 132, 0.35); } - filechooser actionbar button:hover { + .caja-side-pane > box button:hover:not(:active), filechooser actionbar button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); @@ -4143,28 +4165,28 @@ filechooser actionbar entry { color: rgba(186, 195, 207, 0.55); background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } -filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, -.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { - background-color: #e7eaee; - border: 1px solid rgba(0, 0, 0, 0.3); } - -filechooser placessidebar.sidebar scrollbar slider, -.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider { - background-color: rgba(231, 234, 238, 0.7); } - filechooser placessidebar.sidebar scrollbar slider:hover, - .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover { - background-color: #f6f7f9; } - filechooser placessidebar.sidebar scrollbar slider:hover:active, - .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active { - background-color: #5294E2; } - filechooser placessidebar.sidebar scrollbar slider:disabled, - .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled { - background-color: transparent; } - -filechooser placessidebar.sidebar scrollbar trough, -.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough { - background-color: rgba(0, 0, 0, 0.2); - border: none; } +filechooser placessidebar.sidebar scrollbar, +.nautilus-window placessidebar.sidebar scrollbar, .nemo-window .sidebar scrollbar, .caja-side-pane scrollbar { + border-color: rgba(42, 45, 55, 0.95); } + filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, + .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .caja-side-pane scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { + background-color: #e7eaee; + border: 1px solid rgba(0, 0, 0, 0.3); } + filechooser placessidebar.sidebar scrollbar slider, + .nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider, .caja-side-pane scrollbar slider { + background-color: rgba(231, 234, 238, 0.7); } + filechooser placessidebar.sidebar scrollbar slider:hover, + .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover, .caja-side-pane scrollbar slider:hover { + background-color: #f6f7f9; } + filechooser placessidebar.sidebar scrollbar slider:hover:active, + .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active, .caja-side-pane scrollbar slider:hover:active { + background-color: #5294E2; } + filechooser placessidebar.sidebar scrollbar slider:disabled, + .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled, .caja-side-pane scrollbar slider:disabled { + background-color: transparent; } + filechooser placessidebar.sidebar scrollbar trough, + .nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough, .caja-side-pane scrollbar trough { + background-color: rgba(42, 45, 55, 0.95); } @define-color theme_fg_color #D3DAE3; @define-color theme_text_color #D3DAE3; diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 9d46ddc..89d2212 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -3209,9 +3209,14 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } -.caja-side-pane .frame, +.caja-notebook { + border-top: 1px solid #dcdfe3; } + +.caja-side-pane .frame { + border-width: 1px 0 0; } + .caja-notebook .frame { - border-width: 1px 0; } + border-width: 0 0 1px; } .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; @@ -4080,6 +4085,23 @@ filechooser.maximized placessidebar.sidebar, .nemo-window .sidebar separator { background-color: transparent; } +.caja-side-pane, +.caja-side-pane > notebook > stack > widget > box, +.caja-side-pane text, +.caja-side-pane treeview { + color: #BAC3CF; + caret-color: #BAC3CF; + background-color: #353945; } + +.caja-side-pane > box button:not(:active):not(:checked) { + color: #BAC3CF; } + +.caja-side-pane .frame { + border-color: #2a2d37; } + +.caja-side-pane junction { + background-color: rgba(42, 45, 55, 0.95); } + filechooser actionbar { color: #BAC3CF; background-color: rgba(53, 57, 69, 0.95); @@ -4115,7 +4137,7 @@ filechooser actionbar button { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(102, 109, 132, 0.35); } - filechooser actionbar button:hover { + .caja-side-pane > box button:hover:not(:active), filechooser actionbar button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); @@ -4145,28 +4167,28 @@ filechooser actionbar entry { color: rgba(186, 195, 207, 0.55); background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } -filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, -.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { - background-color: #e7eaee; - border: 1px solid rgba(0, 0, 0, 0.3); } - -filechooser placessidebar.sidebar scrollbar slider, -.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider { - background-color: rgba(231, 234, 238, 0.7); } - filechooser placessidebar.sidebar scrollbar slider:hover, - .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover { - background-color: #f6f7f9; } - filechooser placessidebar.sidebar scrollbar slider:hover:active, - .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active { - background-color: #5294E2; } - filechooser placessidebar.sidebar scrollbar slider:disabled, - .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled { - background-color: transparent; } - -filechooser placessidebar.sidebar scrollbar trough, -.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough { - background-color: rgba(0, 0, 0, 0.2); - border: none; } +filechooser placessidebar.sidebar scrollbar, +.nautilus-window placessidebar.sidebar scrollbar, .nemo-window .sidebar scrollbar, .caja-side-pane scrollbar { + border-color: rgba(42, 45, 55, 0.95); } + filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, + .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .caja-side-pane scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { + background-color: #e7eaee; + border: 1px solid rgba(0, 0, 0, 0.3); } + filechooser placessidebar.sidebar scrollbar slider, + .nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider, .caja-side-pane scrollbar slider { + background-color: rgba(231, 234, 238, 0.7); } + filechooser placessidebar.sidebar scrollbar slider:hover, + .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover, .caja-side-pane scrollbar slider:hover { + background-color: #f6f7f9; } + filechooser placessidebar.sidebar scrollbar slider:hover:active, + .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active, .caja-side-pane scrollbar slider:hover:active { + background-color: #5294E2; } + filechooser placessidebar.sidebar scrollbar slider:disabled, + .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled, .caja-side-pane scrollbar slider:disabled { + background-color: transparent; } + filechooser placessidebar.sidebar scrollbar trough, + .nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough, .caja-side-pane scrollbar trough { + background-color: rgba(42, 45, 55, 0.95); } @define-color theme_fg_color #5c616c; @define-color theme_text_color #5c616c; diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index e9ce342..674ed56 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -3211,9 +3211,14 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } -.caja-side-pane .frame, +.caja-notebook { + border-top: 1px solid #2b2e39; } + +.caja-side-pane .frame { + border-width: 1px 0 0; } + .caja-notebook .frame { - border-width: 1px 0; } + border-width: 0 0 1px; } .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; @@ -4078,6 +4083,23 @@ filechooser.maximized placessidebar.sidebar, .nemo-window .sidebar separator { background-color: transparent; } +.caja-side-pane, +.caja-side-pane > notebook > stack > widget > box, +.caja-side-pane text, +.caja-side-pane treeview { + color: #BAC3CF; + caret-color: #BAC3CF; + background-color: #353945; } + +.caja-side-pane > box button:not(:active):not(:checked) { + color: #BAC3CF; } + +.caja-side-pane .frame { + border-color: #2a2d37; } + +.caja-side-pane junction { + background-color: #2a2d37; } + filechooser actionbar { color: #BAC3CF; background-color: #353945; @@ -4113,7 +4135,7 @@ filechooser actionbar button { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(102, 109, 132, 0.4); } - filechooser actionbar button:hover { + .caja-side-pane > box button:hover:not(:active), filechooser actionbar button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); @@ -4143,28 +4165,28 @@ filechooser actionbar entry { color: rgba(186, 195, 207, 0.55); background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } -filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, -.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { - background-color: #e7eaee; - border: 1px solid rgba(0, 0, 0, 0.3); } - -filechooser placessidebar.sidebar scrollbar slider, -.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider { - background-color: rgba(231, 234, 238, 0.7); } - filechooser placessidebar.sidebar scrollbar slider:hover, - .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover { - background-color: #f6f7f9; } - filechooser placessidebar.sidebar scrollbar slider:hover:active, - .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active { - background-color: #5294E2; } - filechooser placessidebar.sidebar scrollbar slider:disabled, - .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled { - background-color: transparent; } - -filechooser placessidebar.sidebar scrollbar trough, -.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough { - background-color: rgba(0, 0, 0, 0.2); - border: none; } +filechooser placessidebar.sidebar scrollbar, +.nautilus-window placessidebar.sidebar scrollbar, .nemo-window .sidebar scrollbar, .caja-side-pane scrollbar { + border-color: #2a2d37; } + filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, + .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .caja-side-pane scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { + background-color: #e7eaee; + border: 1px solid rgba(0, 0, 0, 0.3); } + filechooser placessidebar.sidebar scrollbar slider, + .nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider, .caja-side-pane scrollbar slider { + background-color: rgba(231, 234, 238, 0.7); } + filechooser placessidebar.sidebar scrollbar slider:hover, + .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover, .caja-side-pane scrollbar slider:hover { + background-color: #f6f7f9; } + filechooser placessidebar.sidebar scrollbar slider:hover:active, + .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active, .caja-side-pane scrollbar slider:hover:active { + background-color: #5294E2; } + filechooser placessidebar.sidebar scrollbar slider:disabled, + .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled, .caja-side-pane scrollbar slider:disabled { + background-color: transparent; } + filechooser placessidebar.sidebar scrollbar trough, + .nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough, .caja-side-pane scrollbar trough { + background-color: #2a2d37; } @define-color theme_fg_color #D3DAE3; @define-color theme_text_color #D3DAE3; diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index 76a62ba..244837a 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -3209,9 +3209,14 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } -.caja-side-pane .frame, +.caja-notebook { + border-top: 1px solid #dcdfe3; } + +.caja-side-pane .frame { + border-width: 1px 0 0; } + .caja-notebook .frame { - border-width: 1px 0; } + border-width: 0 0 1px; } .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; @@ -4080,6 +4085,23 @@ filechooser.maximized placessidebar.sidebar, .nemo-window .sidebar separator { background-color: transparent; } +.caja-side-pane, +.caja-side-pane > notebook > stack > widget > box, +.caja-side-pane text, +.caja-side-pane treeview { + color: #BAC3CF; + caret-color: #BAC3CF; + background-color: #353945; } + +.caja-side-pane > box button:not(:active):not(:checked) { + color: #BAC3CF; } + +.caja-side-pane .frame { + border-color: #2a2d37; } + +.caja-side-pane junction { + background-color: #2a2d37; } + filechooser actionbar { color: #BAC3CF; background-color: #353945; @@ -4115,7 +4137,7 @@ filechooser actionbar button { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(102, 109, 132, 0.4); } - filechooser actionbar button:hover { + .caja-side-pane > box button:hover:not(:active), filechooser actionbar button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); @@ -4145,28 +4167,28 @@ filechooser actionbar entry { color: rgba(186, 195, 207, 0.55); background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } -filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, -.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { - background-color: #e7eaee; - border: 1px solid rgba(0, 0, 0, 0.3); } - -filechooser placessidebar.sidebar scrollbar slider, -.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider { - background-color: rgba(231, 234, 238, 0.7); } - filechooser placessidebar.sidebar scrollbar slider:hover, - .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover { - background-color: #f6f7f9; } - filechooser placessidebar.sidebar scrollbar slider:hover:active, - .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active { - background-color: #5294E2; } - filechooser placessidebar.sidebar scrollbar slider:disabled, - .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled { - background-color: transparent; } - -filechooser placessidebar.sidebar scrollbar trough, -.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough { - background-color: rgba(0, 0, 0, 0.2); - border: none; } +filechooser placessidebar.sidebar scrollbar, +.nautilus-window placessidebar.sidebar scrollbar, .nemo-window .sidebar scrollbar, .caja-side-pane scrollbar { + border-color: #2a2d37; } + filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, + .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .caja-side-pane scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { + background-color: #e7eaee; + border: 1px solid rgba(0, 0, 0, 0.3); } + filechooser placessidebar.sidebar scrollbar slider, + .nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider, .caja-side-pane scrollbar slider { + background-color: rgba(231, 234, 238, 0.7); } + filechooser placessidebar.sidebar scrollbar slider:hover, + .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover, .caja-side-pane scrollbar slider:hover { + background-color: #f6f7f9; } + filechooser placessidebar.sidebar scrollbar slider:hover:active, + .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active, .caja-side-pane scrollbar slider:hover:active { + background-color: #5294E2; } + filechooser placessidebar.sidebar scrollbar slider:disabled, + .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled, .caja-side-pane scrollbar slider:disabled { + background-color: transparent; } + filechooser placessidebar.sidebar scrollbar trough, + .nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough, .caja-side-pane scrollbar trough { + background-color: #2a2d37; } @define-color theme_fg_color #5c616c; @define-color theme_text_color #5c616c; diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index b8947bd..aa83922 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -3213,9 +3213,14 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } -.caja-side-pane .frame, +.caja-notebook { + border-top: 1px solid #dcdfe3; } + +.caja-side-pane .frame { + border-width: 1px 0 0; } + .caja-notebook .frame { - border-width: 1px 0; } + border-width: 0 0 1px; } .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; @@ -4084,6 +4089,23 @@ filechooser.maximized placessidebar.sidebar, .nemo-window .sidebar separator { background-color: transparent; } +.caja-side-pane, +.caja-side-pane > notebook > stack > widget > box, +.caja-side-pane text, +.caja-side-pane treeview { + color: #BAC3CF; + caret-color: #BAC3CF; + background-color: #353945; } + +.caja-side-pane > box button:not(:active):not(:checked) { + color: #BAC3CF; } + +.caja-side-pane .frame { + border-color: #2a2d37; } + +.caja-side-pane junction { + background-color: #2a2d37; } + filechooser actionbar { color: #BAC3CF; background-color: #353945; @@ -4119,7 +4141,7 @@ filechooser actionbar button { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(102, 109, 132, 0.4); } - filechooser actionbar button:hover { + .caja-side-pane > box button:hover:not(:active), filechooser actionbar button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); @@ -4149,28 +4171,28 @@ filechooser actionbar entry { color: rgba(186, 195, 207, 0.55); background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } -filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, -.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { - background-color: #e7eaee; - border: 1px solid rgba(0, 0, 0, 0.3); } - -filechooser placessidebar.sidebar scrollbar slider, -.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider { - background-color: rgba(231, 234, 238, 0.7); } - filechooser placessidebar.sidebar scrollbar slider:hover, - .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover { - background-color: #f6f7f9; } - filechooser placessidebar.sidebar scrollbar slider:hover:active, - .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active { - background-color: #5294E2; } - filechooser placessidebar.sidebar scrollbar slider:disabled, - .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled { - background-color: transparent; } - -filechooser placessidebar.sidebar scrollbar trough, -.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough { - background-color: rgba(0, 0, 0, 0.2); - border: none; } +filechooser placessidebar.sidebar scrollbar, +.nautilus-window placessidebar.sidebar scrollbar, .nemo-window .sidebar scrollbar, .caja-side-pane scrollbar { + border-color: #2a2d37; } + filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, + .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .caja-side-pane scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { + background-color: #e7eaee; + border: 1px solid rgba(0, 0, 0, 0.3); } + filechooser placessidebar.sidebar scrollbar slider, + .nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider, .caja-side-pane scrollbar slider { + background-color: rgba(231, 234, 238, 0.7); } + filechooser placessidebar.sidebar scrollbar slider:hover, + .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover, .caja-side-pane scrollbar slider:hover { + background-color: #f6f7f9; } + filechooser placessidebar.sidebar scrollbar slider:hover:active, + .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active, .caja-side-pane scrollbar slider:hover:active { + background-color: #5294E2; } + filechooser placessidebar.sidebar scrollbar slider:disabled, + .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled, .caja-side-pane scrollbar slider:disabled { + background-color: transparent; } + filechooser placessidebar.sidebar scrollbar trough, + .nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough, .caja-side-pane scrollbar trough { + background-color: #2a2d37; } @define-color theme_fg_color #5c616c; @define-color theme_text_color #5c616c; diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index b0e5a63..24ed8db 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -3213,9 +3213,14 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } -.caja-side-pane .frame, +.caja-notebook { + border-top: 1px solid #dcdfe3; } + +.caja-side-pane .frame { + border-width: 1px 0 0; } + .caja-notebook .frame { - border-width: 1px 0; } + border-width: 0 0 1px; } .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; @@ -4084,6 +4089,23 @@ filechooser.maximized placessidebar.sidebar, .nemo-window .sidebar separator { background-color: transparent; } +.caja-side-pane, +.caja-side-pane > notebook > stack > widget > box, +.caja-side-pane text, +.caja-side-pane treeview { + color: #BAC3CF; + caret-color: #BAC3CF; + background-color: #353945; } + +.caja-side-pane > box button:not(:active):not(:checked) { + color: #BAC3CF; } + +.caja-side-pane .frame { + border-color: #2a2d37; } + +.caja-side-pane junction { + background-color: rgba(42, 45, 55, 0.95); } + filechooser actionbar { color: #BAC3CF; background-color: rgba(53, 57, 69, 0.95); @@ -4119,7 +4141,7 @@ filechooser actionbar button { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(102, 109, 132, 0.35); } - filechooser actionbar button:hover { + .caja-side-pane > box button:hover:not(:active), filechooser actionbar button:hover { color: #BAC3CF; outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); @@ -4149,28 +4171,28 @@ filechooser actionbar entry { color: rgba(186, 195, 207, 0.55); background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } -filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, -.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { - background-color: #e7eaee; - border: 1px solid rgba(0, 0, 0, 0.3); } - -filechooser placessidebar.sidebar scrollbar slider, -.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider { - background-color: rgba(231, 234, 238, 0.7); } - filechooser placessidebar.sidebar scrollbar slider:hover, - .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover { - background-color: #f6f7f9; } - filechooser placessidebar.sidebar scrollbar slider:hover:active, - .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active { - background-color: #5294E2; } - filechooser placessidebar.sidebar scrollbar slider:disabled, - .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled { - background-color: transparent; } - -filechooser placessidebar.sidebar scrollbar trough, -.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough { - background-color: rgba(0, 0, 0, 0.2); - border: none; } +filechooser placessidebar.sidebar scrollbar, +.nautilus-window placessidebar.sidebar scrollbar, .nemo-window .sidebar scrollbar, .caja-side-pane scrollbar { + border-color: rgba(42, 45, 55, 0.95); } + filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, + .nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .caja-side-pane scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { + background-color: #e7eaee; + border: 1px solid rgba(0, 0, 0, 0.3); } + filechooser placessidebar.sidebar scrollbar slider, + .nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider, .caja-side-pane scrollbar slider { + background-color: rgba(231, 234, 238, 0.7); } + filechooser placessidebar.sidebar scrollbar slider:hover, + .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover, .caja-side-pane scrollbar slider:hover { + background-color: #f6f7f9; } + filechooser placessidebar.sidebar scrollbar slider:hover:active, + .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active, .caja-side-pane scrollbar slider:hover:active { + background-color: #5294E2; } + filechooser placessidebar.sidebar scrollbar slider:disabled, + .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled, .caja-side-pane scrollbar slider:disabled { + background-color: transparent; } + filechooser placessidebar.sidebar scrollbar trough, + .nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough, .caja-side-pane scrollbar trough { + background-color: rgba(42, 45, 55, 0.95); } @define-color theme_fg_color #5c616c; @define-color theme_text_color #5c616c; diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss index 817defb..51e578f 100644 --- a/common/gtk-3.0/3.20/sass/_applications.scss +++ b/common/gtk-3.0/3.20/sass/_applications.scss @@ -151,8 +151,9 @@ $disk_space_free: darken($bg_color, 3%); // .caja-desktop { @extend .nautilus-desktop.nautilus-canvas-item; } -.caja-side-pane .frame, -.caja-notebook .frame { border-width: 1px 0; } +.caja-notebook { border-top: 1px solid $borders_color; } +.caja-side-pane .frame { border-width: 1px 0 0; } +.caja-notebook .frame { border-width: 0 0 1px; } // // Gedit diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss index 27611ce..b154491 100644 --- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss @@ -104,6 +104,28 @@ filechooser, } } +.caja-side-pane { + + &, + > notebook > stack > widget > box, + text, + treeview { + color: $dark_sidebar_fg; + caret-color: $dark_sidebar_fg; + background-color: opacify($dark_sidebar_bg, 1); + } + + > box button { + &:not(:active):not(:checked) { color: $dark_sidebar_fg; } + &:hover:not(:active) { @extend %dark_sidebar_button:hover; } + } + + .frame { border-color: darken(opacify($dark_sidebar_bg, 1), 5%); } + + scrollbar { @extend %dark_sidebar_scrollbar; } + junction { background-color: darken($dark_sidebar_bg, 5%); } +} + filechooser { actionbar { @@ -168,6 +190,8 @@ filechooser { %dark_sidebar_scrollbar { + border-color: darken($dark_sidebar_bg, 5%); + &.overlay-indicator:not(.dragging):not(.hovering) slider { background-color: lighten($dark_sidebar_fg, 15%); border: 1px solid transparentize(black, 0.7); @@ -184,7 +208,6 @@ filechooser { } } trough { - background-color: transparentize(black, 0.8); - border: none; + background-color: darken($dark_sidebar_bg, 5%); } } From 28cdb3e34b8d4bb237ecc9412761b98c8e1b23d4 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 16 May 2016 19:49:47 +0200 Subject: [PATCH 07/13] gtk3: reduce menubar height to match gtk2 theme (fix #535) --- common/gtk-3.0/3.14/gtk-dark.css | 2 +- common/gtk-3.0/3.14/gtk-darker.css | 2 +- common/gtk-3.0/3.14/gtk-solid-dark.css | 2 +- common/gtk-3.0/3.14/gtk-solid-darker.css | 2 +- common/gtk-3.0/3.14/gtk-solid.css | 2 +- common/gtk-3.0/3.14/gtk.css | 2 +- common/gtk-3.0/3.14/sass/_common.scss | 2 +- common/gtk-3.0/3.16/gtk-dark.css | 2 +- common/gtk-3.0/3.16/gtk-darker.css | 2 +- common/gtk-3.0/3.16/gtk-solid-dark.css | 2 +- common/gtk-3.0/3.16/gtk-solid-darker.css | 2 +- common/gtk-3.0/3.16/gtk-solid.css | 2 +- common/gtk-3.0/3.16/gtk.css | 2 +- common/gtk-3.0/3.16/sass/_common.scss | 2 +- common/gtk-3.0/3.18/gtk-dark.css | 2 +- common/gtk-3.0/3.18/gtk-darker.css | 2 +- common/gtk-3.0/3.18/gtk-solid-dark.css | 2 +- common/gtk-3.0/3.18/gtk-solid-darker.css | 2 +- common/gtk-3.0/3.18/gtk-solid.css | 2 +- common/gtk-3.0/3.18/gtk.css | 2 +- common/gtk-3.0/3.18/sass/_common.scss | 2 +- common/gtk-3.0/3.20/gtk-dark.css | 2 +- common/gtk-3.0/3.20/gtk-darker.css | 2 +- common/gtk-3.0/3.20/gtk-solid-dark.css | 2 +- common/gtk-3.0/3.20/gtk-solid-darker.css | 2 +- common/gtk-3.0/3.20/gtk-solid.css | 2 +- common/gtk-3.0/3.20/gtk.css | 2 +- common/gtk-3.0/3.20/sass/_common.scss | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css index c9b6045..0707d9f 100644 --- a/common/gtk-3.0/3.14/gtk-dark.css +++ b/common/gtk-3.0/3.14/gtk-dark.css @@ -1284,7 +1284,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(207, 218, 231, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css index 2c7de68..659ff2f 100644 --- a/common/gtk-3.0/3.14/gtk-darker.css +++ b/common/gtk-3.0/3.14/gtk-darker.css @@ -1287,7 +1287,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(207, 218, 231, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.14/gtk-solid-dark.css b/common/gtk-3.0/3.14/gtk-solid-dark.css index 959c05b..84a483f 100644 --- a/common/gtk-3.0/3.14/gtk-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-solid-dark.css @@ -1284,7 +1284,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(207, 218, 231, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.14/gtk-solid-darker.css b/common/gtk-3.0/3.14/gtk-solid-darker.css index 66d0128..36394a7 100644 --- a/common/gtk-3.0/3.14/gtk-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-solid-darker.css @@ -1287,7 +1287,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(207, 218, 231, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css index 5176a99..999befb 100644 --- a/common/gtk-3.0/3.14/gtk-solid.css +++ b/common/gtk-3.0/3.14/gtk-solid.css @@ -1287,7 +1287,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(82, 93, 118, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.14/gtk.css b/common/gtk-3.0/3.14/gtk.css index d2cf4a8..7651a76 100644 --- a/common/gtk-3.0/3.14/gtk.css +++ b/common/gtk-3.0/3.14/gtk.css @@ -1287,7 +1287,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(82, 93, 118, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index 22754de..f314530 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -1527,7 +1527,7 @@ column-header.button.dnd { // for treeview-like derive widgets } & > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css index 6d9e12a..1c733b3 100644 --- a/common/gtk-3.0/3.16/gtk-dark.css +++ b/common/gtk-3.0/3.16/gtk-dark.css @@ -1298,7 +1298,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(207, 218, 231, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css index 7834b22..9c20bc9 100644 --- a/common/gtk-3.0/3.16/gtk-darker.css +++ b/common/gtk-3.0/3.16/gtk-darker.css @@ -1301,7 +1301,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(207, 218, 231, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.16/gtk-solid-dark.css b/common/gtk-3.0/3.16/gtk-solid-dark.css index cad7d78..95b8ebd 100644 --- a/common/gtk-3.0/3.16/gtk-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-solid-dark.css @@ -1298,7 +1298,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(207, 218, 231, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.16/gtk-solid-darker.css b/common/gtk-3.0/3.16/gtk-solid-darker.css index ffe71d5..d66b014 100644 --- a/common/gtk-3.0/3.16/gtk-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-solid-darker.css @@ -1301,7 +1301,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(207, 218, 231, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css index 83c828f..f95f35b 100644 --- a/common/gtk-3.0/3.16/gtk-solid.css +++ b/common/gtk-3.0/3.16/gtk-solid.css @@ -1301,7 +1301,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(82, 93, 118, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css index 1326f87..347c7ce 100644 --- a/common/gtk-3.0/3.16/gtk.css +++ b/common/gtk-3.0/3.16/gtk.css @@ -1301,7 +1301,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(82, 93, 118, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 819dc93..f2d8e1c 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -1541,7 +1541,7 @@ column-header.button.dnd { // for treeview-like derive widgets } & > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index 9364445..d4c9dd8 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -1367,7 +1367,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(207, 218, 231, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index 14bac0f..3608fe9 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -1370,7 +1370,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(207, 218, 231, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index 411ea48..6897609 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -1367,7 +1367,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(207, 218, 231, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index a172754..93208e4 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -1370,7 +1370,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(207, 218, 231, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index 46f48e1..dac5190 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -1374,7 +1374,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(82, 93, 118, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index f409ee1..945c13d 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -1374,7 +1374,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menubar:backdrop { color: rgba(82, 93, 118, 0.5); } .menubar > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } .menubar > .menuitem:hover { diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index 63904ee..dd39d6b 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -1486,7 +1486,7 @@ column-header.button.dnd { // for treeview-like derive widgets } & > .menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index ad5a2ec..f5a9589 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -1509,7 +1509,7 @@ menubar, color: rgba(207, 218, 231, 0.5); } menubar > menuitem, .menubar > menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } menubar > menuitem:hover, diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 89d2212..eb7e7a5 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -1508,7 +1508,7 @@ menubar, color: rgba(207, 218, 231, 0.5); } menubar > menuitem, .menubar > menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } menubar > menuitem:hover, diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 674ed56..5628d5d 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -1509,7 +1509,7 @@ menubar, color: rgba(207, 218, 231, 0.5); } menubar > menuitem, .menubar > menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } menubar > menuitem:hover, diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index 244837a..b2c2f46 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -1508,7 +1508,7 @@ menubar, color: rgba(207, 218, 231, 0.5); } menubar > menuitem, .menubar > menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } menubar > menuitem:hover, diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index aa83922..1ae6714 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -1512,7 +1512,7 @@ menubar, color: rgba(82, 93, 118, 0.5); } menubar > menuitem, .menubar > menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } menubar > menuitem:hover, diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 24ed8db..dadd105 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -1512,7 +1512,7 @@ menubar, color: rgba(82, 93, 118, 0.5); } menubar > menuitem, .menubar > menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; } menubar > menuitem:hover, diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index 0b60153..68ad9aa 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -1579,7 +1579,7 @@ menubar, } > menuitem { - padding: 6px 8px; + padding: 4px 8px; border: solid transparent; border-width: 0; From 6539bc919d09c39f7a55753b33387dfc3733e709 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 16 May 2016 19:56:18 +0200 Subject: [PATCH 08/13] gtk3: remove borders from nautilus-list-view (fix #533) --- common/gtk-3.0/3.18/gtk-dark.css | 3 --- common/gtk-3.0/3.18/gtk-darker.css | 3 --- common/gtk-3.0/3.18/gtk-solid-dark.css | 3 --- common/gtk-3.0/3.18/gtk-solid-darker.css | 3 --- common/gtk-3.0/3.18/gtk-solid.css | 3 --- common/gtk-3.0/3.18/gtk.css | 3 --- common/gtk-3.0/3.18/sass/_applications.scss | 3 --- common/gtk-3.0/3.20/gtk-dark.css | 3 --- common/gtk-3.0/3.20/gtk-darker.css | 3 --- common/gtk-3.0/3.20/gtk-solid-dark.css | 3 --- common/gtk-3.0/3.20/gtk-solid-darker.css | 3 --- common/gtk-3.0/3.20/gtk-solid.css | 3 --- common/gtk-3.0/3.20/gtk.css | 3 --- common/gtk-3.0/3.20/sass/_applications.scss | 3 --- 14 files changed, 42 deletions(-) diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index d4c9dd8..8b33519 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -2745,9 +2745,6 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #313541; border-color: #1b1d24; } -NautilusListView .view { - border-bottom: 1px solid #2b2e39; } - NemoWindow .sidebar .frame { border-width: 0; } diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index 3608fe9..33c87ac 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -2748,9 +2748,6 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #edeef0; border-color: #d0d5da; } -NautilusListView .view { - border-bottom: 1px solid #dcdfe3; } - NemoWindow .sidebar .frame { border-width: 0; } diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index 6897609..13c72fc 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -2745,9 +2745,6 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #313541; border-color: #1b1d24; } -NautilusListView .view { - border-bottom: 1px solid #2b2e39; } - NemoWindow .sidebar .frame { border-width: 0; } diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index 93208e4..9de6146 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -2748,9 +2748,6 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #edeef0; border-color: #d0d5da; } -NautilusListView .view { - border-bottom: 1px solid #dcdfe3; } - NemoWindow .sidebar .frame { border-width: 0; } diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index dac5190..adf8d39 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -2752,9 +2752,6 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #edeef0; border-color: #d0d5da; } -NautilusListView .view { - border-bottom: 1px solid #dcdfe3; } - NemoWindow .sidebar .frame { border-width: 0; } diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index 945c13d..98a2566 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -2752,9 +2752,6 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #edeef0; border-color: #d0d5da; } -NautilusListView .view { - border-bottom: 1px solid #dcdfe3; } - NemoWindow .sidebar .frame { border-width: 0; } diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss index d0c7ff8..63e1186 100644 --- a/common/gtk-3.0/3.18/sass/_applications.scss +++ b/common/gtk-3.0/3.18/sass/_applications.scss @@ -156,9 +156,6 @@ $disk_space_free: darken($bg_color, 3%); } } -// View -NautilusListView .view { border-bottom: 1px solid $borders_color; } - // // Nemo // diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index f5a9589..4ace161 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -3145,9 +3145,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can background-color: #313541; border-color: #1b1d24; } -.nautilus-list-view .view, .nautilus-list-view iconview { - border-bottom: 1px solid #2b2e39; } - @keyframes needs_attention_keyframes { 0% { color: rgba(207, 218, 231, 0.8); diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index eb7e7a5..91cbad4 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -3144,9 +3144,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can background-color: #edeef0; border-color: #d0d5da; } -.nautilus-list-view .view, .nautilus-list-view iconview { - border-bottom: 1px solid #dcdfe3; } - @keyframes needs_attention_keyframes { 0% { color: rgba(207, 218, 231, 0.8); diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 5628d5d..3a9c6a6 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -3145,9 +3145,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can background-color: #313541; border-color: #1b1d24; } -.nautilus-list-view .view, .nautilus-list-view iconview { - border-bottom: 1px solid #2b2e39; } - @keyframes needs_attention_keyframes { 0% { color: rgba(207, 218, 231, 0.8); diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index b2c2f46..8e1daaa 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -3144,9 +3144,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can background-color: #edeef0; border-color: #d0d5da; } -.nautilus-list-view .view, .nautilus-list-view iconview { - border-bottom: 1px solid #dcdfe3; } - @keyframes needs_attention_keyframes { 0% { color: rgba(207, 218, 231, 0.8); diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 1ae6714..acd24c3 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -3148,9 +3148,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can background-color: #edeef0; border-color: #d0d5da; } -.nautilus-list-view .view, .nautilus-list-view iconview { - border-bottom: 1px solid #dcdfe3; } - @keyframes needs_attention_keyframes { 0% { color: rgba(82, 93, 118, 0.8); diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index dadd105..b0a2580 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -3148,9 +3148,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can background-color: #edeef0; border-color: #d0d5da; } -.nautilus-list-view .view, .nautilus-list-view iconview { - border-bottom: 1px solid #dcdfe3; } - @keyframes needs_attention_keyframes { 0% { color: rgba(82, 93, 118, 0.8); diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss index 51e578f..5a6cb9d 100644 --- a/common/gtk-3.0/3.20/sass/_applications.scss +++ b/common/gtk-3.0/3.20/sass/_applications.scss @@ -91,9 +91,6 @@ $disk_space_free: darken($bg_color, 3%); } } -// View -.nautilus-list-view .view { border-bottom: 1px solid $borders_color; } - @keyframes needs_attention_keyframes { 0% { @include button(header-hover); } 100% { @include button(header-active) } From a27b3333ad7fb9bad605a72afc1c7566c727a4d6 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 16 May 2016 20:17:02 +0200 Subject: [PATCH 09/13] gnome-shell: add support for the multi-monitors-add-on extension (fix #464) --- common/gnome-shell/3.14/gnome-shell-dark.css | 18 +++++++++----- common/gnome-shell/3.14/gnome-shell.css | 18 +++++++++----- common/gnome-shell/3.14/sass/_common.scss | 25 +++++++++++++------- common/gnome-shell/3.16/gnome-shell-dark.css | 18 +++++++++----- common/gnome-shell/3.16/gnome-shell.css | 18 +++++++++----- common/gnome-shell/3.16/sass/_common.scss | 25 +++++++++++++------- common/gnome-shell/3.18/gnome-shell-dark.css | 18 +++++++++----- common/gnome-shell/3.18/gnome-shell.css | 18 +++++++++----- common/gnome-shell/3.18/sass/_common.scss | 25 +++++++++++++------- 9 files changed, 120 insertions(+), 63 deletions(-) diff --git a/common/gnome-shell/3.14/gnome-shell-dark.css b/common/gnome-shell/3.14/gnome-shell-dark.css index cee5c60..0f4fba2 100644 --- a/common/gnome-shell/3.14/gnome-shell-dark.css +++ b/common/gnome-shell/3.14/gnome-shell-dark.css @@ -1405,16 +1405,22 @@ StScrollBar { padding: 10px 8px 5px 8px; spacing: 4px; } -.workspace-thumbnails { +.workspace-thumbnails, .workspace-thumbnails:rtl, +.workspace-thumbnails-left, +.workspace-thumbnails-left:rtl { visible-width: 40px; spacing: 11px; - padding: 12px; + padding: 12px; } + +.workspace-thumbnails, +.workspace-thumbnails-left:rtl { padding-right: 7px; border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; } - .workspace-thumbnails:rtl { - padding: 12px; - padding-left: 7px; - border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } + +.workspace-thumbnails:rtl, +.workspace-thumbnails-left { + padding-left: 7px; + border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } .workspace-thumbnail-indicator { border: 4px solid rgba(82, 148, 226, 0.8); diff --git a/common/gnome-shell/3.14/gnome-shell.css b/common/gnome-shell/3.14/gnome-shell.css index b61fab0..7308f41 100644 --- a/common/gnome-shell/3.14/gnome-shell.css +++ b/common/gnome-shell/3.14/gnome-shell.css @@ -1405,16 +1405,22 @@ StScrollBar { padding: 10px 8px 5px 8px; spacing: 4px; } -.workspace-thumbnails { +.workspace-thumbnails, .workspace-thumbnails:rtl, +.workspace-thumbnails-left, +.workspace-thumbnails-left:rtl { visible-width: 40px; spacing: 11px; - padding: 12px; + padding: 12px; } + +.workspace-thumbnails, +.workspace-thumbnails-left:rtl { padding-right: 7px; border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; } - .workspace-thumbnails:rtl { - padding: 12px; - padding-left: 7px; - border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } + +.workspace-thumbnails:rtl, +.workspace-thumbnails-left { + padding-left: 7px; + border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } .workspace-thumbnail-indicator { border: 4px solid rgba(82, 148, 226, 0.8); diff --git a/common/gnome-shell/3.14/sass/_common.scss b/common/gnome-shell/3.14/sass/_common.scss index 18bfb43..863159e 100644 --- a/common/gnome-shell/3.14/sass/_common.scss +++ b/common/gnome-shell/3.14/sass/_common.scss @@ -1773,18 +1773,25 @@ StScrollBar { // // Workspace pager // -.workspace-thumbnails { //container ala dash - visible-width: 40px; //amount visible before hover - spacing: 11px; - padding: 12px; +.workspace-thumbnails, +.workspace-thumbnails-left { + &, &:rtl { + visible-width: 40px; //amount visible before hover + spacing: 11px; + padding: 12px; + } +} + +.workspace-thumbnails, +.workspace-thumbnails-left:rtl { padding-right: 7px; border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; +} - &:rtl { - padding: 12px; - padding-left: 7px; - border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; - } +.workspace-thumbnails:rtl, +.workspace-thumbnails-left { + padding-left: 7px; + border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } .workspace-thumbnail-indicator { diff --git a/common/gnome-shell/3.16/gnome-shell-dark.css b/common/gnome-shell/3.16/gnome-shell-dark.css index 20c42c4..5571339 100644 --- a/common/gnome-shell/3.16/gnome-shell-dark.css +++ b/common/gnome-shell/3.16/gnome-shell-dark.css @@ -1341,16 +1341,22 @@ StScrollBar { padding: 10px 8px 5px 8px; spacing: 4px; } -.workspace-thumbnails { +.workspace-thumbnails, .workspace-thumbnails:rtl, +.workspace-thumbnails-left, +.workspace-thumbnails-left:rtl { visible-width: 40px; spacing: 11px; - padding: 12px; + padding: 12px; } + +.workspace-thumbnails, +.workspace-thumbnails-left:rtl { padding-right: 7px; border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; } - .workspace-thumbnails:rtl { - padding: 12px; - padding-left: 7px; - border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } + +.workspace-thumbnails:rtl, +.workspace-thumbnails-left { + padding-left: 7px; + border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } .workspace-thumbnail-indicator { border: 4px solid rgba(82, 148, 226, 0.8); diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index f996c1d..ad41fcc 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -1341,16 +1341,22 @@ StScrollBar { padding: 10px 8px 5px 8px; spacing: 4px; } -.workspace-thumbnails { +.workspace-thumbnails, .workspace-thumbnails:rtl, +.workspace-thumbnails-left, +.workspace-thumbnails-left:rtl { visible-width: 40px; spacing: 11px; - padding: 12px; + padding: 12px; } + +.workspace-thumbnails, +.workspace-thumbnails-left:rtl { padding-right: 7px; border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; } - .workspace-thumbnails:rtl { - padding: 12px; - padding-left: 7px; - border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } + +.workspace-thumbnails:rtl, +.workspace-thumbnails-left { + padding-left: 7px; + border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } .workspace-thumbnail-indicator { border: 4px solid rgba(82, 148, 226, 0.8); diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index 77147ef..9515e43 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -1684,18 +1684,25 @@ StScrollBar { // // Workspace pager // -.workspace-thumbnails { //container ala dash - visible-width: 40px; //amount visible before hover - spacing: 11px; - padding: 12px; +.workspace-thumbnails, +.workspace-thumbnails-left { + &, &:rtl { + visible-width: 40px; //amount visible before hover + spacing: 11px; + padding: 12px; + } +} + +.workspace-thumbnails, +.workspace-thumbnails-left:rtl { padding-right: 7px; border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; +} - &:rtl { - padding: 12px; - padding-left: 7px; - border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; - } +.workspace-thumbnails:rtl, +.workspace-thumbnails-left { + padding-left: 7px; + border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } .workspace-thumbnail-indicator { diff --git a/common/gnome-shell/3.18/gnome-shell-dark.css b/common/gnome-shell/3.18/gnome-shell-dark.css index a680046..e458f34 100644 --- a/common/gnome-shell/3.18/gnome-shell-dark.css +++ b/common/gnome-shell/3.18/gnome-shell-dark.css @@ -1416,16 +1416,22 @@ StScrollBar { padding: 10px 8px 5px 8px; spacing: 4px; } -.workspace-thumbnails { +.workspace-thumbnails, .workspace-thumbnails:rtl, +.workspace-thumbnails-left, +.workspace-thumbnails-left:rtl { visible-width: 40px; spacing: 11px; - padding: 12px; + padding: 12px; } + +.workspace-thumbnails, +.workspace-thumbnails-left:rtl { padding-right: 7px; border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; } - .workspace-thumbnails:rtl { - padding: 12px; - padding-left: 7px; - border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } + +.workspace-thumbnails:rtl, +.workspace-thumbnails-left { + padding-left: 7px; + border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } .workspace-thumbnail-indicator { border: 4px solid rgba(82, 148, 226, 0.8); diff --git a/common/gnome-shell/3.18/gnome-shell.css b/common/gnome-shell/3.18/gnome-shell.css index 8669f76..818731a 100644 --- a/common/gnome-shell/3.18/gnome-shell.css +++ b/common/gnome-shell/3.18/gnome-shell.css @@ -1416,16 +1416,22 @@ StScrollBar { padding: 10px 8px 5px 8px; spacing: 4px; } -.workspace-thumbnails { +.workspace-thumbnails, .workspace-thumbnails:rtl, +.workspace-thumbnails-left, +.workspace-thumbnails-left:rtl { visible-width: 40px; spacing: 11px; - padding: 12px; + padding: 12px; } + +.workspace-thumbnails, +.workspace-thumbnails-left:rtl { padding-right: 7px; border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; } - .workspace-thumbnails:rtl { - padding: 12px; - padding-left: 7px; - border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } + +.workspace-thumbnails:rtl, +.workspace-thumbnails-left { + padding-left: 7px; + border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } .workspace-thumbnail-indicator { border: 4px solid rgba(82, 148, 226, 0.8); diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss index 507b376..c07ab86 100644 --- a/common/gnome-shell/3.18/sass/_common.scss +++ b/common/gnome-shell/3.18/sass/_common.scss @@ -1809,18 +1809,25 @@ StScrollBar { // // Workspace pager // -.workspace-thumbnails { //container ala dash - visible-width: 40px; //amount visible before hover - spacing: 11px; - padding: 12px; +.workspace-thumbnails, +.workspace-thumbnails-left { + &, &:rtl { + visible-width: 40px; //amount visible before hover + spacing: 11px; + padding: 12px; + } +} + +.workspace-thumbnails, +.workspace-thumbnails-left:rtl { padding-right: 7px; border-image: url("common-assets/dash/dash-right.svg") 9 9 9 9; +} - &:rtl { - padding: 12px; - padding-left: 7px; - border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; - } +.workspace-thumbnails:rtl, +.workspace-thumbnails-left { + padding-left: 7px; + border-image: url("common-assets/dash/dash-left.svg") 9 9 9 9; } .workspace-thumbnail-indicator { From d62246cdc8d709ea1ce679f0e7892128c5403fae Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 16 May 2016 21:47:08 +0200 Subject: [PATCH 10/13] gnome-shell: fix volume mixer extension width (fix #486) --- common/gnome-shell/3.18/gnome-shell-dark.css | 4 ++++ common/gnome-shell/3.18/gnome-shell.css | 4 ++++ common/gnome-shell/3.18/sass/_common.scss | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/common/gnome-shell/3.18/gnome-shell-dark.css b/common/gnome-shell/3.18/gnome-shell-dark.css index e458f34..b89c1a4 100644 --- a/common/gnome-shell/3.18/gnome-shell-dark.css +++ b/common/gnome-shell/3.18/gnome-shell-dark.css @@ -1600,6 +1600,10 @@ StScrollBar { width: 24px; height: 24px; } +.masterslider.smaller .masterlabel, +.masterslider.smaller .slider { + min-width: 155px; } + .magnifier-zoom-region { border: 2px solid #5294E2; } .magnifier-zoom-region.full-screen { diff --git a/common/gnome-shell/3.18/gnome-shell.css b/common/gnome-shell/3.18/gnome-shell.css index 818731a..912c6f6 100644 --- a/common/gnome-shell/3.18/gnome-shell.css +++ b/common/gnome-shell/3.18/gnome-shell.css @@ -1600,6 +1600,10 @@ StScrollBar { width: 24px; height: 24px; } +.masterslider.smaller .masterlabel, +.masterslider.smaller .slider { + min-width: 155px; } + .magnifier-zoom-region { border: 2px solid #5294E2; } .magnifier-zoom-region.full-screen { diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss index c07ab86..9c5afa4 100644 --- a/common/gnome-shell/3.18/sass/_common.scss +++ b/common/gnome-shell/3.18/sass/_common.scss @@ -1989,6 +1989,11 @@ $legacy_icon_size: 24px; & StButton { width: $legacy_icon_size; height: $legacy_icon_size } } +.masterslider.smaller .masterlabel, +.masterslider.smaller .slider { + min-width: 155px; +} + // Magnifier .magnifier-zoom-region { From c5ed48f5af3debbbfe483febed3604eb623823a6 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 16 May 2016 22:28:36 +0200 Subject: [PATCH 11/13] fix a firefox workaround --- common/gtk-3.0/3.20/gtk-dark.css | 8 ++++---- common/gtk-3.0/3.20/gtk-darker.css | 8 ++++---- common/gtk-3.0/3.20/gtk-solid-dark.css | 8 ++++---- common/gtk-3.0/3.20/gtk-solid-darker.css | 8 ++++---- common/gtk-3.0/3.20/gtk-solid.css | 8 ++++---- common/gtk-3.0/3.20/gtk.css | 8 ++++---- common/gtk-3.0/3.20/sass/_common.scss | 5 +++-- 7 files changed, 27 insertions(+), 26 deletions(-) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 4ace161..e317ef3 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -1540,11 +1540,11 @@ menu, .menu separator { margin: 2px 0; background-color: #383C4A; } - menu .separator, - .csd menu .separator, - .menu .separator, + menu .separator:not(label), + .csd menu .separator:not(label), + .menu .separator:not(label), .csd - .menu .separator { + .menu .separator:not(label) { color: #383C4A; } menu menuitem, .menu menuitem { diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 91cbad4..f689efd 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -1539,11 +1539,11 @@ menu, .menu separator { margin: 2px 0; background-color: #ffffff; } - menu .separator, - .csd menu .separator, - .menu .separator, + menu .separator:not(label), + .csd menu .separator:not(label), + .menu .separator:not(label), .csd - .menu .separator { + .menu .separator:not(label) { color: #ffffff; } menu menuitem, .menu menuitem { diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 3a9c6a6..9a1f701 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -1540,11 +1540,11 @@ menu, .menu separator { margin: 2px 0; background-color: #383C4A; } - menu .separator, - .csd menu .separator, - .menu .separator, + menu .separator:not(label), + .csd menu .separator:not(label), + .menu .separator:not(label), .csd - .menu .separator { + .menu .separator:not(label) { color: #383C4A; } menu menuitem, .menu menuitem { diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index 8e1daaa..b4de82b 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -1539,11 +1539,11 @@ menu, .menu separator { margin: 2px 0; background-color: #ffffff; } - menu .separator, - .csd menu .separator, - .menu .separator, + menu .separator:not(label), + .csd menu .separator:not(label), + .menu .separator:not(label), .csd - .menu .separator { + .menu .separator:not(label) { color: #ffffff; } menu menuitem, .menu menuitem { diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index acd24c3..62c6e3a 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -1543,11 +1543,11 @@ menu, .menu separator { margin: 2px 0; background-color: #ffffff; } - menu .separator, - .csd menu .separator, - .menu .separator, + menu .separator:not(label), + .csd menu .separator:not(label), + .menu .separator:not(label), .csd - .menu .separator { + .menu .separator:not(label) { color: #ffffff; } menu menuitem, .menu menuitem { diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index b0a2580..a25de10 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -1543,11 +1543,11 @@ menu, .menu separator { margin: 2px 0; background-color: #ffffff; } - menu .separator, - .csd menu .separator, - .menu .separator, + menu .separator:not(label), + .csd menu .separator:not(label), + .menu .separator:not(label), .csd - .menu .separator { + .menu .separator:not(label) { color: #ffffff; } menu menuitem, .menu menuitem { diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index 68ad9aa..8cf477d 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -1616,8 +1616,9 @@ menu, } // Firefox workaround - .separator, - .csd & .separator { color: $_menu_bg; } + .separator:not(label), + .csd & .separator:not(label) { color: $_menu_bg; } + // Firefox workaround end menuitem { min-height: 16px; From 662fbcdc31e582b90784a1aa6d12aabbf9ca40a8 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Tue, 17 May 2016 19:27:35 +0200 Subject: [PATCH 12/13] gtk3: export link_color variable (fix #536) --- common/gtk-3.0/3.14/gtk-dark.css | 1 + common/gtk-3.0/3.14/gtk-darker.css | 1 + common/gtk-3.0/3.14/gtk-solid-dark.css | 1 + common/gtk-3.0/3.14/gtk-solid-darker.css | 1 + common/gtk-3.0/3.14/gtk-solid.css | 1 + common/gtk-3.0/3.14/gtk.css | 1 + common/gtk-3.0/3.14/sass/_colors-public.scss | 1 + common/gtk-3.0/3.16/gtk-dark.css | 1 + common/gtk-3.0/3.16/gtk-darker.css | 1 + common/gtk-3.0/3.16/gtk-solid-dark.css | 1 + common/gtk-3.0/3.16/gtk-solid-darker.css | 1 + common/gtk-3.0/3.16/gtk-solid.css | 1 + common/gtk-3.0/3.16/gtk.css | 1 + common/gtk-3.0/3.16/sass/_colors-public.scss | 1 + common/gtk-3.0/3.18/gtk-dark.css | 1 + common/gtk-3.0/3.18/gtk-darker.css | 1 + common/gtk-3.0/3.18/gtk-solid-dark.css | 1 + common/gtk-3.0/3.18/gtk-solid-darker.css | 1 + common/gtk-3.0/3.18/gtk-solid.css | 1 + common/gtk-3.0/3.18/gtk.css | 1 + common/gtk-3.0/3.18/sass/_colors-public.scss | 1 + common/gtk-3.0/3.20/gtk-dark.css | 1 + common/gtk-3.0/3.20/gtk-darker.css | 1 + common/gtk-3.0/3.20/gtk-solid-dark.css | 1 + common/gtk-3.0/3.20/gtk-solid-darker.css | 1 + common/gtk-3.0/3.20/gtk-solid.css | 1 + common/gtk-3.0/3.20/gtk.css | 1 + common/gtk-3.0/3.20/sass/_colors-public.scss | 1 + 28 files changed, 28 insertions(+) diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css index 0707d9f..3b8ae54 100644 --- a/common/gtk-3.0/3.14/gtk-dark.css +++ b/common/gtk-3.0/3.14/gtk-dark.css @@ -4014,6 +4014,7 @@ MarlinViewWindow MarlinPlacesSidebar .slider.scrollbar, GeditFileBrowserWidget . @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #a9caf1; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); @define-color wm_bg #2f343f; diff --git a/common/gtk-3.0/3.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css index 659ff2f..9e161d9 100644 --- a/common/gtk-3.0/3.14/gtk-darker.css +++ b/common/gtk-3.0/3.14/gtk-darker.css @@ -4007,6 +4007,7 @@ MarlinViewWindow MarlinPlacesSidebar .slider.scrollbar, GeditFileBrowserWidget . @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #2679db; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); @define-color wm_bg #2f343f; diff --git a/common/gtk-3.0/3.14/gtk-solid-dark.css b/common/gtk-3.0/3.14/gtk-solid-dark.css index 84a483f..5687164 100644 --- a/common/gtk-3.0/3.14/gtk-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-solid-dark.css @@ -4014,6 +4014,7 @@ MarlinViewWindow MarlinPlacesSidebar .slider.scrollbar, GeditFileBrowserWidget . @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #a9caf1; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); @define-color wm_bg #2f343f; diff --git a/common/gtk-3.0/3.14/gtk-solid-darker.css b/common/gtk-3.0/3.14/gtk-solid-darker.css index 36394a7..c4aac5b 100644 --- a/common/gtk-3.0/3.14/gtk-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-solid-darker.css @@ -4007,6 +4007,7 @@ MarlinViewWindow MarlinPlacesSidebar .slider.scrollbar, GeditFileBrowserWidget . @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #2679db; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); @define-color wm_bg #2f343f; diff --git a/common/gtk-3.0/3.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css index 999befb..a9d8b45 100644 --- a/common/gtk-3.0/3.14/gtk-solid.css +++ b/common/gtk-3.0/3.14/gtk-solid.css @@ -4007,6 +4007,7 @@ MarlinViewWindow MarlinPlacesSidebar .slider.scrollbar, GeditFileBrowserWidget . @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #2679db; @define-color wm_title alpha(#525d76, 0.8); @define-color wm_unfocused_title alpha(#525d76, 0.5); @define-color wm_bg #e7e8eb; diff --git a/common/gtk-3.0/3.14/gtk.css b/common/gtk-3.0/3.14/gtk.css index 7651a76..0f13a15 100644 --- a/common/gtk-3.0/3.14/gtk.css +++ b/common/gtk-3.0/3.14/gtk.css @@ -4007,6 +4007,7 @@ MarlinViewWindow MarlinPlacesSidebar .slider.scrollbar, GeditFileBrowserWidget . @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #2679db; @define-color wm_title alpha(#525d76, 0.8); @define-color wm_unfocused_title alpha(#525d76, 0.5); @define-color wm_bg #e7e8eb; 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 84970bd..b6b3dc5 100644 --- a/common/gtk-3.0/3.14/sass/_colors-public.scss +++ b/common/gtk-3.0/3.14/sass/_colors-public.scss @@ -29,6 +29,7 @@ @define-color error_color #{"" + $error_color}; @define-color success_color #{"" + $success_color}; @define-color placeholder_text_color #{#A8A8A8}; +@define-color link_color #{"" + $link_color}; //WM $wm_highlight: lighten(opacify($header_bg, 1), 3%); diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css index 1c733b3..cb8e163 100644 --- a/common/gtk-3.0/3.16/gtk-dark.css +++ b/common/gtk-3.0/3.16/gtk-dark.css @@ -3853,6 +3853,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #a9caf1; @define-color content_view_bg #404552; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); diff --git a/common/gtk-3.0/3.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css index 9c20bc9..1267c82 100644 --- a/common/gtk-3.0/3.16/gtk-darker.css +++ b/common/gtk-3.0/3.16/gtk-darker.css @@ -3846,6 +3846,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #2679db; @define-color content_view_bg #ffffff; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); diff --git a/common/gtk-3.0/3.16/gtk-solid-dark.css b/common/gtk-3.0/3.16/gtk-solid-dark.css index 95b8ebd..d15ccad 100644 --- a/common/gtk-3.0/3.16/gtk-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-solid-dark.css @@ -3853,6 +3853,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #a9caf1; @define-color content_view_bg #404552; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); diff --git a/common/gtk-3.0/3.16/gtk-solid-darker.css b/common/gtk-3.0/3.16/gtk-solid-darker.css index d66b014..a949c92 100644 --- a/common/gtk-3.0/3.16/gtk-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-solid-darker.css @@ -3846,6 +3846,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #2679db; @define-color content_view_bg #ffffff; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); diff --git a/common/gtk-3.0/3.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css index f95f35b..ba72279 100644 --- a/common/gtk-3.0/3.16/gtk-solid.css +++ b/common/gtk-3.0/3.16/gtk-solid.css @@ -3846,6 +3846,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #2679db; @define-color content_view_bg #ffffff; @define-color wm_title alpha(#525d76, 0.8); @define-color wm_unfocused_title alpha(#525d76, 0.5); diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css index 347c7ce..98e7e82 100644 --- a/common/gtk-3.0/3.16/gtk.css +++ b/common/gtk-3.0/3.16/gtk.css @@ -3846,6 +3846,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #2679db; @define-color content_view_bg #ffffff; @define-color wm_title alpha(#525d76, 0.8); @define-color wm_unfocused_title alpha(#525d76, 0.5); 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 bada81a..7d0abba 100644 --- a/common/gtk-3.0/3.16/sass/_colors-public.scss +++ b/common/gtk-3.0/3.16/sass/_colors-public.scss @@ -28,6 +28,7 @@ @define-color error_color #{"" + $error_color}; @define-color success_color #{"" + $success_color}; @define-color placeholder_text_color #{#A8A8A8}; +@define-color link_color #{"" + $link_color}; @define-color content_view_bg #{"" + $base_color}; diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index 8b33519..8f5f85d 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -4006,6 +4006,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #a9caf1; @define-color content_view_bg #404552; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index 33c87ac..93ef024 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -3999,6 +3999,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #2679db; @define-color content_view_bg #ffffff; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index 13c72fc..84e87d7 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -4006,6 +4006,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #a9caf1; @define-color content_view_bg #404552; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index 9de6146..81b8e0e 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -3999,6 +3999,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #2679db; @define-color content_view_bg #ffffff; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index adf8d39..bf933ca 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -4003,6 +4003,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #2679db; @define-color content_view_bg #ffffff; @define-color wm_title alpha(#525d76, 0.8); @define-color wm_unfocused_title alpha(#525d76, 0.5); diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index 98a2566..6b5d571 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -4003,6 +4003,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #2679db; @define-color content_view_bg #ffffff; @define-color wm_title alpha(#525d76, 0.8); @define-color wm_unfocused_title alpha(#525d76, 0.5); diff --git a/common/gtk-3.0/3.18/sass/_colors-public.scss b/common/gtk-3.0/3.18/sass/_colors-public.scss index bada81a..7d0abba 100644 --- a/common/gtk-3.0/3.18/sass/_colors-public.scss +++ b/common/gtk-3.0/3.18/sass/_colors-public.scss @@ -28,6 +28,7 @@ @define-color error_color #{"" + $error_color}; @define-color success_color #{"" + $success_color}; @define-color placeholder_text_color #{#A8A8A8}; +@define-color link_color #{"" + $link_color}; @define-color content_view_bg #{"" + $base_color}; diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index e317ef3..034c752 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -4210,6 +4210,7 @@ filechooser placessidebar.sidebar scrollbar, @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #a9caf1; @define-color content_view_bg #404552; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index f689efd..6cf6f13 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -4212,6 +4212,7 @@ filechooser placessidebar.sidebar scrollbar, @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #2679db; @define-color content_view_bg #ffffff; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 9a1f701..5fc855f 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -4210,6 +4210,7 @@ filechooser placessidebar.sidebar scrollbar, @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #a9caf1; @define-color content_view_bg #404552; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index b4de82b..f515b6a 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -4212,6 +4212,7 @@ filechooser placessidebar.sidebar scrollbar, @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #2679db; @define-color content_view_bg #ffffff; @define-color wm_title alpha(#cfdae7, 0.8); @define-color wm_unfocused_title alpha(#cfdae7, 0.5); diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 62c6e3a..87ce4d3 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -4216,6 +4216,7 @@ filechooser placessidebar.sidebar scrollbar, @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #2679db; @define-color content_view_bg #ffffff; @define-color wm_title alpha(#525d76, 0.8); @define-color wm_unfocused_title alpha(#525d76, 0.5); diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index a25de10..f20d7d6 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -4216,6 +4216,7 @@ filechooser placessidebar.sidebar scrollbar, @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color link_color #2679db; @define-color content_view_bg #ffffff; @define-color wm_title alpha(#525d76, 0.8); @define-color wm_unfocused_title alpha(#525d76, 0.5); diff --git a/common/gtk-3.0/3.20/sass/_colors-public.scss b/common/gtk-3.0/3.20/sass/_colors-public.scss index bada81a..7d0abba 100644 --- a/common/gtk-3.0/3.20/sass/_colors-public.scss +++ b/common/gtk-3.0/3.20/sass/_colors-public.scss @@ -28,6 +28,7 @@ @define-color error_color #{"" + $error_color}; @define-color success_color #{"" + $success_color}; @define-color placeholder_text_color #{#A8A8A8}; +@define-color link_color #{"" + $link_color}; @define-color content_view_bg #{"" + $base_color}; From d32e573efbfe9fd030f3fec639bcc9f7b8b285dc Mon Sep 17 00:00:00 2001 From: horst3180 Date: Tue, 17 May 2016 20:05:54 +0200 Subject: [PATCH 13/13] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index a7cb23c..cd2be86 100644 --- a/README.md +++ b/README.md @@ -137,6 +137,9 @@ To install the Chrome/Chromium theme go to the `extra/Chrome` folder and drag an To install the Plank theme, copy the `extra/Arc-Plank` folder to `~/.local/share/plank/themes` or to `/usr/share/plank/themes` for system-wide use. Now open the Plank preferences window by executing `plank --preferences` from a terminal and select `Arc-Plank` as the theme. +#### Arc-Dark for Ubuntu Software Center +The Arc Dark theme for the Ubuntu Software Center by [mervick](https://github.com/mervick) can be installed from [here](https://github.com/mervick/arc-dark-software-center). It solves readability issues with Arc Dark and the Ubuntu Software Center. + ### Troubleshooting If you have Ubuntu with a newer GTK/Gnome version than the one included by default (i.e Ubuntu 14.04 with GTK 3.14 or Ubuntu 15.04 with GTK 3.16, etc.) the prebuilt packages won't work properly and you have to install the theme manually as described above.