diff --git a/src/assets/xfwm4/assets-dark.svg b/src/assets/xfwm4/assets-dark.svg index 6b389dc..3f4b99e 100644 --- a/src/assets/xfwm4/assets-dark.svg +++ b/src/assets/xfwm4/assets-dark.svg @@ -16,22 +16,10 @@ viewBox="0 0 224 217" id="svg2" version="1.1" - inkscape:version="0.92.4 5da689c313, 2019-01-14" + inkscape:version="0.92.5 (unknown)" sodipodi:docname="assets-dark.svg"> - - - - @@ -84,16 +72,6 @@ x2="154" y2="606.36218" gradientUnits="userSpaceOnUse" /> - @@ -110,16 +88,6 @@ offset="0" id="stop4421" /> - - - @@ -475,7 +433,7 @@ + style="opacity:1;fill:#373737;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#373737;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#373737;fill-opacity:1;stroke:none;stroke-width:0.66666669;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - - - - + style="opacity:1;fill:#373737;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - - - - @@ -84,40 +72,20 @@ x2="154" y2="606.36218" gradientUnits="userSpaceOnUse" /> - - - - @@ -163,7 +121,7 @@ image/svg+xml - + @@ -1484,7 +1442,7 @@ style="opacity:1" id="g4206"> + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.66666669;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - - + style="opacity:1;fill:#939393;fill-opacity:1;stroke:none;stroke-width:0.66666669;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.66666669;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - - + style="opacity:1;fill:#939393;fill-opacity:1;stroke:none;stroke-width:0.66666669;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> StIcon, .search-provider-icon .overview-icon > StIcon, +.show-apps .overview-icon, +.show-apps .overview-icon > StIcon, +.app-well-app .overview-icon, +.app-well-app .overview-icon > StIcon { + icon-shadow: 0 1px 3px 3px rgba(0, 0, 0, 0.15); +} + .search-provider-icon:hover .overview-icon, .search-provider-icon:focus .overview-icon, .search-provider-icon:selected .overview-icon, .show-apps:hover .overview-icon, .show-apps:focus .overview-icon, @@ -2999,18 +3007,15 @@ StWidget.focused .app-well-app-running-dot { min-height: 20px; background-color: #212121; border-radius: 6px; - border: 1px solid rgba(255, 255, 255, 0.12); - box-shadow: none; + box-shadow: inset 0 0 0 2px transparent; } .login-dialog StEntry:focus { - border: 1px solid #4d8ef9; - box-shadow: 0 0 0 1px #4d8ef9; + box-shadow: inset 0 0 0 2px #4d8ef9; } .login-dialog StEntry:insensitive { color: rgba(222, 222, 222, 0.35); - border: 1px solid rgba(255, 255, 255, 0.06); } .login-dialog .modal-dialog-button-box { @@ -3687,13 +3692,11 @@ StWidget.focused .app-well-app-running-dot { selected-color: white; background-color: #212121; border-radius: 6px; - border: 1px solid rgba(255, 255, 255, 0.12); - box-shadow: none; + box-shadow: inset 0 0 0 2px transparent; } .popup-menu .search-entry:focus { - border: 1px solid #4d8ef9; - box-shadow: 0 0 0 1px #4d8ef9; + box-shadow: inset 0 0 0 2px #4d8ef9; color: #dedede; } diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css index 4afcd24..2a66537 100644 --- a/src/main/gnome-shell/gnome-shell-dark.css +++ b/src/main/gnome-shell/gnome-shell-dark.css @@ -86,7 +86,6 @@ StEntry { min-width: 44px; padding: 0 8px; margin: 3px; - border-radius: 3px; border-width: 0; color: #dedede; caret-color: #dedede; @@ -96,18 +95,19 @@ StEntry { font-weight: 400; background-color: #212121; border-radius: 6px; - border: 1px solid rgba(255, 255, 255, 0.12); - box-shadow: none; + box-shadow: inset 0 0 0 2px transparent; +} + +StEntry:hover { + box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05), inset 0 0 0 2px transparent; } StEntry:focus { - border: 1px solid #4d8ef9; - box-shadow: 0 0 0 1px #4d8ef9; + box-shadow: inset 0 0 0 2px #4d8ef9; } StEntry:insensitive { color: rgba(222, 222, 222, 0.35); - border: 1px solid rgba(255, 255, 255, 0.06); } StEntry StIcon.capslock-warning { @@ -1386,7 +1386,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } #panel.solid { - background-color: rgba(42, 42, 42, 0.85); + background-color: rgba(42, 42, 42, 0.25); /* transition from transparent to solid */ transition-duration: 250ms; background-gradient-direction: none; @@ -1398,11 +1398,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } #panel.solid .panel-corner { - -panel-corner-background-color: rgba(42, 42, 42, 0.85); + -panel-corner-background-color: rgba(42, 42, 42, 0.25); } #panel.solid .panel-button { - color: #dadada; + color: white; text-shadow: none; } @@ -2353,6 +2353,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { transition-duration: 150ms; } +.grid-search-result .overview-icon, .search-provider-icon .overview-icon, .grid-search-result .overview-icon > StIcon, .search-provider-icon .overview-icon > StIcon, +.show-apps .overview-icon, +.show-apps .overview-icon > StIcon, +.app-well-app .overview-icon, +.app-well-app .overview-icon > StIcon { + icon-shadow: 0 1px 3px 3px rgba(0, 0, 0, 0.15); +} + .search-provider-icon:hover .overview-icon, .search-provider-icon:focus .overview-icon, .search-provider-icon:selected .overview-icon, .show-apps:hover .overview-icon, .show-apps:focus .overview-icon, @@ -2999,18 +3007,15 @@ StWidget.focused .app-well-app-running-dot { min-height: 20px; background-color: #212121; border-radius: 6px; - border: 1px solid rgba(255, 255, 255, 0.12); - box-shadow: none; + box-shadow: inset 0 0 0 2px transparent; } .login-dialog StEntry:focus { - border: 1px solid #4d8ef9; - box-shadow: 0 0 0 1px #4d8ef9; + box-shadow: inset 0 0 0 2px #4d8ef9; } .login-dialog StEntry:insensitive { color: rgba(222, 222, 222, 0.35); - border: 1px solid rgba(255, 255, 255, 0.06); } .login-dialog .modal-dialog-button-box { @@ -3687,13 +3692,11 @@ StWidget.focused .app-well-app-running-dot { selected-color: white; background-color: #212121; border-radius: 6px; - border: 1px solid rgba(255, 255, 255, 0.12); - box-shadow: none; + box-shadow: inset 0 0 0 2px transparent; } .popup-menu .search-entry:focus { - border: 1px solid #4d8ef9; - box-shadow: 0 0 0 1px #4d8ef9; + box-shadow: inset 0 0 0 2px #4d8ef9; color: #dedede; } diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css index 91561e6..50bab69 100644 --- a/src/main/gnome-shell/gnome-shell-light-solid.css +++ b/src/main/gnome-shell/gnome-shell-light-solid.css @@ -86,7 +86,6 @@ StEntry { min-width: 44px; padding: 0 8px; margin: 3px; - border-radius: 3px; border-width: 0; color: #242424; caret-color: #242424; @@ -96,18 +95,19 @@ StEntry { font-weight: 400; background-color: #fafafa; border-radius: 6px; - border: 1px solid rgba(0, 0, 0, 0.12); - box-shadow: none; + box-shadow: inset 0 0 0 2px transparent; +} + +StEntry:hover { + box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.05), inset 0 0 0 2px transparent; } StEntry:focus { - border: 1px solid #4d8ef9; - box-shadow: 0 0 0 1px #4d8ef9; + box-shadow: inset 0 0 0 2px #4d8ef9; } StEntry:insensitive { color: rgba(36, 36, 36, 0.45); - border: 1px solid rgba(0, 0, 0, 0.06); } StEntry StIcon.capslock-warning { @@ -1402,7 +1402,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } #panel.solid .panel-button { - color: #363636; + color: white; text-shadow: none; } @@ -2353,6 +2353,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { transition-duration: 150ms; } +.grid-search-result .overview-icon, .search-provider-icon .overview-icon, .grid-search-result .overview-icon > StIcon, .search-provider-icon .overview-icon > StIcon, +.show-apps .overview-icon, +.show-apps .overview-icon > StIcon, +.app-well-app .overview-icon, +.app-well-app .overview-icon > StIcon { + icon-shadow: 0 1px 3px 3px rgba(0, 0, 0, 0.15); +} + .search-provider-icon:hover .overview-icon, .search-provider-icon:focus .overview-icon, .search-provider-icon:selected .overview-icon, .show-apps:hover .overview-icon, .show-apps:focus .overview-icon, @@ -2999,18 +3007,15 @@ StWidget.focused .app-well-app-running-dot { min-height: 20px; background-color: #fafafa; border-radius: 6px; - border: 1px solid rgba(0, 0, 0, 0.12); - box-shadow: none; + box-shadow: inset 0 0 0 2px transparent; } .login-dialog StEntry:focus { - border: 1px solid #4d8ef9; - box-shadow: 0 0 0 1px #4d8ef9; + box-shadow: inset 0 0 0 2px #4d8ef9; } .login-dialog StEntry:insensitive { color: rgba(36, 36, 36, 0.45); - border: 1px solid rgba(0, 0, 0, 0.06); } .login-dialog .modal-dialog-button-box { @@ -3687,13 +3692,11 @@ StWidget.focused .app-well-app-running-dot { selected-color: white; background-color: #fafafa; border-radius: 6px; - border: 1px solid rgba(0, 0, 0, 0.12); - box-shadow: none; + box-shadow: inset 0 0 0 2px transparent; } .popup-menu .search-entry:focus { - border: 1px solid #4d8ef9; - box-shadow: 0 0 0 1px #4d8ef9; + box-shadow: inset 0 0 0 2px #4d8ef9; color: #242424; } diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css index 355a332..00a3a57 100644 --- a/src/main/gnome-shell/gnome-shell-light.css +++ b/src/main/gnome-shell/gnome-shell-light.css @@ -86,7 +86,6 @@ StEntry { min-width: 44px; padding: 0 8px; margin: 3px; - border-radius: 3px; border-width: 0; color: #242424; caret-color: #242424; @@ -96,18 +95,19 @@ StEntry { font-weight: 400; background-color: #fafafa; border-radius: 6px; - border: 1px solid rgba(0, 0, 0, 0.12); - box-shadow: none; + box-shadow: inset 0 0 0 2px transparent; +} + +StEntry:hover { + box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.05), inset 0 0 0 2px transparent; } StEntry:focus { - border: 1px solid #4d8ef9; - box-shadow: 0 0 0 1px #4d8ef9; + box-shadow: inset 0 0 0 2px #4d8ef9; } StEntry:insensitive { color: rgba(36, 36, 36, 0.45); - border: 1px solid rgba(0, 0, 0, 0.06); } StEntry StIcon.capslock-warning { @@ -1386,7 +1386,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } #panel.solid { - background-color: rgba(241, 241, 241, 0.85); + background-color: rgba(241, 241, 241, 0.25); /* transition from transparent to solid */ transition-duration: 250ms; background-gradient-direction: none; @@ -1398,11 +1398,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } #panel.solid .panel-corner { - -panel-corner-background-color: rgba(241, 241, 241, 0.85); + -panel-corner-background-color: rgba(241, 241, 241, 0.25); } #panel.solid .panel-button { - color: #363636; + color: white; text-shadow: none; } @@ -2353,6 +2353,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { transition-duration: 150ms; } +.grid-search-result .overview-icon, .search-provider-icon .overview-icon, .grid-search-result .overview-icon > StIcon, .search-provider-icon .overview-icon > StIcon, +.show-apps .overview-icon, +.show-apps .overview-icon > StIcon, +.app-well-app .overview-icon, +.app-well-app .overview-icon > StIcon { + icon-shadow: 0 1px 3px 3px rgba(0, 0, 0, 0.15); +} + .search-provider-icon:hover .overview-icon, .search-provider-icon:focus .overview-icon, .search-provider-icon:selected .overview-icon, .show-apps:hover .overview-icon, .show-apps:focus .overview-icon, @@ -2999,18 +3007,15 @@ StWidget.focused .app-well-app-running-dot { min-height: 20px; background-color: #fafafa; border-radius: 6px; - border: 1px solid rgba(0, 0, 0, 0.12); - box-shadow: none; + box-shadow: inset 0 0 0 2px transparent; } .login-dialog StEntry:focus { - border: 1px solid #4d8ef9; - box-shadow: 0 0 0 1px #4d8ef9; + box-shadow: inset 0 0 0 2px #4d8ef9; } .login-dialog StEntry:insensitive { color: rgba(36, 36, 36, 0.45); - border: 1px solid rgba(0, 0, 0, 0.06); } .login-dialog .modal-dialog-button-box { @@ -3687,13 +3692,11 @@ StWidget.focused .app-well-app-running-dot { selected-color: white; background-color: #fafafa; border-radius: 6px; - border: 1px solid rgba(0, 0, 0, 0.12); - box-shadow: none; + box-shadow: inset 0 0 0 2px transparent; } .popup-menu .search-entry:focus { - border: 1px solid #4d8ef9; - box-shadow: 0 0 0 1px #4d8ef9; + box-shadow: inset 0 0 0 2px #4d8ef9; color: #242424; } diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css index 00f51c5..6941a8e 100644 --- a/src/main/gtk-3.0/gtk-dark-solid.css +++ b/src/main/gtk-3.0/gtk-dark-solid.css @@ -6487,7 +6487,7 @@ panel-toplevel.background menubar { panel-toplevel.background menubar, panel-toplevel.background #PanelApplet label, panel-toplevel.background #PanelApplet image { - color: #dadada; + color: white; } .mate-panel-menu-bar button label, .mate-panel-menu-bar button image, @@ -6502,7 +6502,7 @@ panel-toplevel.background #tasklist-button image { .mate-panel-menu-bar .wnck-pager, panel-toplevel.background .wnck-pager { - color: #6d6d6d; + color: gray; background-color: #111111; } @@ -6573,24 +6573,21 @@ panel-toplevel.background na-tray-applet { .xfce4-panel button, .xfce4-panel button.flat, .xfce4-panel .raven .raven-header:not(.top) button, .raven .raven-header:not(.top) .xfce4-panel button, .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .mate-panel-menu-bar button:not(#tasklist-button), panel-toplevel.background button:not(#tasklist-button) { - color: #dadada; - border-radius: 0; + color: white; + border-radius: 6px; border: none; - background-color: transparent; } .xfce4-panel button:hover:not(:active):not(:checked), .mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button), panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button) { - color: #dedede; - box-shadow: inset 0 -2px rgba(8, 96, 242, 0.5); + color: white; + background-color: rgba(255, 255, 255, 0.2); } .xfce4-panel button:checked, .mate-panel-menu-bar button:checked:not(#tasklist-button), panel-toplevel.background button:checked:not(#tasklist-button) { - color: #dedede; - box-shadow: inset 0 -2px #0860f2; - background-color: rgba(222, 222, 222, 0.12); - background-image: none; + color: white; + background-color: rgba(255, 255, 255, 0.25); } .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, @@ -6601,10 +6598,8 @@ panel-toplevel.background button:checked:not(#tasklist-button) image { .xfce4-panel button:active, .mate-panel-menu-bar button:active:not(#tasklist-button), panel-toplevel.background button:active:not(#tasklist-button) { - background-color: rgba(222, 222, 222, 0.18); - color: #dedede; - background-image: none; - box-shadow: inset 0 -2px #0860f2; + color: white; + background-color: rgba(255, 255, 255, 0.3); } .xfce4-panel.panel { @@ -6622,10 +6617,12 @@ panel-toplevel.background button:active:not(#tasklist-button) { .xfce4-panel { background-color: #2a2a2a; - color: #dadada; + color: white; font-weight: 700; text-shadow: none; -gtk-icon-shadow: none; + box-shadow: none; + border-width: 0; } .xfce4-panel, @@ -7343,12 +7340,36 @@ button.flat.-panel-icon-button:checked, color: white; } +menubar.-vala-panel-appmenu-private, +menubar.-vala-panel-background { + background: none; + border: none; + box-shadow: none; +} + +menubar.-vala-panel-appmenu-private > menuitem, +menubar.-vala-panel-background > menuitem { + color: white; + font-weight: normal; +} + +menubar.-vala-panel-appmenu-private > menuitem:hover, +menubar.-vala-panel-background > menuitem:hover { + color: white; + background-color: rgba(255, 255, 255, 0.2); +} + +menubar.-vala-panel-appmenu-private > menuitem:disabled, +menubar.-vala-panel-background > menuitem:disabled { + color: rgba(255, 255, 255, 0.4); +} + .menubar.panel .panel, .menubar.panel .panel.color-light, .menubar.panel .panel.color-dark { background-color: transparent; background-image: linear-gradient(0deg, rgba(42, 42, 42, 0.95) 0%, rgba(51, 51, 51, 0.95) 100%); border-bottom: 1px solid #0e0e0e; transition: all 100ms ease-in-out; - color: #dadada; + color: white; } .menubar.panel .panel.maximized { @@ -7491,7 +7512,7 @@ button.flat.-panel-icon-button:checked, .composited-indicator > revealer label, .composited-indicator > revealer image, .composited-indicator > revealer spinner { - color: #dadada; + color: white; font-weight: normal; transition: all 200ms ease-in-out; text-shadow: none; @@ -7508,7 +7529,7 @@ button.flat.-panel-icon-button:checked, } .composited-indicator .keyboard { - background-color: #dadada; + background-color: white; border-radius: 2px; color: #2a2a2a; padding: 0 3px; @@ -7837,7 +7858,7 @@ UnityPanelWidget, UnityPanelWidget:backdrop, .unity-panel:backdrop { - color: #dddddd; + color: white; } .unity-panel.menubar.menuitem:hover, @@ -8142,7 +8163,7 @@ GtkListBox .h4 { #panel_window { background-color: #2a2a2a; - color: #dadada; + color: white; font-weight: bold; box-shadow: inset 0 -1px #181818; } @@ -8153,12 +8174,12 @@ GtkListBox .h4 { #panel_window menubar, #panel_window menubar > menuitem { background-color: transparent; - color: #dadada; + color: white; font-weight: bold; } #panel_window menubar menuitem:disabled { - color: rgba(218, 218, 218, 0.5); + color: rgba(255, 255, 255, 0.5); } #panel_window menubar menuitem:disabled label { @@ -8375,9 +8396,7 @@ filechooser placessidebar.sidebar, .nautilus-window placessidebar.sidebar { border: none; background-color: transparent; - max-width: 180px; min-width: 180px; - width: 180px; } @@ -9141,7 +9160,7 @@ popover.background.places-menu row { .budgie-panel { transition: background-color 0.2s cubic-bezier(0, 0, 0.2, 1); background-color: #2a2a2a; - color: #dadada; + color: white; font-weight: 500; box-shadow: none; background-clip: padding-box; @@ -9204,25 +9223,25 @@ popover.background.places-menu row { border-bottom-width: 0; border: none; box-shadow: none; - color: rgba(218, 218, 218, 0.85); + color: rgba(255, 255, 255, 0.85); background: none; } .budgie-panel button:hover { - background-color: rgba(218, 218, 218, 0.1); - color: rgba(218, 218, 218, 0.95); + background-color: rgba(255, 255, 255, 0.1); + color: rgba(255, 255, 255, 0.95); background-image: none; } .budgie-panel button:active { - background-color: rgba(218, 218, 218, 0.15); - color: #dadada; + background-color: rgba(255, 255, 255, 0.15); + color: white; background-image: none; } .budgie-panel button:checked { - background-color: rgba(218, 218, 218, 0.12); - color: #dadada; + background-color: rgba(255, 255, 255, 0.12); + color: white; } .budgie-panel.horizontal button { @@ -9240,7 +9259,7 @@ popover.background.places-menu row { .budgie-panel menubar, .budgie-panel .menubar { box-shadow: none; - color: #dadada; + color: white; background-image: none; background-color: transparent; } @@ -9266,12 +9285,12 @@ popover.background.places-menu row { .budgie-panel menubar > menuitem:disabled, .budgie-panel .menubar > menuitem:disabled { - color: rgba(218, 218, 218, 0.4); + color: rgba(255, 255, 255, 0.4); } .budgie-panel menubar > menuitem.budgie-menubar:hover, .budgie-panel .menubar > menuitem.budgie-menubar:hover { - background-color: rgba(218, 218, 218, 0.1); + background-color: rgba(255, 255, 255, 0.1); } .budgie-panel menubar.-vala-panel-appmenu-private > menuitem { @@ -10117,7 +10136,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow { } .budgie-panel box.titlebar > widget > label { - color: rgba(218, 218, 218, 0.75); + color: rgba(255, 255, 255, 0.75); } .budgie-panel box.titlebar > button.image-button.titlebutton { diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css index 937571f..6f7b118 100644 --- a/src/main/gtk-3.0/gtk-dark.css +++ b/src/main/gtk-3.0/gtk-dark.css @@ -6487,7 +6487,7 @@ panel-toplevel.background menubar { panel-toplevel.background menubar, panel-toplevel.background #PanelApplet label, panel-toplevel.background #PanelApplet image { - color: #dadada; + color: white; } .mate-panel-menu-bar button label, .mate-panel-menu-bar button image, @@ -6502,13 +6502,13 @@ panel-toplevel.background #tasklist-button image { .mate-panel-menu-bar .wnck-pager, panel-toplevel.background .wnck-pager { - color: #6d6d6d; - background-color: rgba(17, 17, 17, 0.85); + color: gray; + background-color: rgba(17, 17, 17, 0.25); } .mate-panel-menu-bar .wnck-pager:hover, panel-toplevel.background .wnck-pager:hover { - background-color: rgba(55, 55, 55, 0.85); + background-color: rgba(55, 55, 55, 0.25); } .mate-panel-menu-bar .wnck-pager:selected, @@ -6573,24 +6573,21 @@ panel-toplevel.background na-tray-applet { .xfce4-panel button, .xfce4-panel button.flat, .xfce4-panel .raven .raven-header:not(.top) button, .raven .raven-header:not(.top) .xfce4-panel button, .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .mate-panel-menu-bar button:not(#tasklist-button), panel-toplevel.background button:not(#tasklist-button) { - color: #dadada; - border-radius: 0; + color: white; + border-radius: 6px; border: none; - background-color: transparent; } .xfce4-panel button:hover:not(:active):not(:checked), .mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button), panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button) { - color: #dedede; - box-shadow: inset 0 -2px rgba(8, 96, 242, 0.5); + color: white; + background-color: rgba(255, 255, 255, 0.2); } .xfce4-panel button:checked, .mate-panel-menu-bar button:checked:not(#tasklist-button), panel-toplevel.background button:checked:not(#tasklist-button) { - color: #dedede; - box-shadow: inset 0 -2px #0860f2; - background-color: rgba(222, 222, 222, 0.12); - background-image: none; + color: white; + background-color: rgba(255, 255, 255, 0.25); } .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, @@ -6601,14 +6598,12 @@ panel-toplevel.background button:checked:not(#tasklist-button) image { .xfce4-panel button:active, .mate-panel-menu-bar button:active:not(#tasklist-button), panel-toplevel.background button:active:not(#tasklist-button) { - background-color: rgba(222, 222, 222, 0.18); - color: #dedede; - background-image: none; - box-shadow: inset 0 -2px #0860f2; + color: white; + background-color: rgba(255, 255, 255, 0.3); } .xfce4-panel.panel { - background-color: rgba(42, 42, 42, 0.85); + background-color: rgba(42, 42, 42, 0.25); text-shadow: none; -gtk-icon-shadow: none; border: none; @@ -6621,11 +6616,13 @@ panel-toplevel.background button:active:not(#tasklist-button) { } .xfce4-panel { - background-color: rgba(42, 42, 42, 0.85); - color: #dadada; + background-color: rgba(42, 42, 42, 0.25); + color: white; font-weight: 700; text-shadow: none; -gtk-icon-shadow: none; + box-shadow: none; + border-width: 0; } .xfce4-panel, @@ -7343,16 +7340,40 @@ button.flat.-panel-icon-button:checked, color: white; } +menubar.-vala-panel-appmenu-private, +menubar.-vala-panel-background { + background: none; + border: none; + box-shadow: none; +} + +menubar.-vala-panel-appmenu-private > menuitem, +menubar.-vala-panel-background > menuitem { + color: white; + font-weight: normal; +} + +menubar.-vala-panel-appmenu-private > menuitem:hover, +menubar.-vala-panel-background > menuitem:hover { + color: white; + background-color: rgba(255, 255, 255, 0.2); +} + +menubar.-vala-panel-appmenu-private > menuitem:disabled, +menubar.-vala-panel-background > menuitem:disabled { + color: rgba(255, 255, 255, 0.4); +} + .menubar.panel .panel, .menubar.panel .panel.color-light, .menubar.panel .panel.color-dark { background-color: transparent; background-image: linear-gradient(0deg, rgba(42, 42, 42, 0.95) 0%, rgba(51, 51, 51, 0.95) 100%); border-bottom: 1px solid #0e0e0e; transition: all 100ms ease-in-out; - color: #dadada; + color: white; } .menubar.panel .panel.maximized { - background-color: rgba(42, 42, 42, 0.85); + background-color: rgba(42, 42, 42, 0.25); background-image: none; border: none; } @@ -7491,7 +7512,7 @@ button.flat.-panel-icon-button:checked, .composited-indicator > revealer label, .composited-indicator > revealer image, .composited-indicator > revealer spinner { - color: #dadada; + color: white; font-weight: normal; transition: all 200ms ease-in-out; text-shadow: none; @@ -7508,9 +7529,9 @@ button.flat.-panel-icon-button:checked, } .composited-indicator .keyboard { - background-color: #dadada; + background-color: white; border-radius: 2px; - color: rgba(42, 42, 42, 0.85); + color: rgba(42, 42, 42, 0.25); padding: 0 3px; font-weight: normal; box-shadow: none; @@ -7837,7 +7858,7 @@ UnityPanelWidget, UnityPanelWidget:backdrop, .unity-panel:backdrop { - color: #dddddd; + color: white; } .unity-panel.menubar.menuitem:hover, @@ -8141,10 +8162,10 @@ GtkListBox .h4 { } #panel_window { - background-color: rgba(42, 42, 42, 0.85); - color: #dadada; + background-color: rgba(42, 42, 42, 0.25); + color: white; font-weight: bold; - box-shadow: inset 0 -1px rgba(24, 24, 24, 0.85); + box-shadow: inset 0 -1px rgba(24, 24, 24, 0.25); } #panel_window menubar { @@ -8153,12 +8174,12 @@ GtkListBox .h4 { #panel_window menubar, #panel_window menubar > menuitem { background-color: transparent; - color: #dadada; + color: white; font-weight: bold; } #panel_window menubar menuitem:disabled { - color: rgba(218, 218, 218, 0.5); + color: rgba(255, 255, 255, 0.5); } #panel_window menubar menuitem:disabled label { @@ -8375,9 +8396,7 @@ filechooser placessidebar.sidebar, .nautilus-window placessidebar.sidebar { border: none; background-color: transparent; - max-width: 180px; min-width: 180px; - width: 180px; } @@ -9140,8 +9159,8 @@ popover.background.places-menu row { .budgie-panel { transition: background-color 0.2s cubic-bezier(0, 0, 0.2, 1); - background-color: rgba(42, 42, 42, 0.85); - color: #dadada; + background-color: rgba(42, 42, 42, 0.25); + color: white; font-weight: 500; box-shadow: none; background-clip: padding-box; @@ -9204,25 +9223,25 @@ popover.background.places-menu row { border-bottom-width: 0; border: none; box-shadow: none; - color: rgba(218, 218, 218, 0.85); + color: rgba(255, 255, 255, 0.85); background: none; } .budgie-panel button:hover { - background-color: rgba(218, 218, 218, 0.1); - color: rgba(218, 218, 218, 0.95); + background-color: rgba(255, 255, 255, 0.1); + color: rgba(255, 255, 255, 0.95); background-image: none; } .budgie-panel button:active { - background-color: rgba(218, 218, 218, 0.15); - color: #dadada; + background-color: rgba(255, 255, 255, 0.15); + color: white; background-image: none; } .budgie-panel button:checked { - background-color: rgba(218, 218, 218, 0.12); - color: #dadada; + background-color: rgba(255, 255, 255, 0.12); + color: white; } .budgie-panel.horizontal button { @@ -9240,7 +9259,7 @@ popover.background.places-menu row { .budgie-panel menubar, .budgie-panel .menubar { box-shadow: none; - color: #dadada; + color: white; background-image: none; background-color: transparent; } @@ -9266,12 +9285,12 @@ popover.background.places-menu row { .budgie-panel menubar > menuitem:disabled, .budgie-panel .menubar > menuitem:disabled { - color: rgba(218, 218, 218, 0.4); + color: rgba(255, 255, 255, 0.4); } .budgie-panel menubar > menuitem.budgie-menubar:hover, .budgie-panel .menubar > menuitem.budgie-menubar:hover { - background-color: rgba(218, 218, 218, 0.1); + background-color: rgba(255, 255, 255, 0.1); } .budgie-panel menubar.-vala-panel-appmenu-private > menuitem { @@ -10117,7 +10136,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow { } .budgie-panel box.titlebar > widget > label { - color: rgba(218, 218, 218, 0.75); + color: rgba(255, 255, 255, 0.75); } .budgie-panel box.titlebar > button.image-button.titlebutton { @@ -10188,7 +10207,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow { @define-color titlebar_gradient_b #373737; @define-color budgie_tasklist_indicator_color #0860f2; @define-color budgie_tasklist_indicator_color_active #0860f2; -@define-color budgie_tasklist_indicator_color_active_window rgba(21, 75, 165, 0.931); +@define-color budgie_tasklist_indicator_color_active_window rgba(12, 90, 220, 0.655); @define-color budgie_tasklist_indicator_color_attention #F27835; @define-color STRAWBERRY_100 #FF9262; @define-color STRAWBERRY_300 #FF793E; diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css index df17abd..625d7a2 100644 --- a/src/main/gtk-3.0/gtk-light-solid.css +++ b/src/main/gtk-3.0/gtk-light-solid.css @@ -6506,7 +6506,7 @@ panel-toplevel.background menubar { panel-toplevel.background menubar, panel-toplevel.background #PanelApplet label, panel-toplevel.background #PanelApplet image { - color: #363636; + color: white; } .mate-panel-menu-bar button label, .mate-panel-menu-bar button image, @@ -6521,7 +6521,7 @@ panel-toplevel.background #tasklist-button image { .mate-panel-menu-bar .wnck-pager, panel-toplevel.background .wnck-pager { - color: #1b1b1b; + color: gray; background-color: #d8d8d8; } @@ -6592,24 +6592,21 @@ panel-toplevel.background na-tray-applet { .xfce4-panel button, .xfce4-panel button.flat, .xfce4-panel .raven .raven-header:not(.top) button, .raven .raven-header:not(.top) .xfce4-panel button, .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .mate-panel-menu-bar button:not(#tasklist-button), panel-toplevel.background button:not(#tasklist-button) { - color: #363636; - border-radius: 0; + color: white; + border-radius: 6px; border: none; - background-color: transparent; } .xfce4-panel button:hover:not(:active):not(:checked), .mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button), panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button) { - color: #242424; - box-shadow: inset 0 -2px rgba(8, 96, 242, 0.5); + color: white; + background-color: rgba(255, 255, 255, 0.2); } .xfce4-panel button:checked, .mate-panel-menu-bar button:checked:not(#tasklist-button), panel-toplevel.background button:checked:not(#tasklist-button) { - color: #242424; - box-shadow: inset 0 -2px #0860f2; - background-color: rgba(36, 36, 36, 0.12); - background-image: none; + color: white; + background-color: rgba(255, 255, 255, 0.25); } .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, @@ -6620,10 +6617,8 @@ panel-toplevel.background button:checked:not(#tasklist-button) image { .xfce4-panel button:active, .mate-panel-menu-bar button:active:not(#tasklist-button), panel-toplevel.background button:active:not(#tasklist-button) { - background-color: rgba(36, 36, 36, 0.18); - color: #242424; - background-image: none; - box-shadow: inset 0 -2px #0860f2; + color: white; + background-color: rgba(255, 255, 255, 0.3); } .xfce4-panel.panel { @@ -6641,10 +6636,12 @@ panel-toplevel.background button:active:not(#tasklist-button) { .xfce4-panel { background-color: #f1f1f1; - color: #363636; + color: white; font-weight: 700; text-shadow: none; -gtk-icon-shadow: none; + box-shadow: none; + border-width: 0; } .xfce4-panel, @@ -7339,7 +7336,7 @@ button.flat.-panel-icon-button:active, button.flat.-panel-icon-button:checked, .raven .raven-header:not(.top) button.-panel-icon-button:checked { box-shadow: inset 0 -2px #0860f2; - color: #292929; + color: #f2f2f2; background: none; } @@ -7353,7 +7350,7 @@ button.flat.-panel-icon-button:checked, .unpinned button.flat.-panel-icon-button:hover, .unpinned .raven .raven-header:not(.top) button.-panel-icon-button:hover, .raven .raven-header:not(.top) .unpinned button.-panel-icon-button:hover, .unpinned button.flat.-panel-icon-button:active, .unpinned .raven .raven-header:not(.top) button.-panel-icon-button:active, .raven .raven-header:not(.top) .unpinned button.-panel-icon-button:active, .unpinned button.flat.-panel-icon-button:checked, .unpinned .raven .raven-header:not(.top) button.-panel-icon-button:checked, .raven .raven-header:not(.top) .unpinned button.-panel-icon-button:checked { box-shadow: inset 0 -2px #0860f2; - color: #292929; + color: #f2f2f2; } .pinned button.flat.-panel-icon-button.running, .pinned .raven .raven-header:not(.top) button.-panel-icon-button.running, .raven .raven-header:not(.top) .pinned button.-panel-icon-button.running { @@ -7370,7 +7367,31 @@ button.flat.-panel-icon-button:checked, .pinned button.flat.-panel-icon-button.running:hover, .pinned .raven .raven-header:not(.top) button.-panel-icon-button.running:hover, .raven .raven-header:not(.top) .pinned button.-panel-icon-button.running:hover, .pinned button.flat.-panel-icon-button.running:active, .pinned .raven .raven-header:not(.top) button.-panel-icon-button.running:active, .raven .raven-header:not(.top) .pinned button.-panel-icon-button.running:active, .pinned button.flat.-panel-icon-button.running:checked, .pinned .raven .raven-header:not(.top) button.-panel-icon-button.running:checked, .raven .raven-header:not(.top) .pinned button.-panel-icon-button.running:checked { box-shadow: inset 0 -2px #0860f2; - color: #292929; + color: #f2f2f2; +} + +menubar.-vala-panel-appmenu-private, +menubar.-vala-panel-background { + background: none; + border: none; + box-shadow: none; +} + +menubar.-vala-panel-appmenu-private > menuitem, +menubar.-vala-panel-background > menuitem { + color: white; + font-weight: normal; +} + +menubar.-vala-panel-appmenu-private > menuitem:hover, +menubar.-vala-panel-background > menuitem:hover { + color: white; + background-color: rgba(255, 255, 255, 0.2); +} + +menubar.-vala-panel-appmenu-private > menuitem:disabled, +menubar.-vala-panel-background > menuitem:disabled { + color: rgba(255, 255, 255, 0.4); } .menubar.panel .panel, .menubar.panel .panel.color-light, .menubar.panel .panel.color-dark { @@ -7378,7 +7399,7 @@ button.flat.-panel-icon-button:checked, background-image: linear-gradient(0deg, rgba(226, 226, 226, 0.95) 0%, rgba(245, 245, 245, 0.95) 100%); border-bottom: 1px solid rgba(0, 0, 0, 0.2); transition: all 100ms ease-in-out; - color: #363636; + color: white; } .menubar.panel .panel.maximized { @@ -7523,7 +7544,7 @@ button.flat.-panel-icon-button:checked, .composited-indicator > revealer label, .composited-indicator > revealer image, .composited-indicator > revealer spinner { - color: #363636; + color: white; font-weight: normal; transition: all 200ms ease-in-out; text-shadow: none; @@ -7540,7 +7561,7 @@ button.flat.-panel-icon-button:checked, } .composited-indicator .keyboard { - background-color: #363636; + background-color: white; border-radius: 2px; color: #f1f1f1; padding: 0 3px; @@ -7866,13 +7887,13 @@ UnityDecoration .left:backdrop, UnityDecoration .right:backdrop, UnityDecoration UnityPanelWidget, .unity-panel { background-color: rgba(241, 241, 241, 0.95); - color: dimgray; + color: white; box-shadow: none; } UnityPanelWidget:backdrop, .unity-panel:backdrop { - color: #393939; + color: white; } .unity-panel.menubar.menuitem:hover, @@ -8177,7 +8198,7 @@ GtkListBox .h4 { #panel_window { background-color: #f1f1f1; - color: #363636; + color: white; font-weight: bold; box-shadow: inset 0 -1px #dfdfdf; } @@ -8188,12 +8209,12 @@ GtkListBox .h4 { #panel_window menubar, #panel_window menubar > menuitem { background-color: transparent; - color: #363636; + color: white; font-weight: bold; } #panel_window menubar menuitem:disabled { - color: rgba(54, 54, 54, 0.5); + color: rgba(255, 255, 255, 0.5); } #panel_window menubar menuitem:disabled label { @@ -8418,9 +8439,7 @@ filechooser placessidebar.sidebar, .nautilus-window placessidebar.sidebar { border: none; background-color: transparent; - max-width: 180px; min-width: 180px; - width: 180px; } @@ -9185,7 +9204,7 @@ popover.background.places-menu row { .budgie-panel { transition: background-color 0.2s cubic-bezier(0, 0, 0.2, 1); background-color: #f1f1f1; - color: #363636; + color: white; font-weight: 500; box-shadow: none; background-clip: padding-box; @@ -9248,25 +9267,25 @@ popover.background.places-menu row { border-bottom-width: 0; border: none; box-shadow: none; - color: rgba(54, 54, 54, 0.85); + color: rgba(255, 255, 255, 0.85); background: none; } .budgie-panel button:hover { - background-color: rgba(54, 54, 54, 0.1); - color: rgba(54, 54, 54, 0.95); + background-color: rgba(255, 255, 255, 0.1); + color: rgba(255, 255, 255, 0.95); background-image: none; } .budgie-panel button:active { - background-color: rgba(54, 54, 54, 0.15); - color: #363636; + background-color: rgba(255, 255, 255, 0.15); + color: white; background-image: none; } .budgie-panel button:checked { - background-color: rgba(54, 54, 54, 0.12); - color: #363636; + background-color: rgba(255, 255, 255, 0.12); + color: white; } .budgie-panel.horizontal button { @@ -9284,7 +9303,7 @@ popover.background.places-menu row { .budgie-panel menubar, .budgie-panel .menubar { box-shadow: none; - color: #363636; + color: white; background-image: none; background-color: transparent; } @@ -9310,12 +9329,12 @@ popover.background.places-menu row { .budgie-panel menubar > menuitem:disabled, .budgie-panel .menubar > menuitem:disabled { - color: rgba(54, 54, 54, 0.4); + color: rgba(255, 255, 255, 0.4); } .budgie-panel menubar > menuitem.budgie-menubar:hover, .budgie-panel .menubar > menuitem.budgie-menubar:hover { - background-color: rgba(54, 54, 54, 0.1); + background-color: rgba(255, 255, 255, 0.1); } .budgie-panel menubar.-vala-panel-appmenu-private > menuitem { @@ -10160,7 +10179,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow { } .budgie-panel box.titlebar > widget > label { - color: rgba(54, 54, 54, 0.75); + color: rgba(255, 255, 255, 0.75); } .budgie-panel box.titlebar > button.image-button.titlebutton { diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css index 6056f44..fe763de 100644 --- a/src/main/gtk-3.0/gtk-light.css +++ b/src/main/gtk-3.0/gtk-light.css @@ -6506,7 +6506,7 @@ panel-toplevel.background menubar { panel-toplevel.background menubar, panel-toplevel.background #PanelApplet label, panel-toplevel.background #PanelApplet image { - color: #363636; + color: white; } .mate-panel-menu-bar button label, .mate-panel-menu-bar button image, @@ -6521,13 +6521,13 @@ panel-toplevel.background #tasklist-button image { .mate-panel-menu-bar .wnck-pager, panel-toplevel.background .wnck-pager { - color: #1b1b1b; - background-color: rgba(216, 216, 216, 0.85); + color: gray; + background-color: rgba(216, 216, 216, 0.25); } .mate-panel-menu-bar .wnck-pager:hover, panel-toplevel.background .wnck-pager:hover { - background-color: rgba(254, 254, 254, 0.85); + background-color: rgba(254, 254, 254, 0.25); } .mate-panel-menu-bar .wnck-pager:selected, @@ -6592,24 +6592,21 @@ panel-toplevel.background na-tray-applet { .xfce4-panel button, .xfce4-panel button.flat, .xfce4-panel .raven .raven-header:not(.top) button, .raven .raven-header:not(.top) .xfce4-panel button, .xfce4-panel.panel button, .xfce4-panel.panel button.flat, .mate-panel-menu-bar button:not(#tasklist-button), panel-toplevel.background button:not(#tasklist-button) { - color: #363636; - border-radius: 0; + color: white; + border-radius: 6px; border: none; - background-color: transparent; } .xfce4-panel button:hover:not(:active):not(:checked), .mate-panel-menu-bar button:hover:not(:active):not(:checked):not(#tasklist-button), panel-toplevel.background button:hover:not(:active):not(:checked):not(#tasklist-button) { - color: #242424; - box-shadow: inset 0 -2px rgba(8, 96, 242, 0.5); + color: white; + background-color: rgba(255, 255, 255, 0.2); } .xfce4-panel button:checked, .mate-panel-menu-bar button:checked:not(#tasklist-button), panel-toplevel.background button:checked:not(#tasklist-button) { - color: #242424; - box-shadow: inset 0 -2px #0860f2; - background-color: rgba(36, 36, 36, 0.12); - background-image: none; + color: white; + background-color: rgba(255, 255, 255, 0.25); } .xfce4-panel button:checked label, .mate-panel-menu-bar button:checked:not(#tasklist-button) label, @@ -6620,14 +6617,12 @@ panel-toplevel.background button:checked:not(#tasklist-button) image { .xfce4-panel button:active, .mate-panel-menu-bar button:active:not(#tasklist-button), panel-toplevel.background button:active:not(#tasklist-button) { - background-color: rgba(36, 36, 36, 0.18); - color: #242424; - background-image: none; - box-shadow: inset 0 -2px #0860f2; + color: white; + background-color: rgba(255, 255, 255, 0.3); } .xfce4-panel.panel { - background-color: rgba(241, 241, 241, 0.85); + background-color: rgba(241, 241, 241, 0.25); text-shadow: none; -gtk-icon-shadow: none; border: none; @@ -6640,11 +6635,13 @@ panel-toplevel.background button:active:not(#tasklist-button) { } .xfce4-panel { - background-color: rgba(241, 241, 241, 0.85); - color: #363636; + background-color: rgba(241, 241, 241, 0.25); + color: white; font-weight: 700; text-shadow: none; -gtk-icon-shadow: none; + box-shadow: none; + border-width: 0; } .xfce4-panel, @@ -7339,7 +7336,7 @@ button.flat.-panel-icon-button:active, button.flat.-panel-icon-button:checked, .raven .raven-header:not(.top) button.-panel-icon-button:checked { box-shadow: inset 0 -2px #0860f2; - color: #292929; + color: #f2f2f2; background: none; } @@ -7353,7 +7350,7 @@ button.flat.-panel-icon-button:checked, .unpinned button.flat.-panel-icon-button:hover, .unpinned .raven .raven-header:not(.top) button.-panel-icon-button:hover, .raven .raven-header:not(.top) .unpinned button.-panel-icon-button:hover, .unpinned button.flat.-panel-icon-button:active, .unpinned .raven .raven-header:not(.top) button.-panel-icon-button:active, .raven .raven-header:not(.top) .unpinned button.-panel-icon-button:active, .unpinned button.flat.-panel-icon-button:checked, .unpinned .raven .raven-header:not(.top) button.-panel-icon-button:checked, .raven .raven-header:not(.top) .unpinned button.-panel-icon-button:checked { box-shadow: inset 0 -2px #0860f2; - color: #292929; + color: #f2f2f2; } .pinned button.flat.-panel-icon-button.running, .pinned .raven .raven-header:not(.top) button.-panel-icon-button.running, .raven .raven-header:not(.top) .pinned button.-panel-icon-button.running { @@ -7370,7 +7367,31 @@ button.flat.-panel-icon-button:checked, .pinned button.flat.-panel-icon-button.running:hover, .pinned .raven .raven-header:not(.top) button.-panel-icon-button.running:hover, .raven .raven-header:not(.top) .pinned button.-panel-icon-button.running:hover, .pinned button.flat.-panel-icon-button.running:active, .pinned .raven .raven-header:not(.top) button.-panel-icon-button.running:active, .raven .raven-header:not(.top) .pinned button.-panel-icon-button.running:active, .pinned button.flat.-panel-icon-button.running:checked, .pinned .raven .raven-header:not(.top) button.-panel-icon-button.running:checked, .raven .raven-header:not(.top) .pinned button.-panel-icon-button.running:checked { box-shadow: inset 0 -2px #0860f2; - color: #292929; + color: #f2f2f2; +} + +menubar.-vala-panel-appmenu-private, +menubar.-vala-panel-background { + background: none; + border: none; + box-shadow: none; +} + +menubar.-vala-panel-appmenu-private > menuitem, +menubar.-vala-panel-background > menuitem { + color: white; + font-weight: normal; +} + +menubar.-vala-panel-appmenu-private > menuitem:hover, +menubar.-vala-panel-background > menuitem:hover { + color: white; + background-color: rgba(255, 255, 255, 0.2); +} + +menubar.-vala-panel-appmenu-private > menuitem:disabled, +menubar.-vala-panel-background > menuitem:disabled { + color: rgba(255, 255, 255, 0.4); } .menubar.panel .panel, .menubar.panel .panel.color-light, .menubar.panel .panel.color-dark { @@ -7378,11 +7399,11 @@ button.flat.-panel-icon-button:checked, background-image: linear-gradient(0deg, rgba(226, 226, 226, 0.95) 0%, rgba(245, 245, 245, 0.95) 100%); border-bottom: 1px solid rgba(0, 0, 0, 0.2); transition: all 100ms ease-in-out; - color: #363636; + color: white; } .menubar.panel .panel.maximized { - background-color: rgba(241, 241, 241, 0.85); + background-color: rgba(241, 241, 241, 0.25); background-image: none; border: none; } @@ -7523,7 +7544,7 @@ button.flat.-panel-icon-button:checked, .composited-indicator > revealer label, .composited-indicator > revealer image, .composited-indicator > revealer spinner { - color: #363636; + color: white; font-weight: normal; transition: all 200ms ease-in-out; text-shadow: none; @@ -7540,9 +7561,9 @@ button.flat.-panel-icon-button:checked, } .composited-indicator .keyboard { - background-color: #363636; + background-color: white; border-radius: 2px; - color: rgba(241, 241, 241, 0.85); + color: rgba(241, 241, 241, 0.25); padding: 0 3px; font-weight: normal; box-shadow: none; @@ -7866,13 +7887,13 @@ UnityDecoration .left:backdrop, UnityDecoration .right:backdrop, UnityDecoration UnityPanelWidget, .unity-panel { background-color: rgba(241, 241, 241, 0.95); - color: dimgray; + color: white; box-shadow: none; } UnityPanelWidget:backdrop, .unity-panel:backdrop { - color: #393939; + color: white; } .unity-panel.menubar.menuitem:hover, @@ -8176,10 +8197,10 @@ GtkListBox .h4 { } #panel_window { - background-color: rgba(241, 241, 241, 0.85); - color: #363636; + background-color: rgba(241, 241, 241, 0.25); + color: white; font-weight: bold; - box-shadow: inset 0 -1px rgba(223, 223, 223, 0.85); + box-shadow: inset 0 -1px rgba(223, 223, 223, 0.25); } #panel_window menubar { @@ -8188,12 +8209,12 @@ GtkListBox .h4 { #panel_window menubar, #panel_window menubar > menuitem { background-color: transparent; - color: #363636; + color: white; font-weight: bold; } #panel_window menubar menuitem:disabled { - color: rgba(54, 54, 54, 0.5); + color: rgba(255, 255, 255, 0.5); } #panel_window menubar menuitem:disabled label { @@ -8418,9 +8439,7 @@ filechooser placessidebar.sidebar, .nautilus-window placessidebar.sidebar { border: none; background-color: transparent; - max-width: 180px; min-width: 180px; - width: 180px; } @@ -9184,8 +9203,8 @@ popover.background.places-menu row { .budgie-panel { transition: background-color 0.2s cubic-bezier(0, 0, 0.2, 1); - background-color: rgba(241, 241, 241, 0.85); - color: #363636; + background-color: rgba(241, 241, 241, 0.25); + color: white; font-weight: 500; box-shadow: none; background-clip: padding-box; @@ -9248,25 +9267,25 @@ popover.background.places-menu row { border-bottom-width: 0; border: none; box-shadow: none; - color: rgba(54, 54, 54, 0.85); + color: rgba(255, 255, 255, 0.85); background: none; } .budgie-panel button:hover { - background-color: rgba(54, 54, 54, 0.1); - color: rgba(54, 54, 54, 0.95); + background-color: rgba(255, 255, 255, 0.1); + color: rgba(255, 255, 255, 0.95); background-image: none; } .budgie-panel button:active { - background-color: rgba(54, 54, 54, 0.15); - color: #363636; + background-color: rgba(255, 255, 255, 0.15); + color: white; background-image: none; } .budgie-panel button:checked { - background-color: rgba(54, 54, 54, 0.12); - color: #363636; + background-color: rgba(255, 255, 255, 0.12); + color: white; } .budgie-panel.horizontal button { @@ -9284,7 +9303,7 @@ popover.background.places-menu row { .budgie-panel menubar, .budgie-panel .menubar { box-shadow: none; - color: #363636; + color: white; background-image: none; background-color: transparent; } @@ -9310,12 +9329,12 @@ popover.background.places-menu row { .budgie-panel menubar > menuitem:disabled, .budgie-panel .menubar > menuitem:disabled { - color: rgba(54, 54, 54, 0.4); + color: rgba(255, 255, 255, 0.4); } .budgie-panel menubar > menuitem.budgie-menubar:hover, .budgie-panel .menubar > menuitem.budgie-menubar:hover { - background-color: rgba(54, 54, 54, 0.1); + background-color: rgba(255, 255, 255, 0.1); } .budgie-panel menubar.-vala-panel-appmenu-private > menuitem { @@ -10160,7 +10179,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow { } .budgie-panel box.titlebar > widget > label { - color: rgba(54, 54, 54, 0.75); + color: rgba(255, 255, 255, 0.75); } .budgie-panel box.titlebar > button.image-button.titlebutton { @@ -10231,7 +10250,7 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow { @define-color titlebar_gradient_b #ffffff; @define-color budgie_tasklist_indicator_color #0860f2; @define-color budgie_tasklist_indicator_color_active #0860f2; -@define-color budgie_tasklist_indicator_color_active_window rgba(98, 152, 242, 0.931); +@define-color budgie_tasklist_indicator_color_active_window rgba(33, 112, 242, 0.655); @define-color budgie_tasklist_indicator_color_attention #F27835; @define-color STRAWBERRY_100 #FF9262; @define-color STRAWBERRY_300 #FF793E; diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss index 0941cd4..e7e143e 100644 --- a/src/sass/_colors.scss +++ b/src/sass/_colors.scss @@ -118,10 +118,10 @@ $menu_bd: if($variant == 'light', rgba(black, 0.05), r $panel_bg: if($variant == 'light', #f1f1f1, #2a2a2a); @if $trans == 'true' { - $panel_bg: if($variant == 'light', rgba(#f1f1f1, 0.85), rgba(#2a2a2a, 0.85)); + $panel_bg: if($variant == 'light', rgba(#f1f1f1, 0.25), rgba(#2a2a2a, 0.25)); } -$panel_fg: $text_color; +$panel_fg: white; $panel_top_color: if($variant == 'dark', #333333, #f5f5f5); $panel_bottom_color: if($variant == 'dark', #2a2a2a, #e2e2e2); $panel_border_color: if($variant =='light', rgba(black, 0.2), rgba(black, 0.72)); diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss index 8e4665f..818d16a 100644 --- a/src/sass/gnome-shell/_common.scss +++ b/src/sass/gnome-shell/_common.scss @@ -58,7 +58,6 @@ StEntry { min-width: $large_size; padding: 0 8px; margin: 3px; - border-radius: 3px; border-width: 0; color: $fg_color; caret-color: $fg_color; @@ -66,7 +65,7 @@ StEntry { selected-color: $light_alt_fg_color; @include font(subheading); @include entry(normal); - //&:hover { @include entry(hover);} + &:hover { @include entry(hover);} &:focus { @include entry(focus);} &:insensitive { @include entry(insensitive);} StIcon.capslock-warning { @@ -2029,7 +2028,12 @@ $message_bg: if($variant == 'light', #ffffff, #383838); .grid-search-result { & .overview-icon { @extend %icon_tile; + + &, & > StIcon { + icon-shadow: $panel_asset_shadow; + } } + &:hover .overview-icon, &:focus .overview-icon, &:selected .overview-icon { @@ -2038,6 +2042,7 @@ $message_bg: if($variant == 'light', #ffffff, #383838); border-image: none; background-image: none; } + &:active .overview-icon, &:checked .overview-icon { background-color: $light_track_color; diff --git a/src/sass/gnome-shell/_drawing.scss b/src/sass/gnome-shell/_drawing.scss index 262c5d1..d85f8c6 100644 --- a/src/sass/gnome-shell/_drawing.scss +++ b/src/sass/gnome-shell/_drawing.scss @@ -98,18 +98,19 @@ @if $t == normal { background-color: if($variant == 'light', darken($base_color, 2%), darken($base_color, 1%)); border-radius: $bt_radius; - border: 1px solid $borders_color; - box-shadow: none; + box-shadow: inset 0 0 0 2px transparent; + } + + @if $t == hover { + box-shadow: inset 0 0 0 1px rgba($borders_color, 0.05), inset 0 0 0 2px transparent; } @if $t == focus { - border: 1px solid lighten($primary_color, 15%); - box-shadow: 0 0 0 1px lighten($primary_color, 15%); + box-shadow: inset 0 0 0 2px lighten($primary_color, 15%); } @if $t == insensitive { color: $disabled_fg_color; - border: 1px solid rgba($borders_color, 0.06); } } diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss index 4861b15..9a8fad9 100644 --- a/src/sass/gtk/_applications.scss +++ b/src/sass/gtk/_applications.scss @@ -2193,28 +2193,23 @@ $text_shadow: 0 0 1px rgba(0, 0, 0, 0.26), %panel_button { color: $panel_fg; - border-radius: 0; + border-radius: $bt_radius; border: none; - background-color: transparent; &:hover:not(:active):not(:checked) { - color: $fg_color; - box-shadow: inset 0 -2px rgba($selected_bg_color, 0.5); + color: $panel_fg; + background-color: rgba($panel_fg, 0.2); } &:checked { - color: $fg_color; - box-shadow: inset 0 -2px $selected_bg_color; - background-color: rgba($fg_color, 0.12); - background-image: none; + color: $panel_fg; + background-color: rgba($panel_fg, 0.25); label, image { color: inherit; } } &:active { - background-color: rgba($fg_color, 0.18); - color: $fg_color; - background-image: none; - box-shadow: inset 0 -2px $selected_bg_color; + color: $panel_fg; + background-color: rgba($panel_fg, 0.3); } } @@ -2241,6 +2236,8 @@ $text_shadow: 0 0 1px rgba(0, 0, 0, 0.26), font-weight: 700; text-shadow: none; -gtk-icon-shadow: none; + box-shadow: none; + border-width: 0; &, // unset borders frame > border { border: none; } @@ -2981,21 +2978,29 @@ button.flat.-panel-icon-button { } // vala-panel-appmenu -// menubar.-vala-panel-appmenu-private, // xfce4 appmenu plugin -// menubar.-vala-panel-background { -// background: none; -// border: none; -// box-shadow: none; -// -// > menuitem { -// color: $panel_fg; -// font-weight: normal; -// &:hover { color: $selected_fg_color; } -// -// // > window.background.popup > decoration, -// // > window.background.popup > menu { border-radius: 0 0 $wm_radius $wm_radius; } -// } -// } +menubar.-vala-panel-appmenu-private, // xfce4 appmenu plugin +menubar.-vala-panel-background { + background: none; + border: none; + box-shadow: none; + + > menuitem { + color: $panel_fg; + font-weight: normal; + + &:hover { + color: $panel_fg; + background-color: rgba($panel_fg, 0.2); + } + + &:disabled { + color: transparentize($panel_fg, 0.6); + } + + // > window.background.popup > decoration, + // > window.background.popup > menu { border-radius: 0 0 $wm_radius $wm_radius; } + } +} // * Elementary Apps * diff --git a/src/sass/gtk/_transparent_widgets.scss b/src/sass/gtk/_transparent_widgets.scss index 90066e1..f2e8f8e 100644 --- a/src/sass/gtk/_transparent_widgets.scss +++ b/src/sass/gtk/_transparent_widgets.scss @@ -38,9 +38,7 @@ filechooser, placessidebar.sidebar { border: none; background-color: transparent; - max-width: $nautilus_sidebar_size; min-width: $nautilus_sidebar_size; - width: $nautilus_sidebar_size; row.sidebar-row { color: $dark_sidebar_fg;