summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Soriano <csoriano@gnome.org>2015-07-29 13:48:26 +0200
committerFlorian Müllner <fmuellner@gnome.org>2015-08-05 14:40:54 +0200
commite12b124a78a0aee58416a212567676c225506777 (patch)
tree4825c195506bcb774dc61f0645ca7cef2c976c3a
parenteb29ab580d569075f0208074383690f107b3e6dd (diff)
downloadgnome-shell-sass-e12b124a78a0aee58416a212567676c225506777.tar.gz
theme: Match gtk+ modal dialog buttons style
Only drawbackis we need a little workaround in _drawing for an issue with box-shadow. See bug 752934 for context. https://bugzilla.gnome.org/show_bug.cgi?id=746108
-rw-r--r--_common.scss38
-rw-r--r--_drawing.scss8
2 files changed, 35 insertions, 11 deletions
diff --git a/_common.scss b/_common.scss
index ee80092..bc424d3 100644
--- a/_common.scss
+++ b/_common.scss
@@ -50,6 +50,28 @@ stage {
&:focus { @include button(focus); }
&:insensitive { @include button(insensitive); }
&:active { @include button(active); }
+
+}
+
+.modal-dialog-linked-button {
+ border-right-width: 1px;
+ @include button(normal);
+ &:insensitive { @include button(insensitive); }
+ &:active { @include button(active); }
+ &:focus { @include button(focus); }
+ padding: 12px;
+
+ &:first-child {
+ border-radius: 0px 0px 0px 6px;
+ }
+ &:last-child {
+ border-right-width: 0px;
+ border-radius: 0px 0px 6px 0px;
+ }
+ &:first-child:last-child {
+ border-right-width: 0px;
+ border-radius: 0px 0px 6px 6px;
+ }
}
/* Entries */
@@ -156,12 +178,13 @@ StScrollBar {
.flashspot { background-color: white; }
.modal-dialog {
- border-radius: 5px;
+ border-radius: 9px;
color: $osd_fg_color;
background-color: transparentize(darken($osd_bg_color,10%),0.05);
border: 3px solid transparentize($osd_fg_color,0.5);
- padding: 24px;
-
+ .modal-dialog-content-box {
+ padding: 24px;
+ }
.run-dialog-entry { width: 20em; margin-bottom: 6px; }
.run-dialog-error-box {
padding-top: 16px;
@@ -176,10 +199,6 @@ StScrollBar {
}
}
- .button-dialog-button-box {
- spacing: 18px;
- padding-top: 48px;
- }
.show-processes-dialog-subject,
.mount-question-dialog-subject,
@@ -971,7 +990,10 @@ StScrollBar {
min-width: 470px;
}
- .nm-dialog-content { spacing: 20px; }
+ .nm-dialog-content {
+ spacing: 20px;
+ padding: 24px;
+ }
.nm-dialog-header-hbox { spacing: 10px; }
.nm-dialog-airplane-box { spacing: 12px; }
diff --git a/_drawing.scss b/_drawing.scss
index a16d2a5..66d5ada 100644
--- a/_drawing.scss
+++ b/_drawing.scss
@@ -154,10 +154,9 @@
$osd_bg_color);
color: $osd_fg_color;
- border-color: $selected_bg_color;
- box-shadow: inset 0 1px lighten($osd_bg_color,10%);
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
+ box-shadow: inset 0px 0px 0px 1px $selected_bg_color;
}
@else if $t==hover {
@@ -184,7 +183,10 @@
color: white;
border-color: $osd_borders_color;
background-color: darken($_bg,5%);
- box-shadow: none;
+ // This should be none, but it's creating some issues with borders, so to
+ // workaround it for now, use inset wich goes through a different code path.
+ // see https://bugzilla.gnome.org/show_bug.cgi?id=752934
+ box-shadow: inset 0 0 black;
text-shadow: none;
icon-shadow: none;
}