From 8b65871c90e44703e4da913ca946d87f4a34c57c Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Tue, 17 Feb 2015 00:19:34 +0100 Subject: [PATCH] theme: fix some placeholder colors --- data/theme/_common.scss | 40 ++++++++++-------------- data/theme/gnome-shell-high-contrast.css | 14 ++++----- data/theme/gnome-shell.css | 14 ++++----- 3 files changed, 29 insertions(+), 39 deletions(-) diff --git a/data/theme/_common.scss b/data/theme/_common.scss index 038fcae7c..77556da23 100644 --- a/data/theme/_common.scss +++ b/data/theme/_common.scss @@ -144,8 +144,8 @@ StScrollBar { /* Modal Dialogs */ .headline { font-size: 110%; } -.lightbox { background-color: black; } //FIXME where is this? -.flashspot { background-color: white; } //FIXME where is this? +.lightbox { background-color: black; } +.flashspot { background-color: white; } .modal-dialog { border-radius: 5px; @@ -459,7 +459,7 @@ StScrollBar { -arrow-border-color: $borders_color; -arrow-base: 24px; -arrow-rise: 11px; - -arrow-box-shadow: 0 1px 3px red; //dreaming. bug #689995 + -arrow-box-shadow: 0 1px 3px black; //dreaming. bug #689995 } .popup-separator-menu-item { @@ -686,8 +686,8 @@ StScrollBar { } } - .panel-menu { -boxpointer-gap: 4px; } //FIXME - .panel-status-indicators-box, //FIXME + .panel-menu { -boxpointer-gap: 4px; } + .panel-status-indicators-box, .panel-status-menu-box { spacing: 2px; } @@ -888,7 +888,6 @@ StScrollBar { } /* NETWORK DIALOGS */ -// FIXME absolutely no cascading :( .nm-dialog { max-height: 500px; @@ -1095,7 +1094,7 @@ StScrollBar { -shell-grid-horizontal-item-size: 136px; -shell-grid-vertical-item-size: 136px; - .overview-icon { icon-size: 96px; } //FIXME no effect + .overview-icon { icon-size: 96px; } } //.app-display { spacing: 20px; } @@ -1133,7 +1132,7 @@ StScrollBar { } &:active .overview-icon, &:checked .overview-icon { - background-color: transparentize(darken($osd_bg_color,10%),.1); //FIXME not working? + background-color: transparentize(darken($osd_bg_color,10%),.1); box-shadow: inset 0 1px 2px $osd_borders_color; } &:hover .overview-icon, @@ -1226,7 +1225,6 @@ StScrollBar { } //Some hacks I don't even - // FIXME .search-display > StBoxLayout, .all-apps, .frequent-apps > StBoxLayout { @@ -1368,10 +1366,10 @@ StScrollBar { border-radius: 5px; padding: 5px; height: 24px; width: 24px; - &:focus { }//FIXME + &:focus { } & > StIcon { icons-size: 16px; width: 16px; height: 16px; padding: 2px; } } - .secondary-icon { icon-size: 1.09em; } //FIXME + .secondary-icon { icon-size: 1.09em; } //chat bubbles .chat-log-message { color: darken($fg_color,10%); } @@ -1398,11 +1396,11 @@ StScrollBar { //hotplug .hotplug-transient-box { spacing: 6px; - padding: 2px 72px 2px 12px;//FIXME wat? + padding: 2px 72px 2px 12px; } .hotplug-notification-item { padding: 2px 10px; - &:focus { padding: 1px 71px 1px 11px; } //FIXME wat? + &:focus { padding: 1px 71px 1px 11px; } } .hotplug-notification-item-icon { @@ -1415,11 +1413,7 @@ StScrollBar { .hotplug-resident-mount { spacing: 8px; border-radius: 4px; - color: green; - &:hover { - color: red; - background-color: blue; - } + &:hover { background-color: transparentize($bg_color,0.7); } } .hotplug-resident-mount-label { @@ -1479,10 +1473,10 @@ StScrollBar { &:focus { @include button(focus); } &:hover,&:checked { @include button(hover); } &:active { @include button(active);} - &:grayed { - background-color: green; - color: red; - border-color: blue; + &:grayed { //FIXME + background-color: $osd_bg_color; + color: $osd_fg_color; + border-color: $osd_borders_color; } } @@ -1575,7 +1569,7 @@ StScrollBar { padding-left: 2px; .login-dialog-not-listed-button:focus &, .login-dialog-not-listed-button:hover & { - color: $osd_fg_color; //FIXME + color: $osd_fg_color; } } } diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css index 232745a76..5f0a509f8 100644 --- a/data/theme/gnome-shell-high-contrast.css +++ b/data/theme/gnome-shell-high-contrast.css @@ -415,7 +415,7 @@ StScrollBar { -arrow-border-color: black; -arrow-base: 24px; -arrow-rise: 11px; - -arrow-box-shadow: 0 1px 3px red; } + -arrow-box-shadow: 0 1px 3px black; } .popup-separator-menu-item { height: 1px; @@ -1268,11 +1268,9 @@ StScrollBar { .hotplug-resident-mount { spacing: 8px; - border-radius: 4px; - color: green; } + border-radius: 4px; } .hotplug-resident-mount:hover { - color: red; - background-color: blue; } + background-color: rgba(0, 0, 0, 0.3); } .hotplug-resident-mount-label { color: inherit; @@ -1342,9 +1340,9 @@ StScrollBar { text-shadow: none; icon-shadow: none; } .keyboard-key:grayed { - background-color: green; - color: red; - border-color: blue; } + background-color: #2e3436; + color: #eeeeec; + border-color: rgba(0, 0, 0, 0.7); } .keyboard-subkeys { color: white; diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css index 1f13eb6ce..1a0918dde 100644 --- a/data/theme/gnome-shell.css +++ b/data/theme/gnome-shell.css @@ -415,7 +415,7 @@ StScrollBar { -arrow-border-color: #1c1f1f; -arrow-base: 24px; -arrow-rise: 11px; - -arrow-box-shadow: 0 1px 3px red; } + -arrow-box-shadow: 0 1px 3px black; } .popup-separator-menu-item { height: 1px; @@ -1268,11 +1268,9 @@ StScrollBar { .hotplug-resident-mount { spacing: 8px; - border-radius: 4px; - color: green; } + border-radius: 4px; } .hotplug-resident-mount:hover { - color: red; - background-color: blue; } + background-color: rgba(57, 63, 63, 0.3); } .hotplug-resident-mount-label { color: inherit; @@ -1342,9 +1340,9 @@ StScrollBar { text-shadow: none; icon-shadow: none; } .keyboard-key:grayed { - background-color: green; - color: red; - border-color: blue; } + background-color: #2e3436; + color: #eeeeec; + border-color: rgba(0, 0, 0, 0.7); } .keyboard-subkeys { color: white;