[gtk+] Adwaita: some dialog love
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: some dialog love
- Date: Fri, 15 Jan 2016 16:57:33 +0000 (UTC)
commit fc804bba2d309b0134bf50227df53de8d1b91288
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Fri Jan 15 17:56:49 2016 +0100
Adwaita: some dialog love
addresses https://bugzilla.gnome.org/show_bug.cgi?id=760525
gtk/theme/Adwaita/_common.scss | 21 +++++++++------------
gtk/theme/Adwaita/gtk-contained-dark.css | 19 ++++++++++---------
gtk/theme/Adwaita/gtk-contained.css | 21 ++++++++++-----------
3 files changed, 29 insertions(+), 32 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 39cad8b..b76df79 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3031,19 +3031,16 @@ calendar {
* Dialogs *
***********/
-messagedialog .dialog-action-area button {
- padding: 8px;
-}
-
messagedialog { // Message Dialog styling
- @if $variant==light {
- // the bright variant as a slightly darker bg which in this case clashes with the window decoration,
overriding
- &.background { background-color: $bg_color; }
- }
-
.titlebar {
+ min-height: 20px;
+ background-image: none;
+ background-color: $bg_color;
border-style: none;
- box-shadow: inset 0 1px $borders_edge;
+ border-top-left-radius: 7px;
+ border-top-right-radius: 7px;
+
+ .title { font-size: 0; } // squash the label
}
&.csd { // rounded bottom border styling for csd version
@@ -3054,7 +3051,7 @@ messagedialog { // Message Dialog styling
}
.dialog-action-area button {
- padding: 12px;
+ padding: 10px 14px; // labels are not vertically centered on message dialog, this is a workaround
border-radius: 0;
@include button(normal, $edge:none);
@extend %middle_button;
@@ -3140,7 +3137,7 @@ messagedialog { // Message Dialog styling
}
}
-GtkFileChooserDialog {
+filechooser {
.dialog-action-box {
border-top: 1px solid $borders_color;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 4959bc4..91980a0 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -3933,19 +3933,20 @@ calendar {
/***********
* Dialogs *
***********/
-messagedialog .dialog-action-area button,
-messagedialog .dialog-action-area .titlebar button.titlebutton,
-.titlebar messagedialog .dialog-action-area button.titlebutton {
- padding: 8px; }
-
messagedialog .titlebar {
+ min-height: 20px;
+ background-image: none;
+ background-color: #393f3f;
border-style: none;
- box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); }
+ border-top-left-radius: 7px;
+ border-top-right-radius: 7px; }
+ messagedialog .titlebar .title {
+ font-size: 0; }
messagedialog.csd.background {
border-bottom-left-radius: 9px;
border-bottom-right-radius: 9px; }
messagedialog.csd .dialog-action-area button {
- padding: 12px;
+ padding: 10px 14px;
border-radius: 0;
color: #eeeeec;
outline-color: rgba(238, 238, 236, 0.3);
@@ -4129,9 +4130,9 @@ messagedialog.csd .dialog-action-area button:first-child {
border-bottom-left-radius: 7px;
-gtk-outline-bottom-left-radius: 5px; }
-GtkFileChooserDialog .dialog-action-box {
+filechooser .dialog-action-box {
border-top: 1px solid #1c1f1f; }
- GtkFileChooserDialog .dialog-action-box:backdrop {
+ filechooser .dialog-action-box:backdrop {
border-top-color: #1f2222; }
/***********
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 496d06c..b6ec6cd 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4107,21 +4107,20 @@ calendar {
/***********
* Dialogs *
***********/
-messagedialog .dialog-action-area button,
-messagedialog .dialog-action-area .titlebar button.titlebutton,
-.titlebar messagedialog .dialog-action-area button.titlebutton {
- padding: 8px; }
-
-messagedialog.background {
- background-color: #e8e8e7; }
messagedialog .titlebar {
+ min-height: 20px;
+ background-image: none;
+ background-color: #e8e8e7;
border-style: none;
- box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); }
+ border-top-left-radius: 7px;
+ border-top-right-radius: 7px; }
+ messagedialog .titlebar .title {
+ font-size: 0; }
messagedialog.csd.background {
border-bottom-left-radius: 9px;
border-bottom-right-radius: 9px; }
messagedialog.csd .dialog-action-area button {
- padding: 12px;
+ padding: 10px 14px;
border-radius: 0;
color: #2e3436;
outline-color: rgba(46, 52, 54, 0.3);
@@ -4305,9 +4304,9 @@ messagedialog.csd .dialog-action-area button:first-child {
border-bottom-left-radius: 7px;
-gtk-outline-bottom-left-radius: 5px; }
-GtkFileChooserDialog .dialog-action-box {
+filechooser .dialog-action-box {
border-top: 1px solid #9d9d99; }
- GtkFileChooserDialog .dialog-action-box:backdrop {
+ filechooser .dialog-action-box:backdrop {
border-top-color: #a5a5a1; }
/***********
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]