[gnome-shell/wip/sass] theme: fix some placeholder colors
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/sass] theme: fix some placeholder colors
- Date: Mon, 16 Feb 2015 23:19:54 +0000 (UTC)
commit 899c16369cc52d7b0e6b1e628ca4b1a6cc7d3e32
Author: Jakub Steiner <jimmac gmail com>
Date: Tue Feb 17 00:19:34 2015 +0100
theme: fix some placeholder colors
data/theme/_common.scss | 42 +++++++++++++-----------------
data/theme/gnome-shell-high-contrast.css | 16 +++++------
data/theme/gnome-shell.css | 16 +++++------
3 files changed, 32 insertions(+), 42 deletions(-)
---
diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index 0249f45..5dba01b 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -28,7 +28,7 @@ $panel-corner-radius: 6px;
/* GLOBALS */
$font-size: 11;
-$font-family: Cantarell, Sans-Serif;
+$font-family: "Telder HT Pro", Sans-Serif;
$_bubble_bg_color: opacify($osd_bg_color,0.25);
$_bubble_fg_color: $osd_fg_color;
$_bubble_borders_color: transparentize($osd_fg_color,0.8);
@@ -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;
@@ -454,7 +454,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 {
@@ -688,8 +688,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;
}
@@ -890,7 +890,6 @@ StScrollBar {
}
/* NETWORK DIALOGS */
-// FIXME absolutely no cascading :(
.nm-dialog {
max-height: 500px;
@@ -1097,7 +1096,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; }
@@ -1135,7 +1134,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,
@@ -1229,7 +1228,6 @@ StScrollBar {
}
//Some hacks I don't even
- // FIXME
.search-display > StBoxLayout,
.all-apps,
.frequent-apps > StBoxLayout {
@@ -1371,10 +1369,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%); }
@@ -1401,11 +1399,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 {
@@ -1418,11 +1416,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 {
@@ -1482,10 +1476,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;
}
}
@@ -1578,7 +1572,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 378be50..d826482 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -19,7 +19,7 @@
*/
/* GLOBALS */
stage {
- font-family: Cantarell, Sans-Serif;
+ font-family: "Telder HT Pro", Sans-Serif;
font-size: 11pt;
color: #fff; }
@@ -413,7 +413,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;
@@ -1271,11 +1271,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;
@@ -1345,9 +1343,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 73c22d9..9f9659b 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -19,7 +19,7 @@
*/
/* GLOBALS */
stage {
- font-family: Cantarell, Sans-Serif;
+ font-family: "Telder HT Pro", Sans-Serif;
font-size: 11pt;
color: #eeeeec; }
@@ -413,7 +413,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;
@@ -1271,11 +1271,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;
@@ -1345,9 +1343,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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]