theme: revert back to osd colors due to classic mode

This commit is contained in:
Jakub Steiner 2015-02-06 18:16:01 +01:00 committed by Florian Müllner
parent 61be034c6d
commit 462bfccc7e
3 changed files with 116 additions and 119 deletions

View File

@ -29,8 +29,9 @@ $panel-corner-radius: 6px;
/* GLOBALS */
$font-size: 11;
$font-family: Cantarell, Sans-Serif;
$_bubble_bg_color: transparentize(darken($bg_color,8%),.05);
$_bubble_border_color: transparentize($fg_color,0.8);
$_bubble_bg_color: transparentize($osd_borders_color,.2);
$_bubble_fg_color: $osd_fg_color;
$_bubble_border_color: $osd_outer_borders_color;
stage {
font-family: $font-family;
@ -46,7 +47,6 @@ stage {
border-width: 1px;
padding: 4px 32px;
@include button(normal);
&:hover { @include button(hover); }
&:focus { @include button(focus); }
&:insensitive { @include button(insensitive); }
&:active { @include button(active); }
@ -429,8 +429,8 @@ StScrollBar {
box-shadow: inset 0 1px 0px lighten($borders_color,5%);
font-weight: bold;
}
&:hover { background-color: $selected_bg_color; }
&:active { background-color: darken($selected_bg_color,5%); }
&:hover { background-color: $selected_bg_color; color: $selected_fg_color; }
&:active { background-color: darken($selected_bg_color,5%); color: $selected_fg_color; }
&:insensitive { background-color: transparentize($bg_color,.5); }
}
@ -519,7 +519,8 @@ StScrollBar {
}
.switcher-list .item-box:selected {
background: $selected_bg_color;
background-color: $selected_bg_color;
color: $selected_fg_color;
}
.switcher-list .thumbnail-box {
@ -569,6 +570,7 @@ StScrollBar {
.ws-switcher-active-up, .ws-switcher-active-down {
height: 50px;
background-color: $selected_bg_color;
color: $selected_fg_color;
//background-image: url("ws-switch-arrow-up.png");
background-size: 32px;
border-radius: 8px;
@ -582,8 +584,8 @@ StScrollBar {
}
%osd-panel {
color: $fg_color;
background-color: transparentize($bg_color,0.2);
color: $_bubble_fg_color;
background-color: $_bubble_bg_color;
border: 1px solid $_bubble_border_color;
border-radius: 12px;
padding: 12px;
@ -654,7 +656,6 @@ StScrollBar {
&:hover {
color: lighten($fg_color, 10%);
text-shadow: black 0 2px 2px;
}
&:active, &:overview, &:focus, &:checked {
@ -663,7 +664,6 @@ StScrollBar {
background-color: rgba(0, 0, 0, 0.01);
box-shadow: inset 0 -2px 0px lighten($selected_bg_color,5%);
color: lighten($fg_color,10%);
text-shadow: black 0px 2px 2px;
& > .system-status-icon { icon-shadow: black 0 2px 2px; }
}
@ -748,7 +748,7 @@ StScrollBar {
border-radius: 1.4em;
&:hover,&:focus { background-color: lighten($bg_color,5%); }
&:active {
color: lighten($fg_color,5%);
color: lighten($selected_fg_color,5%);
background-color: $selected_bg_color;
border-color: transparent; //avoid jumparound due to today
}
@ -826,7 +826,7 @@ StScrollBar {
spinner-image: url("process-working.svg");
spacing: 4px;
.label-shadow { color: transparentize(#000,0.5); }
.label-shadow { }
}
.aggregate-menu {
@ -846,7 +846,7 @@ StScrollBar {
border: none;
padding: 14px;
}
&:active { background-color: darken($selected_bg_color,5%); }
&:active { background-color: darken($selected_bg_color,5%); color: $selected_fg_color; }
& > StIcon { icon-size: 16px; }
}
@ -986,7 +986,7 @@ StScrollBar {
border-radius: 8px;
padding: 4px 12px;
-shell-caption-spacing: 12px;
&:hover { background-color: $selected_bg_color; }
&:hover { background-color: $selected_bg_color; color: $selected_fg_color; }
}
.messages-indicator { color: transparentize($fg_color,.2); height: 32px; }
@ -1081,7 +1081,7 @@ StScrollBar {
.dash-label { //osd tooltip
border-radius: 7px;
padding: 4px 12px;
background-color: transparentize($bg_color,0.3);
background-color: transparentize($osd_borders_color,0.3);
text-align: center;
-x-offset: 8px;
}
@ -1130,7 +1130,7 @@ StScrollBar {
}
&:active .overview-icon,
&:checked .overview-icon {
background-color: transparentize(darken($osd_bg_color,10%),.1); //FIXME not working?
background-color: transparentize(darken($bg_color,10%),.1); //FIXME not working?
box-shadow: inset 0 1px 2px $borders_color;
}
&:hover .overview-icon,
@ -1231,8 +1231,8 @@ StScrollBar {
}
%overview-panel {
color: $fg_color;
background-color: $bg_color;
color: $_bubble_fg_color;
background-color: $_bubble_bg_color;
border: 1px solid $_bubble_border_color;
}
@ -1317,6 +1317,7 @@ StScrollBar {
-shell-counter-overlap-x: 3px;
-shell-counter-overlap-y: 3px;
background-color: $selected_bg_color;
color: $selected_fg_color;
border: 2px solid $fg_color;
box-shadow: 0 2px 2px rgba(0,0,0,0.5);
border-radius: 0.9em; // should be 0.8 but whatever; wish I could do 50%;
@ -1333,7 +1334,7 @@ StScrollBar {
.notification {
border-radius: 9px;
border-width: 0; //temporary workaround for border brokenness
background-color: transparentize(darken($bg_color,8%),.05) !important;
background-color: transparent !important;
padding-bottom: 12px;
}
#summary-right-click-menu {
@ -1507,7 +1508,7 @@ StScrollBar {
.candidate-box {
padding: 0.3em 0.5em 0.3em 0.5em;
border-radius: 4px;
&:selected,&:hover { background-color: $selected_bg_color; }
&:selected,&:hover { background-color: $selected_bg_color; color: $selected_fg_color; }
}
.candidate-page-button-box {
@ -1579,7 +1580,7 @@ StScrollBar {
spacing: 12px;
padding: .2em;
width: 23em;
&:expanded .login-dialog-user-list-item:focus { background-color: $selected_bg_color; }
&:expanded .login-dialog-user-list-item:focus { background-color: $selected_bg_color; color: $selected_fg_color; }
&:expanded .login-dialog-user-list-item:logged-in { border-right: 2px solid $selected_bg_color; }
}
.login-dialog-user-list-item {

View File

@ -35,13 +35,6 @@ stage {
box-shadow: inset 0 1px #454f52;
text-shadow: 0 1px black;
icon-shadow: 0 1px black; }
.button:hover {
color: white;
border-color: rgba(0, 0, 0, 0.7);
background-color: #454f52;
box-shadow: inset 0 1px #5d696d;
text-shadow: 0 1px black;
icon-shadow: 0 1px black; }
.button:focus {
color: #eeeeec;
border-color: #215d9c;
@ -192,7 +185,7 @@ StScrollBar {
/* End Session Dialog */
.end-session-dialog {
spacing: 42px;
border: 3px solid rgba(255, 255, 255, 0.2); }
border: 3px solid rgba(255, 255, 255, 0.1); }
.end-session-dialog-list {
padding-top: 20px; }
@ -314,7 +307,7 @@ StScrollBar {
/* Password or Authentication Dialog */
.prompt-dialog {
width: 500px;
border: 3px solid rgba(255, 255, 255, 0.2); }
border: 3px solid rgba(255, 255, 255, 0.1); }
.prompt-dialog-main-layout {
spacing: 24px;
@ -395,9 +388,11 @@ StScrollBar {
box-shadow: inset 0 1px 0px #0d0d0d;
font-weight: bold; }
.popup-menu .popup-menu-item:hover {
background-color: #215d9c; }
background-color: #215d9c;
color: #ffffff; }
.popup-menu .popup-menu-item:active {
background-color: #1c5187; }
background-color: #1c5187;
color: #ffffff; }
.popup-menu .popup-menu-item:insensitive {
background-color: rgba(0, 0, 0, 0.5); }
.popup-menu .active {
@ -466,7 +461,8 @@ StScrollBar {
border: 2px solid black; }
.switcher-list .item-box:selected {
background: #215d9c; }
background-color: #215d9c;
color: #ffffff; }
.switcher-list .thumbnail-box {
padding: 2px;
@ -505,6 +501,7 @@ StScrollBar {
.ws-switcher-active-up, .ws-switcher-active-down {
height: 50px;
background-color: #215d9c;
color: #ffffff;
background-size: 32px;
border-radius: 8px; }
@ -516,9 +513,9 @@ StScrollBar {
.osd-window,
.switcher-list, .workspace-switcher-container {
color: #fff;
background-color: rgba(0, 0, 0, 0.8);
border: 1px solid rgba(255, 255, 255, 0.2);
color: #eeeeec;
background-color: rgba(0, 0, 0, 0.5);
border: 1px solid rgba(255, 255, 255, 0.1);
border-radius: 12px;
padding: 12px; }
@ -565,13 +562,11 @@ StScrollBar {
#panel .panel-button .app-menu-icon {
-st-icon-style: symbolic; }
#panel .panel-button:hover {
color: white;
text-shadow: black 0 2px 2px; }
color: white; }
#panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
background-color: rgba(0, 0, 0, 0.01);
box-shadow: inset 0 -2px 0px #256ab1;
color: white;
text-shadow: black 0px 2px 2px; }
color: white; }
#panel .panel-button:active > .system-status-icon, #panel .panel-button:overview > .system-status-icon, #panel .panel-button:focus > .system-status-icon, #panel .panel-button:checked > .system-status-icon {
icon-shadow: black 0 2px 2px; }
#panel .panel-button .system-status-icon {
@ -606,7 +601,7 @@ StScrollBar {
.calendar-vertical-separator {
width: .3em;
-stipple-width: 1px;
-stipple-color: rgba(255, 255, 255, 0.2); }
-stipple-color: rgba(255, 255, 255, 0.1); }
.calendar-month-label {
color: #f2f2f2;
@ -718,8 +713,6 @@ StScrollBar {
#appMenu {
spinner-image: url("process-working.svg");
spacing: 4px; }
#appMenu .label-shadow {
color: rgba(0, 0, 0, 0.5); }
.aggregate-menu {
width: 360px; }
@ -738,7 +731,8 @@ StScrollBar {
border: none;
padding: 14px; }
.system-menu-action:active {
background-color: #1c5187; }
background-color: #1c5187;
color: #ffffff; }
.system-menu-action > StIcon {
icon-size: 16px; }
@ -853,7 +847,8 @@ StScrollBar {
padding: 4px 12px;
-shell-caption-spacing: 12px; }
.window-caption:hover {
background-color: #215d9c; }
background-color: #215d9c;
color: #ffffff; }
.messages-indicator {
color: rgba(255, 255, 255, 0.8);
@ -943,7 +938,7 @@ StScrollBar {
.dash-label {
border-radius: 7px;
padding: 4px 12px;
background-color: rgba(0, 0, 0, 0.7);
background-color: rgba(0, 0, 0, 0.4);
text-align: center;
-x-offset: 8px; }
@ -996,7 +991,7 @@ StScrollBar {
.show-apps:checked .overview-icon,
.grid-search-result:active .overview-icon,
.grid-search-result:checked .overview-icon {
background-color: rgba(23, 25, 26, 0.9);
background-color: rgba(0, 0, 0, 0.9);
box-shadow: inset 0 1px 2px black; }
.app-well-app:hover .overview-icon, .app-well-app.running:hover .overview-icon, .app-well-app:focus .overview-icon, .app-well-app:selected .overview-icon,
.app-well-app.app-folder:hover .overview-icon,
@ -1091,9 +1086,9 @@ StScrollBar {
padding: 0px 88px 10px 88px; }
#dash, .workspace-thumbnails {
color: #fff;
background-color: #000;
border: 1px solid rgba(255, 255, 255, 0.2); }
color: #eeeeec;
background-color: rgba(0, 0, 0, 0.5);
border: 1px solid rgba(255, 255, 255, 0.1); }
.search-statustext, .no-frequent-applications-label {
font-size: 2em;
@ -1128,7 +1123,7 @@ StScrollBar {
font-size: 11pt;
width: 34em;
border-radius: 6px 6px 0 0;
background-color: rgba(0, 0, 0, 0.95);
background-color: rgba(0, 0, 0, 0.5);
border: 1px solid black;
border-bottom-width: 0;
spacing-rows: 4px;
@ -1168,13 +1163,14 @@ StScrollBar {
-shell-counter-overlap-x: 3px;
-shell-counter-overlap-y: 3px;
background-color: #215d9c;
color: #ffffff;
border: 2px solid #fff;
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.5);
border-radius: 0.9em; }
.summary-boxpointer {
-arrow-border-radius: 15px;
-arrow-background-color: rgba(0, 0, 0, 0.95);
-arrow-background-color: rgba(0, 0, 0, 0.5);
-arrow-base: 36px;
-arrow-rise: 18px;
color: #fff;
@ -1182,7 +1178,7 @@ StScrollBar {
.summary-boxpointer .notification {
border-radius: 9px;
border-width: 0;
background-color: rgba(0, 0, 0, 0.95) !important;
background-color: transparent !important;
padding-bottom: 12px; }
.summary-boxpointer #summary-right-click-menu {
padding-top: 12px;
@ -1358,7 +1354,7 @@ StScrollBar {
-arrow-border-radius: 10px;
-arrow-background-color: rgba(46, 52, 54, 0.7);
-arrow-border-width: 2px;
-arrow-border-color: rgba(255, 255, 255, 0.2);
-arrow-border-color: rgba(255, 255, 255, 0.1);
-arrow-base: 20px;
-arrow-rise: 10px;
-boxpointer-gap: 5px; }
@ -1375,7 +1371,8 @@ StScrollBar {
padding: 0.3em 0.5em 0.3em 0.5em;
border-radius: 4px; }
.candidate-box:selected, .candidate-box:hover {
background-color: #215d9c; }
background-color: #215d9c;
color: #ffffff; }
.candidate-page-button-box {
height: 2em;
@ -1473,7 +1470,8 @@ StScrollBar {
padding: .2em;
width: 23em; }
.login-dialog-user-list:expanded .login-dialog-user-list-item:focus {
background-color: #215d9c; }
background-color: #215d9c;
color: #ffffff; }
.login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in {
border-right: 2px solid #215d9c; }
@ -1570,9 +1568,9 @@ StScrollBar {
.screen-shield-notifications-container .notification-button, .screen-shield-notifications-container .notification-icon-button {
border: 1px solid rgba(255, 255, 255, 0.5); }
.screen-shield-notifications-container .notification, .screen-shield-notifications-container .screen-shield-notifications-box {
background-color: rgba(0, 0, 0, 0.45);
background-color: transparent;
color: #fff;
border: 1px solid rgba(255, 255, 255, 0.2);
border: 1px solid rgba(255, 255, 255, 0.1);
margin: 6px 0;
padding: 12px;
spacing: 24px; }
@ -1589,7 +1587,7 @@ StScrollBar {
padding: 0px 0px 0px 12px; }
#panel.lock-screen {
background-color: rgba(0, 0, 0, 0.45); }
background-color: transparent; }
.screen-shield-background {
background: black;

View File

@ -35,13 +35,6 @@ stage {
box-shadow: inset 0 1px #454f52;
text-shadow: 0 1px black;
icon-shadow: 0 1px black; }
.button:hover {
color: white;
border-color: rgba(0, 0, 0, 0.7);
background-color: #454f52;
box-shadow: inset 0 1px #5d696d;
text-shadow: 0 1px black;
icon-shadow: 0 1px black; }
.button:focus {
color: #eeeeec;
border-color: #215d9c;
@ -192,7 +185,7 @@ StScrollBar {
/* End Session Dialog */
.end-session-dialog {
spacing: 42px;
border: 3px solid rgba(238, 238, 236, 0.2); }
border: 3px solid rgba(255, 255, 255, 0.1); }
.end-session-dialog-list {
padding-top: 20px; }
@ -314,7 +307,7 @@ StScrollBar {
/* Password or Authentication Dialog */
.prompt-dialog {
width: 500px;
border: 3px solid rgba(238, 238, 236, 0.2); }
border: 3px solid rgba(255, 255, 255, 0.1); }
.prompt-dialog-main-layout {
spacing: 24px;
@ -395,9 +388,11 @@ StScrollBar {
box-shadow: inset 0 1px 0px #282c2c;
font-weight: bold; }
.popup-menu .popup-menu-item:hover {
background-color: #215d9c; }
background-color: #215d9c;
color: #ffffff; }
.popup-menu .popup-menu-item:active {
background-color: #1c5187; }
background-color: #1c5187;
color: #ffffff; }
.popup-menu .popup-menu-item:insensitive {
background-color: rgba(57, 63, 63, 0.5); }
.popup-menu .active {
@ -466,7 +461,8 @@ StScrollBar {
border: 2px solid #040404; }
.switcher-list .item-box:selected {
background: #215d9c; }
background-color: #215d9c;
color: #ffffff; }
.switcher-list .thumbnail-box {
padding: 2px;
@ -505,6 +501,7 @@ StScrollBar {
.ws-switcher-active-up, .ws-switcher-active-down {
height: 50px;
background-color: #215d9c;
color: #ffffff;
background-size: 32px;
border-radius: 8px; }
@ -517,8 +514,8 @@ StScrollBar {
.osd-window,
.switcher-list, .workspace-switcher-container {
color: #eeeeec;
background-color: rgba(57, 63, 63, 0.8);
border: 1px solid rgba(238, 238, 236, 0.2);
background-color: rgba(0, 0, 0, 0.5);
border: 1px solid rgba(255, 255, 255, 0.1);
border-radius: 12px;
padding: 12px; }
@ -565,13 +562,11 @@ StScrollBar {
#panel .panel-button .app-menu-icon {
-st-icon-style: symbolic; }
#panel .panel-button:hover {
color: white;
text-shadow: black 0 2px 2px; }
color: white; }
#panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
background-color: rgba(0, 0, 0, 0.01);
box-shadow: inset 0 -2px 0px #256ab1;
color: white;
text-shadow: black 0px 2px 2px; }
color: white; }
#panel .panel-button:active > .system-status-icon, #panel .panel-button:overview > .system-status-icon, #panel .panel-button:focus > .system-status-icon, #panel .panel-button:checked > .system-status-icon {
icon-shadow: black 0 2px 2px; }
#panel .panel-button .system-status-icon {
@ -606,7 +601,7 @@ StScrollBar {
.calendar-vertical-separator {
width: .3em;
-stipple-width: 1px;
-stipple-color: rgba(238, 238, 236, 0.2); }
-stipple-color: rgba(255, 255, 255, 0.1); }
.calendar-month-label {
color: #e2e2df;
@ -645,7 +640,7 @@ StScrollBar {
.calendar-day-base:hover, .calendar-day-base:focus {
background-color: #454c4c; }
.calendar-day-base:active {
color: #fafaf9;
color: white;
background-color: #215d9c;
border-color: transparent; }
.calendar-day-base.calendar-day-heading {
@ -718,8 +713,6 @@ StScrollBar {
#appMenu {
spinner-image: url("process-working.svg");
spacing: 4px; }
#appMenu .label-shadow {
color: rgba(0, 0, 0, 0.5); }
.aggregate-menu {
width: 360px; }
@ -738,7 +731,8 @@ StScrollBar {
border: none;
padding: 14px; }
.system-menu-action:active {
background-color: #1c5187; }
background-color: #1c5187;
color: #ffffff; }
.system-menu-action > StIcon {
icon-size: 16px; }
@ -853,7 +847,8 @@ StScrollBar {
padding: 4px 12px;
-shell-caption-spacing: 12px; }
.window-caption:hover {
background-color: #215d9c; }
background-color: #215d9c;
color: #ffffff; }
.messages-indicator {
color: rgba(238, 238, 236, 0.8);
@ -943,7 +938,7 @@ StScrollBar {
.dash-label {
border-radius: 7px;
padding: 4px 12px;
background-color: rgba(57, 63, 63, 0.7);
background-color: rgba(0, 0, 0, 0.4);
text-align: center;
-x-offset: 8px; }
@ -991,7 +986,7 @@ StScrollBar {
.show-apps:checked .overview-icon,
.grid-search-result:active .overview-icon,
.grid-search-result:checked .overview-icon {
background-color: rgba(23, 25, 26, 0.9);
background-color: rgba(33, 36, 36, 0.9);
box-shadow: inset 0 1px 2px #1c1f1f; }
.app-well-app:hover .overview-icon, .app-well-app:focus .overview-icon, .app-well-app:selected .overview-icon,
.app-well-app.app-folder:hover .overview-icon,
@ -1084,8 +1079,8 @@ StScrollBar {
#dash, .workspace-thumbnails {
color: #eeeeec;
background-color: #393f3f;
border: 1px solid rgba(238, 238, 236, 0.2); }
background-color: rgba(0, 0, 0, 0.5);
border: 1px solid rgba(255, 255, 255, 0.1); }
.search-statustext, .no-frequent-applications-label {
font-size: 2em;
@ -1120,7 +1115,7 @@ StScrollBar {
font-size: 11pt;
width: 34em;
border-radius: 6px 6px 0 0;
background-color: rgba(38, 42, 42, 0.95);
background-color: rgba(0, 0, 0, 0.5);
border: 1px solid #1c1f1f;
border-bottom-width: 0;
spacing-rows: 4px;
@ -1160,13 +1155,14 @@ StScrollBar {
-shell-counter-overlap-x: 3px;
-shell-counter-overlap-y: 3px;
background-color: #215d9c;
color: #ffffff;
border: 2px solid #eeeeec;
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.5);
border-radius: 0.9em; }
.summary-boxpointer {
-arrow-border-radius: 15px;
-arrow-background-color: rgba(38, 42, 42, 0.95);
-arrow-background-color: rgba(0, 0, 0, 0.5);
-arrow-base: 36px;
-arrow-rise: 18px;
color: #eeeeec;
@ -1174,7 +1170,7 @@ StScrollBar {
.summary-boxpointer .notification {
border-radius: 9px;
border-width: 0;
background-color: rgba(38, 42, 42, 0.95) !important;
background-color: transparent !important;
padding-bottom: 12px; }
.summary-boxpointer #summary-right-click-menu {
padding-top: 12px;
@ -1350,7 +1346,7 @@ StScrollBar {
-arrow-border-radius: 10px;
-arrow-background-color: rgba(46, 52, 54, 0.7);
-arrow-border-width: 2px;
-arrow-border-color: rgba(238, 238, 236, 0.2);
-arrow-border-color: rgba(255, 255, 255, 0.1);
-arrow-base: 20px;
-arrow-rise: 10px;
-boxpointer-gap: 5px; }
@ -1367,7 +1363,8 @@ StScrollBar {
padding: 0.3em 0.5em 0.3em 0.5em;
border-radius: 4px; }
.candidate-box:selected, .candidate-box:hover {
background-color: #215d9c; }
background-color: #215d9c;
color: #ffffff; }
.candidate-page-button-box {
height: 2em;
@ -1465,7 +1462,8 @@ StScrollBar {
padding: .2em;
width: 23em; }
.login-dialog-user-list:expanded .login-dialog-user-list-item:focus {
background-color: #215d9c; }
background-color: #215d9c;
color: #ffffff; }
.login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in {
border-right: 2px solid #215d9c; }
@ -1562,9 +1560,9 @@ StScrollBar {
.screen-shield-notifications-container .notification-button, .screen-shield-notifications-container .notification-icon-button {
border: 1px solid rgba(238, 238, 236, 0.5); }
.screen-shield-notifications-container .notification, .screen-shield-notifications-container .screen-shield-notifications-box {
background-color: rgba(38, 42, 42, 0.45);
background-color: transparent;
color: #eeeeec;
border: 1px solid rgba(238, 238, 236, 0.2);
border: 1px solid rgba(255, 255, 255, 0.1);
margin: 6px 0;
padding: 12px;
spacing: 24px; }
@ -1581,7 +1579,7 @@ StScrollBar {
padding: 0px 0px 0px 12px; }
#panel.lock-screen {
background-color: rgba(38, 42, 42, 0.45); }
background-color: transparent; }
.screen-shield-background {
background: black;