aboutsummaryrefslogtreecommitdiff
path: root/common/gnome-shell/3.16
diff options
context:
space:
mode:
authorHorst31802015-08-27 20:55:37 +0200
committerHorst31802015-08-27 21:03:06 +0200
commit8c0e60f997d70cdb63566f46390546691d947749 (patch)
tree817385dcb4158849dad6257e4c85ad2e3aef3e03 /common/gnome-shell/3.16
parentbd550a46d936226801cb9d8cef9ea6273894b51c (diff)
parentb811483e7f6fb97afa531a873c73a48f48ef8468 (diff)
downloadsolarc-theme-8c0e60f997d70cdb63566f46390546691d947749.tar.gz
solarc-theme-8c0e60f997d70cdb63566f46390546691d947749.tar.xz
solarc-theme-8c0e60f997d70cdb63566f46390546691d947749.zip
Merge branch 'master' into wip/3.18
Diffstat (limited to 'common/gnome-shell/3.16')
-rw-r--r--common/gnome-shell/3.16/gnome-shell.css123
-rw-r--r--common/gnome-shell/3.16/sass/_common.scss27
-rw-r--r--common/gnome-shell/3.16/sass/_drawing.scss9
3 files changed, 80 insertions, 79 deletions
diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css
index e2282fe..eecc3a4 100644
--- a/common/gnome-shell/3.16/gnome-shell.css
+++ b/common/gnome-shell/3.16/gnome-shell.css
@@ -25,72 +25,76 @@ stage {
min-height: 20px;
padding: 5px 32px;
transition-duration: 0;
- border-radius: 2px;
+ border-radius: 2px; }
+
+.button, .notification-banner .notification-button,
+.notification-banner:hover .notification-button,
+.notification-banner:focus .notification-button, .hotplug-notification-item {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #5c616c;
background-color: #fbfbfc;
border: 1px solid #cfd6e6; }
- .button:focus {
+ .button:focus, .notification-banner .notification-button:focus,
+ .hotplug-notification-item:focus {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #5c616c;
background-color: #fbfbfc;
border: 1px solid #5294E2; }
- .button:hover {
+ .button:hover, .notification-banner .notification-button:hover,
+ .hotplug-notification-item:hover {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #5c616c;
background-color: #fbfbfc;
border: 1px solid #5294E2; }
- .button:hover:focus {
+ .button:hover:focus, .notification-banner .notification-button:hover:focus,
+ .hotplug-notification-item:hover:focus {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #5294E2;
background-color: #fbfbfc;
border: 1px solid #5294E2; }
- .button:active, .button:active:focus {
+ .button:active, .notification-banner .notification-button:active,
+ .hotplug-notification-item:active, .button:active:focus, .notification-banner .notification-button:active:focus,
+ .hotplug-notification-item:active:focus {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #ffffff;
background-color: #5294E2;
border: 1px solid #5294E2; }
- .button:insensitive {
+ .button:insensitive, .notification-banner .notification-button:insensitive,
+ .hotplug-notification-item:insensitive {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: rgba(92, 97, 108, 0.55);
border: 1px solid rgba(207, 214, 230, 0.55);
background-color: rgba(251, 251, 252, 0.55); }
-.modal-dialog-button-box .button, .notification-banner .notification-button,
-.notification-banner:hover .notification-button,
-.notification-banner:focus .notification-button, .hotplug-notification-item {
+.modal-dialog-button-box .button {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #BAC3CF;
border: 1px solid rgba(0, 0, 0, 0.45);
background-color: rgba(0, 0, 0, 0.3); }
- .modal-dialog-button-box .button:hover, .notification-banner .notification-button:hover,
- .hotplug-notification-item:hover {
+ .modal-dialog-button-box .button:hover {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #BAC3CF;
border: 1px solid #5294E2;
background-color: rgba(0, 0, 0, 0.3); }
- .modal-dialog-button-box .button:focus, .notification-banner .notification-button:focus,
- .hotplug-notification-item:focus {
+ .modal-dialog-button-box .button:focus {
color: #5294E2; }
- .modal-dialog-button-box .button:active, .notification-banner .notification-button:active,
- .hotplug-notification-item:active {
+ .modal-dialog-button-box .button:active {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #ffffff;
border: 1px solid #5294E2;
background-color: #5294E2; }
- .modal-dialog-button-box .button:insensitive, .notification-banner .notification-button:insensitive,
- .hotplug-notification-item:insensitive {
+ .modal-dialog-button-box .button:insensitive {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #555a62;
border: 1px solid rgba(0, 0, 0, 0.45);
background-color: rgba(0, 0, 0, 0.15); }
@@ -101,21 +105,21 @@ StEntry {
selection-background-color: #5294E2;
selected-color: #ffffff;
transition-duration: 300ms;
- border-radius: 20px;
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ border-radius: 3px;
color: #5c616c;
background-color: #ffffff;
- border: 1px solid #cfd6e6; }
+ border: 1px solid #cfd6e6;
+ box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.1); }
StEntry:focus, StEntry:hover {
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
color: #5c616c;
background-color: #ffffff;
- border: 1px solid #5294E2; }
+ border: 1px solid #5294E2;
+ box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.1); }
StEntry:insensitive {
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
color: rgba(92, 97, 108, 0.55);
background-color: #fbfbfb;
- border-color: 1px solid #e0e4ee; }
+ border-color: 1px solid #e0e4ee;
+ box-shadow: inset 0 2px 4px rgba(251, 251, 251, 0.1); }
StEntry StIcon.capslock-warning {
icon-size: 16px;
warning-color: #F27835;
@@ -591,6 +595,8 @@ StScrollBar {
height: 2.1em;
min-height: 27px;
border-image: url("common-assets/panel/panel.svg") 1 1 1 1; }
+ #panel.dynamic-top-bar-white-btn {
+ border-image: none; }
#panel.unlock-screen,
#panel.login-screen,
#panel.lock-screen {
@@ -762,7 +768,7 @@ StScrollBar {
.world-clocks-button:focus,
.message-list-section-title:hover, .message-list-section-title:focus {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #5c616c;
background-color: #fbfbfc;
border: 1px solid #5294E2; }
@@ -770,7 +776,7 @@ StScrollBar {
.world-clocks-button:active,
.message-list-section-title:active {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #ffffff;
background-color: #5294E2;
border: 1px solid #5294E2; }
@@ -1239,7 +1245,7 @@ StScrollBar {
border-color: #5294E2; }
.app-view-control:checked {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #ffffff;
border: 1px solid #5294E2;
background-color: #5294E2; }
@@ -1388,10 +1394,10 @@ StScrollBar {
width: 34em;
margin: 5px;
padding: 10px;
- color: #BAC3CF;
+ color: #5c616c;
background-color: transparent;
border: 1px solid transparent;
- border-image: url("common-assets/misc/bg.svg") 9 9 9 9; }
+ border-image: url("light-assets/menu/menu.svg") 9 9 9 9; }
.notification-banner .notification-icon,
.notification-banner:hover .notification-icon,
.notification-banner:focus .notification-icon {
@@ -1432,7 +1438,7 @@ StScrollBar {
margin: 5px; }
.chat-log-message {
- color: #BAC3CF; }
+ color: #5c616c; }
.chat-new-group {
padding-top: 1em; }
@@ -1443,17 +1449,6 @@ StScrollBar {
padding-left: 0px;
padding-right: 4px; }
-StEntry.chat-response {
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
- color: #BAC3CF;
- background-color: rgba(0, 0, 0, 0.2);
- border: 1px solid rgba(0, 0, 0, 0.4); }
- StEntry.chat-response:focus {
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
- color: #BAC3CF;
- background-color: rgba(0, 0, 0, 0.2);
- border: 1px solid #5294E2; }
-
.chat-sent {
padding-left: 18pt;
color: #5294E2; }
@@ -1465,7 +1460,7 @@ StEntry.chat-response {
padding-left: 4px;
font-size: 9pt;
font-weight: bold;
- color: rgba(186, 195, 207, 0.6); }
+ color: rgba(92, 97, 108, 0.6); }
.chat-meta-message:rtl {
padding-left: 0;
padding-right: 4px; }
@@ -1567,25 +1562,25 @@ StEntry.chat-response {
border-radius: 3px;
box-shadow: none;
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #BAC3CF;
border: 1px solid rgba(0, 0, 0, 0.45);
background-color: rgba(0, 0, 0, 0.3); }
.keyboard-key:hover {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #BAC3CF;
border: 1px solid #5294E2;
background-color: rgba(0, 0, 0, 0.3); }
.keyboard-key:active, .keyboard-key:checked {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #ffffff;
border: 1px solid #5294E2;
background-color: #5294E2; }
.keyboard-key:grayed {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #555a62;
border: 1px solid rgba(0, 0, 0, 0.45);
background-color: rgba(0, 0, 0, 0.15); }
@@ -1661,25 +1656,25 @@ StEntry.chat-response {
padding: 3px 18px; }
.login-dialog .modal-dialog-button:default {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #5c616c;
background-color: #fbfbfc;
border: 1px solid #cfd6e6; }
.login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #5c616c;
background-color: #fbfbfc;
border: 1px solid #5294E2; }
.login-dialog .modal-dialog-button:default:active {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: #ffffff;
background-color: #5294E2;
border: 1px solid #5294E2; }
.login-dialog .modal-dialog-button:default:insensitive {
text-shadow: 0 1px rgba(255, 255, 255, 0);
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
+ box-shadow: inset 0 0 black;
color: rgba(92, 97, 108, 0.55);
border: 1px solid rgba(207, 214, 230, 0.55);
background-color: rgba(251, 251, 252, 0.55); }
@@ -1886,15 +1881,15 @@ StEntry.chat-response {
.lg-dialog StEntry {
selection-background-color: #5294E2;
selected-color: #ffffff;
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
color: #BAC3CF;
background-color: rgba(0, 0, 0, 0.2);
- border: 1px solid rgba(0, 0, 0, 0.4); }
+ border: 1px solid rgba(0, 0, 0, 0.4);
+ box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
.lg-dialog StEntry:focus {
- box-shadow: inset 0 0 rgba(255, 255, 255, 0);
color: #BAC3CF;
background-color: rgba(0, 0, 0, 0.2);
- border: 1px solid #5294E2; }
+ border: 1px solid #5294E2;
+ box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
.lg-dialog .shell-link {
color: #2679db; }
diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss
index cb4815b..2578ae7 100644
--- a/common/gnome-shell/3.16/sass/_common.scss
+++ b/common/gnome-shell/3.16/sass/_common.scss
@@ -53,6 +53,10 @@ stage {
transition-duration: 0;
border-radius: 2px;
+ @extend %button;
+}
+
+%button {
@include button(normal);
&:focus { @include button(focus); }
@@ -80,7 +84,7 @@ StEntry {
selection-background-color: $selected_bg_color;
selected-color: $selected_fg_color;
transition-duration: 300ms;
- border-radius: 20px;
+ border-radius: 3px;
@include entry(normal);
@@ -769,6 +773,9 @@ StScrollBar {
min-height: 27px;
border-image: url('common-assets/panel/panel.svg') 1 1 1 1;
+ // Fix dynamic top bar extension
+ &.dynamic-top-bar-white-btn { border-image: none; }
+
&.unlock-screen,
&.login-screen,
&.lock-screen {
@@ -1733,10 +1740,10 @@ StScrollBar {
width: 34em;
margin: 5px;
padding: 10px;
- color: $osd_fg_color;
+ color: $fg_color;
background-color: transparent;
border: 1px solid transparent;
- border-image: url("common-assets/misc/bg.svg") 9 9 9 9;
+ border-image: url("#{$asset_path}/menu/menu.svg") 9 9 9 9;
.notification-icon { padding: 5px; }
@@ -1751,7 +1758,7 @@ StScrollBar {
}
.notification-button {
padding: 4px 4px 5px;
- @extend %osd_button;
+ @extend %button;
&:first-child, &:last-child { border-radius: 2px; }
}
@@ -1762,7 +1769,7 @@ StScrollBar {
// Chat Bubbles
.chat-body { spacing: 5px; }
.chat-response { margin: 5px; }
-.chat-log-message { color: $osd_fg_color; }
+.chat-log-message { color: $fg_color; }
.chat-new-group { padding-top: 1em; }
.chat-received {
padding-left: 4px;
@@ -1770,12 +1777,6 @@ StScrollBar {
&:rtl { padding-left: 0px; padding-right: 4px; }
}
-StEntry.chat-response {
- @include entry(osd);
-
- &:focus { @include entry(osd-focus); }
-}
-
.chat-sent {
padding-left: 18pt;
color: $selected_bg_color;
@@ -1787,7 +1788,7 @@ StEntry.chat-response {
padding-left: 4px;
font-size: 9pt;
font-weight: bold;
- color: transparentize($osd_fg_color, 0.4);
+ color: transparentize($fg_color, 0.4);
&:rtl { padding-left: 0; padding-right: 4px; }
}
@@ -1802,7 +1803,7 @@ StEntry.chat-response {
.hotplug-notification-item {
padding: 2px 10px;
- @extend %osd_button;
+ @extend %button;
&:focus { padding: 2px 10px; }
}
diff --git a/common/gnome-shell/3.16/sass/_drawing.scss b/common/gnome-shell/3.16/sass/_drawing.scss
index 03b9f15..5ab1463 100644
--- a/common/gnome-shell/3.16/sass/_drawing.scss
+++ b/common/gnome-shell/3.16/sass/_drawing.scss
@@ -15,42 +15,47 @@
// Entries drawing function
//
//@extend %reset_style;
- box-shadow: inset 0 0 transparentize($base_color, 1);
@if $t==normal {
color: $text_color;
background-color: $entry_bg;
border: 1px solid $entry_border;
+ box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9);
}
@if $t==focus {
color: $fg_color;
background-color: $entry_bg;
border: 1px solid $selected_bg_color;
+ box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9);
}
@if $t==insensitive {
color: $insensitive_fg_color;
background-color: mix($entry_bg, $bg_color, 55%);
border-color: 1px solid mix($entry_border, $bg_color, 55%);
+ box-shadow: inset 0 2px 4px transparentize(mix($entry_bg, $bg_color, 55%), 0.9);
}
@if $t==osd {
color: $osd_fg_color;
background-color: transparentize(black, 0.8);
border: 1px solid transparentize(black, 0.6);
+ box-shadow: inset 0 2px 4px transparentize(black, 0.95);
}
@if $t==osd-focus {
color: $osd_fg_color;
background-color: transparentize(black, 0.8);
border: 1px solid $selected_bg_color;
+ box-shadow: inset 0 2px 4px transparentize(black, 0.95);
}
@if $t==osd-insensitive {
color: $osd_insensitive_fg_color;
background-color: transparentize(black, 0.9);
border-color: 1px solid transparentize(black, 0.6);
+ box-shadow: inset 0 2px 4px transparentize(black, 0.95);
}
}
@@ -63,7 +68,7 @@
//@extend %reset_style;
text-shadow: 0 1px transparentize($base_color, 1);
- box-shadow: inset 0 0 transparentize($base_color, 1);
+ box-shadow: inset 0 0 black;
@if $t==normal {
//