[gtk+] Adwaita: fix vertical spinbutton style
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: fix vertical spinbutton style
- Date: Wed, 3 Feb 2016 14:05:16 +0000 (UTC)
commit f734db16044b95f70f52c1b33c9e52603ee34f06
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Wed Feb 3 15:03:39 2016 +0100
Adwaita: fix vertical spinbutton style
correct sizing and workaround disabled entry text colors.
gtk/theme/Adwaita/_common.scss | 16 ++++++++++++----
gtk/theme/Adwaita/gtk-contained-dark.css | 16 +++++++++++-----
gtk/theme/Adwaita/gtk-contained.css | 16 +++++++++++-----
3 files changed, 34 insertions(+), 14 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 8c7ee18..9d675ef 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1005,15 +1005,23 @@ spinbutton {
// in the vertical configuration, we treat the spinbutton
// as a box, and tweak the style of the entry in the middle
// so that it's linked
+
+ // FIXME: this should not be set at all, but otherwise it gets the wrong
+ // color
+ &:disabled { color: $insensitive_fg_color; }
+ &:backdrop:disabled { color: $backdrop_insensitive_color; }
+
entry {
+ min-height: 32px;
+ min-width: 32px;
+ padding: 0;
border-radius: 0;
- padding-left: 4px;
- padding-right: 4px;
}
button {
- padding-top: 8px; // Same vertical padding as image-buttons
- padding-bottom: 8px; //
+ min-height: 32px;
+ min-width: 32px;
+ padding: 0;
&.up {
@extend %top_button;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 2cde4f6..dfe955d 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1439,15 +1439,21 @@ spinbutton:not(.vertical) {
border-radius: 0 3px 3px 0; }
.osd spinbutton:not(.vertical) button:dir(rtl):first-child {
border-radius: 3px 0 0 3px; }
+spinbutton.vertical:disabled {
+ color: #949796; }
+spinbutton.vertical:backdrop:disabled {
+ color: #5d6767; }
spinbutton.vertical entry, spinbutton.vertical spinbutton:not(.vertical) {
- border-radius: 0;
- padding-left: 4px;
- padding-right: 4px; }
+ min-height: 32px;
+ min-width: 32px;
+ padding: 0;
+ border-radius: 0; }
spinbutton.vertical button,
spinbutton.vertical .titlebar button.titlebutton,
.titlebar spinbutton.vertical button.titlebutton {
- padding-top: 8px;
- padding-bottom: 8px; }
+ min-height: 32px;
+ min-width: 32px;
+ padding: 0; }
spinbutton.vertical button.up {
color: #eeeeec;
outline-color: rgba(238, 238, 236, 0.3);
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 3df128f..3e61017 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1443,15 +1443,21 @@ spinbutton:not(.vertical) {
border-radius: 0 3px 3px 0; }
.osd spinbutton:not(.vertical) button:dir(rtl):first-child {
border-radius: 3px 0 0 3px; }
+spinbutton.vertical:disabled {
+ color: #8b8e8f; }
+spinbutton.vertical:backdrop:disabled {
+ color: #c3c3c0; }
spinbutton.vertical entry, spinbutton.vertical spinbutton:not(.vertical) {
- border-radius: 0;
- padding-left: 4px;
- padding-right: 4px; }
+ min-height: 32px;
+ min-width: 32px;
+ padding: 0;
+ border-radius: 0; }
spinbutton.vertical button,
spinbutton.vertical .titlebar button.titlebutton,
.titlebar spinbutton.vertical button.titlebutton {
- padding-top: 8px;
- padding-bottom: 8px; }
+ min-height: 32px;
+ min-width: 32px;
+ padding: 0; }
spinbutton.vertical button.up {
color: #2e3436;
outline-color: rgba(46, 52, 54, 0.3);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]