From 1559de60c81d2accf78b3a97a6f2f7ff452aa4d8 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Tue, 3 Nov 2015 00:13:05 +0100 Subject: [PATCH] gnome-shell 3.14: fix classic mode --- common/gnome-shell/3.14/gnome-shell-dark.css | 142 ++++++++++--------- common/gnome-shell/3.14/gnome-shell.css | 142 ++++++++++--------- common/gnome-shell/3.14/sass/_common.scss | 98 +++++++------ 3 files changed, 204 insertions(+), 178 deletions(-) diff --git a/common/gnome-shell/3.14/gnome-shell-dark.css b/common/gnome-shell/3.14/gnome-shell-dark.css index 08d4237..0122d4c 100644 --- a/common/gnome-shell/3.14/gnome-shell-dark.css +++ b/common/gnome-shell/3.14/gnome-shell-dark.css @@ -184,12 +184,14 @@ StScrollBar { .slider { -slider-height: 4px; - -slider-background-color: #2b2e39; - -slider-border-color: transparent; - -slider-active-background-color: #5294E2; - -slider-active-border-color: transparent; + -slider-background-color: #2b2e39 !important; + -slider-border-color: transparent !important; + -slider-active-background-color: #5294E2 !important; + -slider-active-border-color: transparent !important; -slider-border-width: 0; -slider-handle-radius: 4px; + -slider-handle-border-color: transparent !important; + -slider-handle-border-width: 0 !important; height: 18px; border: 0 solid transparent; border-right-width: 1px; @@ -451,7 +453,8 @@ StScrollBar { background-gradient-direction: none !important; border-image: url("dark-assets/menu/submenu.svg") 9 9 9 9; } .popup-menu .popup-submenu-menu-item:open { - background: none; + color: #D3DAE3 !important; + background: none !important; box-shadow: none; border-image: url("dark-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-content { @@ -459,20 +462,22 @@ StScrollBar { .popup-menu .popup-menu-item { spacing: 12px; } .popup-menu .popup-menu-item:ltr { - padding: 0.4em 3em 0.4em 0em; } + padding: .4em 3em .4em 0em; } .popup-menu .popup-menu-item:rtl { - padding: 0.4em 0em 0.4em 3em; } + padding: .4em 0em .4em 3em; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #D3DAE3; + color: #D3DAE3 !important; background-color: transparent; border-image: url("dark-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { - color: rgba(211, 218, 227, 0.5); + color: rgba(211, 218, 227, 0.5) !important; background: none; } .popup-menu .popup-inactive-menu-item { color: #D3DAE3; } .popup-menu .popup-inactive-menu-item:insensitive { color: rgba(211, 218, 227, 0.45); } + .popup-menu .popup-status-menu-item, .popup-menu .popup-subtitle-menu-item { + color: #D3DAE3 !important; } .popup-menu.panel-menu { -boxpointer-gap: 0px; margin-bottom: 1.75em; } @@ -483,12 +488,13 @@ StScrollBar { width: 16px; } .popup-menu-boxpointer { - -arrow-border-radius: 2px; - -arrow-background-color: transparent; - -arrow-border-width: 1px; - -arrow-border-color: transparent; - -arrow-base: 0; - -arrow-rise: 0; } + -arrow-border-radius: 2px !important; + -arrow-background-color: transparent !important; + -arrow-border-width: 1px !important; + -arrow-border-color: transparent !important; + -arrow-base: 0 !important; + -arrow-rise: 0 !important; + color: #D3DAE3 !important; } .candidate-popup-boxpointer { -arrow-border-radius: 2px; @@ -631,12 +637,13 @@ StScrollBar { font-weight: bold; height: 2.1em; min-height: 27px; - border-image: url("common-assets/panel/panel.svg") 1 1 1 1; } + background-color: transparent !important; + background-gradient-direction: none !important; + border-bottom: 0px !important; + border-image: url("common-assets/panel/panel.svg") 1 1 1 1 !important; } #panel.dynamic-top-bar-white-btn { border-image: none; } - #panel.unlock-screen, - #panel.login-screen, - #panel.lock-screen { + #panel.unlock-screen, #panel.login-screen, #panel.lock-screen { background-color: transparent; border-image: none; } #panel:overview { @@ -655,10 +662,10 @@ StScrollBar { -panel-corner-background-color: transparent; -panel-corner-border-color: transparent; } #panel .panel-button { - -natural-hpadding: 10px; - -minimum-hpadding: 6px; + -natural-hpadding: 10px !important; + -minimum-hpadding: 6px !important; font-weight: bold; - color: #ffffff; + color: #ffffff !important; transition-duration: 100ms; border-bottom-width: 1px; border-color: transparent; } @@ -668,17 +675,17 @@ StScrollBar { margin-left: 0px; margin-right: 0px; } #panel .panel-button:hover { - color: #ffffff; + color: #ffffff !important; background-color: rgba(0, 0, 0, 0.17); border-bottom-width: 1px; border-color: transparent; text-shadow: 0 0 transparent; } #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked { - color: #ffffff; + color: #ffffff !important; background: #5294E2, url("common-assets/misc/null.svg"); border-image: none; box-shadow: none; - border-bottom-width: 1px; + border-bottom-width: 1px !important; border-color: black; text-shadow: 0 0 transparent; } #panel .panel-button:active > .system-status-icon, #panel .panel-button:overview > .system-status-icon, #panel .panel-button:focus > .system-status-icon, #panel .panel-button:checked > .system-status-icon { @@ -690,13 +697,13 @@ StScrollBar { .login-screen #panel .panel-button, .lock-screen #panel .panel-button { color: #f2f4f7; } - .unlock-screen #panel .panel-button:focus, - .unlock-screen #panel .panel-button:hover, - .unlock-screen #panel .panel-button:active, + .unlock-screen #panel .panel-button:focus, .unlock-screen #panel .panel-button:hover, .unlock-screen #panel .panel-button:active, .login-screen #panel .panel-button:focus, .login-screen #panel .panel-button:hover, .login-screen #panel .panel-button:active, - .lock-screen #panel .panel-button:focus, .lock-screen #panel .panel-button:hover, .lock-screen #panel .panel-button:active { + .lock-screen #panel .panel-button:focus, + .lock-screen #panel .panel-button:hover, + .lock-screen #panel .panel-button:active { color: #f2f4f7; } #panel #panelActivities.panel-button { -natural-hpadding: 12px; } @@ -741,29 +748,30 @@ StScrollBar { spacing: 4px; padding: 0 8px; } #appMenu .label-shadow { - color: transparent; } + color: transparent !important; } .aggregate-menu { width: 360px; } .aggregate-menu .popup-menu-icon { - padding: 0 4px; } + padding: 0 4px; + color: #D3DAE3 !important; } .system-menu-action { padding: 13px; - color: #D3DAE3; + color: #D3DAE3 !important; border-radius: 32px; /* wish we could do 50% */ - border: 1px solid transparent; } + border: 1px solid transparent !important; } .system-menu-action:hover, .system-menu-action:focus { transition-duration: 100ms; padding: 13px; - color: #D3DAE3; - background-color: transparent; - border: 1px solid #5294E2; } + color: #D3DAE3 !important; + background-color: transparent !important; + border: 1px solid #5294E2 !important; } .system-menu-action:active { - color: #ffffff; - background-color: #5294E2; - border: 1px solid #5294E2; } + color: #ffffff !important; + background-color: #5294E2 !important; + border: 1px solid #5294E2 !important; } .system-menu-action > StIcon { icon-size: 16px; } @@ -773,10 +781,10 @@ StScrollBar { width: 0.3em; } .calendar { - padding: 0.4em 1.75em 0.8em 2.5em; } + padding: .4em 1.75em .8em 2.5em; } .calendar-month-label { - color: #D3DAE3; + color: #D3DAE3 !important; font-weight: bold; padding: 8px 0; } @@ -821,10 +829,10 @@ StScrollBar { background-image: url("dark-assets/misc/calendar-arrow-left.svg"); } .datemenu-date-label { - padding: 0.4em 1.7em; + padding: .4em 1.7em; font-weight: bold; text-align: center; - color: #D3DAE3; + color: #D3DAE3 !important; border-radius: 4px; } .calendar-day-base { @@ -834,12 +842,14 @@ StScrollBar { height: 25px; padding: 0.1em; margin: 2px; - border-radius: 12.5px; } + border-radius: 12.5px; + color: #D3DAE3 !important; } .calendar-day-base:hover, .calendar-day-base:focus { - background-color: rgba(0, 0, 0, 0.1); } + background-color: rgba(0, 0, 0, 0.1) !important; + color: #D3DAE3 !important; } .calendar-day-base:active { - color: #D3DAE3; - background-color: rgba(0, 0, 0, 0.15); + color: #D3DAE3 !important; + background-color: rgba(0, 0, 0, 0.15) !important; border-width: 0; } .calendar-day-base.calendar-day-heading { color: rgba(211, 218, 227, 0.85); @@ -862,7 +872,7 @@ StScrollBar { .calendar-nonwork-day { background-color: transparent; - color: #D3DAE3; + color: #D3DAE3 !important; font-weight: bold; } .calendar-today, @@ -870,8 +880,8 @@ StScrollBar { .calendar-today:focus, .calendar-today:hover { font-weight: bold; - color: #ffffff; - background: #5294E2, url("common-assets/misc/null.svg"); + color: #ffffff !important; + background: #5294E2, url("common-assets/misc/null.svg") !important; border-width: 0; } .calendar-day-with-events { @@ -896,7 +906,7 @@ StScrollBar { .events-day-header { font-weight: bold; - color: rgba(211, 218, 227, 0.8); + color: rgba(211, 218, 227, 0.8) !important; padding-left: 0.4em; padding-top: 1.2em; } .events-day-header:first-child { @@ -906,14 +916,14 @@ StScrollBar { padding-right: 0.4em; } .events-day-dayname { - color: rgba(211, 218, 227, 0.5); + color: rgba(211, 218, 227, 0.5) !important; text-align: left; min-width: 20px; } .events-day-dayname:rtl { text-align: right; } .events-day-time { - color: rgba(211, 218, 227, 0.4); + color: rgba(211, 218, 227, 0.4) !important; text-align: right; } .events-day-time:rtl { text-align: left; } @@ -1108,8 +1118,7 @@ StScrollBar { border-image: url("common-assets/dash/dash-left.svg") 3 3 3 3; } .extended.left #dash { border-image: url("common-assets/dash/dash-extended-left.svg") 3 3 3 3; } - .right #dash, - #dash:rtl { + .right #dash, #dash:rtl { padding: 3px 0px 3px 0px; border-image: url("common-assets/dash/dash-right.svg") 3 3 3 3; } .extended.right #dash { @@ -1292,24 +1301,22 @@ StScrollBar { color: #ffffff; background-color: #5294E2; border-color: #5294E2; } - .app-view-control:first-child:ltr, - .app-view-control:last-child:rtl { + .app-view-control:first-child:ltr, .app-view-control:last-child:rtl { border-radius: 2px 0 0 2px; border-right-width: 0; } - .app-view-control:last-child:ltr, - .app-view-control:first-child:rtl { + .app-view-control:last-child:ltr, .app-view-control:first-child:rtl { border-radius: 0 2px 2px 0; border-left-width: 0; } -.search-provider-icon:active, -.search-provider-icon:checked, -.list-search-result:active, .list-search-result:checked { +.search-provider-icon:active, .search-provider-icon:checked, +.list-search-result:active, +.list-search-result:checked { background-color: rgba(31, 33, 40, 0.85); } -.search-provider-icon:focus, -.search-provider-icon:selected, -.search-provider-icon:hover, -.list-search-result:focus, .list-search-result:selected, .list-search-result:hover { +.search-provider-icon:focus, .search-provider-icon:selected, .search-provider-icon:hover, +.list-search-result:focus, +.list-search-result:selected, +.list-search-result:hover { background-color: rgba(186, 195, 207, 0.4); transition-duration: 200ms; } @@ -1399,8 +1406,7 @@ StScrollBar { background-image: url(common-assets/misc/page-indicator-hover.svg); } .page-indicator:active .page-indicator-icon { background-image: url(common-assets/misc/page-indicator-active.svg); } - .page-indicator:checked .page-indicator-icon, - .page-indicator:checked:active { + .page-indicator:checked .page-indicator-icon, .page-indicator:checked:active { background-image: url(common-assets/misc/page-indicator-checked.svg); } .app-well-app > .overview-icon.overview-icon-with-label, diff --git a/common/gnome-shell/3.14/gnome-shell.css b/common/gnome-shell/3.14/gnome-shell.css index 4a05834..e7f2bc6 100644 --- a/common/gnome-shell/3.14/gnome-shell.css +++ b/common/gnome-shell/3.14/gnome-shell.css @@ -184,12 +184,14 @@ StScrollBar { .slider { -slider-height: 4px; - -slider-background-color: #cfd6e6; - -slider-border-color: transparent; - -slider-active-background-color: #5294E2; - -slider-active-border-color: transparent; + -slider-background-color: #cfd6e6 !important; + -slider-border-color: transparent !important; + -slider-active-background-color: #5294E2 !important; + -slider-active-border-color: transparent !important; -slider-border-width: 0; -slider-handle-radius: 4px; + -slider-handle-border-color: transparent !important; + -slider-handle-border-width: 0 !important; height: 18px; border: 0 solid transparent; border-right-width: 1px; @@ -451,7 +453,8 @@ StScrollBar { background-gradient-direction: none !important; border-image: url("light-assets/menu/submenu.svg") 9 9 9 9; } .popup-menu .popup-submenu-menu-item:open { - background: none; + color: #5c616c !important; + background: none !important; box-shadow: none; border-image: url("light-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-content { @@ -459,20 +462,22 @@ StScrollBar { .popup-menu .popup-menu-item { spacing: 12px; } .popup-menu .popup-menu-item:ltr { - padding: 0.4em 3em 0.4em 0em; } + padding: .4em 3em .4em 0em; } .popup-menu .popup-menu-item:rtl { - padding: 0.4em 0em 0.4em 3em; } + padding: .4em 0em .4em 3em; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #5c616c; + color: #5c616c !important; background-color: transparent; border-image: url("light-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { - color: rgba(92, 97, 108, 0.5); + color: rgba(92, 97, 108, 0.5) !important; background: none; } .popup-menu .popup-inactive-menu-item { color: #5c616c; } .popup-menu .popup-inactive-menu-item:insensitive { color: rgba(92, 97, 108, 0.55); } + .popup-menu .popup-status-menu-item, .popup-menu .popup-subtitle-menu-item { + color: #5c616c !important; } .popup-menu.panel-menu { -boxpointer-gap: 0px; margin-bottom: 1.75em; } @@ -483,12 +488,13 @@ StScrollBar { width: 16px; } .popup-menu-boxpointer { - -arrow-border-radius: 2px; - -arrow-background-color: transparent; - -arrow-border-width: 1px; - -arrow-border-color: transparent; - -arrow-base: 0; - -arrow-rise: 0; } + -arrow-border-radius: 2px !important; + -arrow-background-color: transparent !important; + -arrow-border-width: 1px !important; + -arrow-border-color: transparent !important; + -arrow-base: 0 !important; + -arrow-rise: 0 !important; + color: #5c616c !important; } .candidate-popup-boxpointer { -arrow-border-radius: 2px; @@ -631,12 +637,13 @@ StScrollBar { font-weight: bold; height: 2.1em; min-height: 27px; - border-image: url("common-assets/panel/panel.svg") 1 1 1 1; } + background-color: transparent !important; + background-gradient-direction: none !important; + border-bottom: 0px !important; + border-image: url("common-assets/panel/panel.svg") 1 1 1 1 !important; } #panel.dynamic-top-bar-white-btn { border-image: none; } - #panel.unlock-screen, - #panel.login-screen, - #panel.lock-screen { + #panel.unlock-screen, #panel.login-screen, #panel.lock-screen { background-color: transparent; border-image: none; } #panel:overview { @@ -655,10 +662,10 @@ StScrollBar { -panel-corner-background-color: transparent; -panel-corner-border-color: transparent; } #panel .panel-button { - -natural-hpadding: 10px; - -minimum-hpadding: 6px; + -natural-hpadding: 10px !important; + -minimum-hpadding: 6px !important; font-weight: bold; - color: #ffffff; + color: #ffffff !important; transition-duration: 100ms; border-bottom-width: 1px; border-color: transparent; } @@ -668,17 +675,17 @@ StScrollBar { margin-left: 0px; margin-right: 0px; } #panel .panel-button:hover { - color: #ffffff; + color: #ffffff !important; background-color: rgba(0, 0, 0, 0.17); border-bottom-width: 1px; border-color: transparent; text-shadow: 0 0 transparent; } #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked { - color: #ffffff; + color: #ffffff !important; background: #5294E2, url("common-assets/misc/null.svg"); border-image: none; box-shadow: none; - border-bottom-width: 1px; + border-bottom-width: 1px !important; border-color: black; text-shadow: 0 0 transparent; } #panel .panel-button:active > .system-status-icon, #panel .panel-button:overview > .system-status-icon, #panel .panel-button:focus > .system-status-icon, #panel .panel-button:checked > .system-status-icon { @@ -690,13 +697,13 @@ StScrollBar { .login-screen #panel .panel-button, .lock-screen #panel .panel-button { color: #737a88; } - .unlock-screen #panel .panel-button:focus, - .unlock-screen #panel .panel-button:hover, - .unlock-screen #panel .panel-button:active, + .unlock-screen #panel .panel-button:focus, .unlock-screen #panel .panel-button:hover, .unlock-screen #panel .panel-button:active, .login-screen #panel .panel-button:focus, .login-screen #panel .panel-button:hover, .login-screen #panel .panel-button:active, - .lock-screen #panel .panel-button:focus, .lock-screen #panel .panel-button:hover, .lock-screen #panel .panel-button:active { + .lock-screen #panel .panel-button:focus, + .lock-screen #panel .panel-button:hover, + .lock-screen #panel .panel-button:active { color: #737a88; } #panel #panelActivities.panel-button { -natural-hpadding: 12px; } @@ -741,29 +748,30 @@ StScrollBar { spacing: 4px; padding: 0 8px; } #appMenu .label-shadow { - color: transparent; } + color: transparent !important; } .aggregate-menu { width: 360px; } .aggregate-menu .popup-menu-icon { - padding: 0 4px; } + padding: 0 4px; + color: #5c616c !important; } .system-menu-action { padding: 13px; - color: #5c616c; + color: #5c616c !important; border-radius: 32px; /* wish we could do 50% */ - border: 1px solid transparent; } + border: 1px solid transparent !important; } .system-menu-action:hover, .system-menu-action:focus { transition-duration: 100ms; padding: 13px; - color: #5c616c; - background-color: transparent; - border: 1px solid #5294E2; } + color: #5c616c !important; + background-color: transparent !important; + border: 1px solid #5294E2 !important; } .system-menu-action:active { - color: #ffffff; - background-color: #5294E2; - border: 1px solid #5294E2; } + color: #ffffff !important; + background-color: #5294E2 !important; + border: 1px solid #5294E2 !important; } .system-menu-action > StIcon { icon-size: 16px; } @@ -773,10 +781,10 @@ StScrollBar { width: 0.3em; } .calendar { - padding: 0.4em 1.75em 0.8em 2.5em; } + padding: .4em 1.75em .8em 2.5em; } .calendar-month-label { - color: #5c616c; + color: #5c616c !important; font-weight: bold; padding: 8px 0; } @@ -821,10 +829,10 @@ StScrollBar { background-image: url("light-assets/misc/calendar-arrow-left.svg"); } .datemenu-date-label { - padding: 0.4em 1.7em; + padding: .4em 1.7em; font-weight: bold; text-align: center; - color: #5c616c; + color: #5c616c !important; border-radius: 4px; } .calendar-day-base { @@ -834,12 +842,14 @@ StScrollBar { height: 25px; padding: 0.1em; margin: 2px; - border-radius: 12.5px; } + border-radius: 12.5px; + color: #5c616c !important; } .calendar-day-base:hover, .calendar-day-base:focus { - background-color: rgba(0, 0, 0, 0.1); } + background-color: rgba(0, 0, 0, 0.1) !important; + color: #5c616c !important; } .calendar-day-base:active { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.15); + color: #5c616c !important; + background-color: rgba(0, 0, 0, 0.15) !important; border-width: 0; } .calendar-day-base.calendar-day-heading { color: rgba(92, 97, 108, 0.85); @@ -862,7 +872,7 @@ StScrollBar { .calendar-nonwork-day { background-color: transparent; - color: #5c616c; + color: #5c616c !important; font-weight: bold; } .calendar-today, @@ -870,8 +880,8 @@ StScrollBar { .calendar-today:focus, .calendar-today:hover { font-weight: bold; - color: #ffffff; - background: #5294E2, url("common-assets/misc/null.svg"); + color: #ffffff !important; + background: #5294E2, url("common-assets/misc/null.svg") !important; border-width: 0; } .calendar-day-with-events { @@ -896,7 +906,7 @@ StScrollBar { .events-day-header { font-weight: bold; - color: rgba(92, 97, 108, 0.8); + color: rgba(92, 97, 108, 0.8) !important; padding-left: 0.4em; padding-top: 1.2em; } .events-day-header:first-child { @@ -906,14 +916,14 @@ StScrollBar { padding-right: 0.4em; } .events-day-dayname { - color: rgba(92, 97, 108, 0.5); + color: rgba(92, 97, 108, 0.5) !important; text-align: left; min-width: 20px; } .events-day-dayname:rtl { text-align: right; } .events-day-time { - color: rgba(92, 97, 108, 0.4); + color: rgba(92, 97, 108, 0.4) !important; text-align: right; } .events-day-time:rtl { text-align: left; } @@ -1108,8 +1118,7 @@ StScrollBar { border-image: url("common-assets/dash/dash-left.svg") 3 3 3 3; } .extended.left #dash { border-image: url("common-assets/dash/dash-extended-left.svg") 3 3 3 3; } - .right #dash, - #dash:rtl { + .right #dash, #dash:rtl { padding: 3px 0px 3px 0px; border-image: url("common-assets/dash/dash-right.svg") 3 3 3 3; } .extended.right #dash { @@ -1292,24 +1301,22 @@ StScrollBar { color: #ffffff; background-color: #5294E2; border-color: #5294E2; } - .app-view-control:first-child:ltr, - .app-view-control:last-child:rtl { + .app-view-control:first-child:ltr, .app-view-control:last-child:rtl { border-radius: 2px 0 0 2px; border-right-width: 0; } - .app-view-control:last-child:ltr, - .app-view-control:first-child:rtl { + .app-view-control:last-child:ltr, .app-view-control:first-child:rtl { border-radius: 0 2px 2px 0; border-left-width: 0; } -.search-provider-icon:active, -.search-provider-icon:checked, -.list-search-result:active, .list-search-result:checked { +.search-provider-icon:active, .search-provider-icon:checked, +.list-search-result:active, +.list-search-result:checked { background-color: rgba(31, 33, 40, 0.85); } -.search-provider-icon:focus, -.search-provider-icon:selected, -.search-provider-icon:hover, -.list-search-result:focus, .list-search-result:selected, .list-search-result:hover { +.search-provider-icon:focus, .search-provider-icon:selected, .search-provider-icon:hover, +.list-search-result:focus, +.list-search-result:selected, +.list-search-result:hover { background-color: rgba(186, 195, 207, 0.4); transition-duration: 200ms; } @@ -1399,8 +1406,7 @@ StScrollBar { background-image: url(common-assets/misc/page-indicator-hover.svg); } .page-indicator:active .page-indicator-icon { background-image: url(common-assets/misc/page-indicator-active.svg); } - .page-indicator:checked .page-indicator-icon, - .page-indicator:checked:active { + .page-indicator:checked .page-indicator-icon, .page-indicator:checked:active { background-image: url(common-assets/misc/page-indicator-checked.svg); } .app-well-app > .overview-icon.overview-icon-with-label, diff --git a/common/gnome-shell/3.14/sass/_common.scss b/common/gnome-shell/3.14/sass/_common.scss index 0c7baf3..14556b6 100644 --- a/common/gnome-shell/3.14/sass/_common.scss +++ b/common/gnome-shell/3.14/sass/_common.scss @@ -164,12 +164,14 @@ StScrollBar { // .slider { -slider-height: 4px; - -slider-background-color: $button_border; //background of the trough - -slider-border-color: transparentize(black, 1); //trough border color - -slider-active-background-color: $selected_bg_color; //active trough fill - -slider-active-border-color: transparentize(black, 1); //active trough border + -slider-background-color: $button_border !important; //background of the trough + -slider-border-color: transparentize(black, 1) !important; //trough border color + -slider-active-background-color: $selected_bg_color !important; //active trough fill + -slider-active-border-color: transparentize(black, 1) !important; //active trough border -slider-border-width: 0; -slider-handle-radius: 4px; + -slider-handle-border-color: transparent !important; + -slider-handle-border-width: 0 !important; height: 18px; border: 0 solid transparent; border-right-width: 1px; @@ -551,7 +553,8 @@ StScrollBar { } .popup-submenu-menu-item:open { - background: none; + color: $fg_color !important; + background: none !important; box-shadow: none; border-image: url("#{$asset_path}/menu/submenu-open.svg") 9 9 9 9; } @@ -564,13 +567,13 @@ StScrollBar { &:rtl { padding: .4em 0em .4em 3em; } &:active, &.selected { - color: $fg_color; + color: $fg_color !important; background-color: transparent; border-image: url("#{$asset_path}/menu/menu-hover.svg") 9 9 1 1; } &:insensitive { - color: transparentize($fg_color, 0.5); + color: transparentize($fg_color, 0.5) !important; background: none; } } @@ -580,7 +583,7 @@ StScrollBar { &:insensitive { color: $insensitive_fg_color; } } - //.popup-status-menu-item { font-weight: normal; color: pink; } //dunno what that is + .popup-status-menu-item, .popup-subtitle-menu-item { color: $fg_color !important; } &.panel-menu { -boxpointer-gap: 0px; margin-bottom: 1.75em; @@ -594,12 +597,13 @@ StScrollBar { } .popup-menu-boxpointer { - -arrow-border-radius: 2px; - -arrow-background-color: rgba(0,0,0,0.0); - -arrow-border-width: 1px; - -arrow-border-color: rgba(0,0,0,0.0); - -arrow-base: 0; - -arrow-rise: 0; + -arrow-border-radius: 2px !important; + -arrow-background-color: rgba(0,0,0,0.0) !important; + -arrow-border-width: 1px !important; + -arrow-border-color: rgba(0,0,0,0.0) !important; + -arrow-base: 0 !important; + -arrow-rise: 0 !important; + color: $fg_color !important; } .candidate-popup-boxpointer { @@ -804,7 +808,10 @@ StScrollBar { font-weight: bold; height: 2.1em; min-height: 27px; - border-image: url('common-assets/panel/panel.svg') 1 1 1 1; + background-color: transparent !important; + background-gradient-direction: none !important; + border-bottom: 0px !important; + border-image: url('common-assets/panel/panel.svg') 1 1 1 1 !important; // Fix dynamic top bar extension &.dynamic-top-bar-white-btn { border-image: none; } @@ -840,10 +847,10 @@ StScrollBar { } .panel-button { - -natural-hpadding: 10px; - -minimum-hpadding: 6px; + -natural-hpadding: 10px !important; + -minimum-hpadding: 6px !important; font-weight: bold; - color: $selected_fg_color; + color: $selected_fg_color !important; transition-duration: 100ms; border-bottom-width: 1px; border-color: transparent; @@ -856,7 +863,7 @@ StScrollBar { } &:hover { - color: $selected_fg_color; + color: $selected_fg_color !important; background-color: transparentize(black, 0.83); border-bottom-width: 1px; border-color: transparent; @@ -864,11 +871,11 @@ StScrollBar { } &:active, &:overview, &:focus, &:checked { - color: $selected_fg_color; + color: $selected_fg_color !important; background:$selected_bg_color, url("common-assets/misc/null.svg"); border-image: none; box-shadow: none; - border-bottom-width: 1px; + border-bottom-width: 1px !important; border-color: black; text-shadow: 0 0 rgba(0,0,0,0); @@ -940,31 +947,34 @@ StScrollBar { spacing: 4px; padding: 0 8px; - .label-shadow { color: transparent; } + .label-shadow { color: transparent !important; } } .aggregate-menu { width: 360px; - .popup-menu-icon { padding: 0 4px; } + .popup-menu-icon { + padding: 0 4px; + color: $fg_color !important; + } } .system-menu-action { padding: 13px; - color: $fg_color; + color: $fg_color !important; border-radius: 32px; /* wish we could do 50% */ - border: 1px solid transparent; + border: 1px solid transparent !important; &:hover, &:focus { transition-duration: 100ms; padding: 13px; - color: $fg_color; - background-color: transparent; - border: 1px solid $selected_bg_color; + color: $fg_color !important; + background-color: transparent !important; + border: 1px solid $selected_bg_color !important; } &:active { - color: $selected_fg_color; - background-color: $selected_bg_color; - border: 1px solid $selected_bg_color; + color: $selected_fg_color !important; + background-color: $selected_bg_color !important; + border: 1px solid $selected_bg_color !important; } & > StIcon { icon-size: 16px; } @@ -984,7 +994,7 @@ StScrollBar { } .calendar-month-label { - color: $fg_color; + color: $fg_color !important; font-weight: bold; padding: 8px 0; &:focus {} @@ -1044,7 +1054,7 @@ StScrollBar { padding: .4em 1.7em; font-weight: bold; text-align: center; - color: $fg_color; + color: $fg_color !important; border-radius: 4px; &:hover, &:focus {} @@ -1058,12 +1068,16 @@ StScrollBar { padding: 0.1em; margin: 2px; border-radius: 12.5px; + color: $fg_color !important; - &:hover, &:focus { background-color: transparentize(black, 0.9); } + &:hover, &:focus { + background-color: transparentize(black, 0.9) !important; + color: $fg_color !important; + } &:active { - color: $fg_color; - background-color: transparentize(black, 0.85); + color: $fg_color !important; + background-color: transparentize(black, 0.85) !important; border-width: 0; //avoid jumparound due to today } @@ -1092,7 +1106,7 @@ StScrollBar { .calendar-nonwork-day { background-color: transparent; - color: $fg_color; + color: $fg_color !important; font-weight: bold; } @@ -1101,8 +1115,8 @@ StScrollBar { .calendar-today:focus, .calendar-today:hover { font-weight: bold; - color: $selected_fg_color; - background: $selected_bg_color, url("common-assets/misc/null.svg"); + color: $selected_fg_color !important; + background: $selected_bg_color, url("common-assets/misc/null.svg") !important; border-width: 0; } @@ -1129,7 +1143,7 @@ StScrollBar { .events-day-header { font-weight: bold; - color: transparentize($fg_color, 0.2); + color: transparentize($fg_color, 0.2) !important; padding-left: 0.4em; padding-top: 1.2em; @@ -1141,7 +1155,7 @@ StScrollBar { } .events-day-dayname { - color: transparentize($fg_color, 0.5); + color: transparentize($fg_color, 0.5) !important; text-align: left; min-width: 20px; @@ -1149,7 +1163,7 @@ StScrollBar { } .events-day-time { - color: transparentize($fg_color, 0.6); + color: transparentize($fg_color, 0.6) !important; text-align: right; &:rtl { text-align: left; }