diff options
| author | Daniel Boles <dboles@src.gnome.org> | 2017-10-31 19:43:52 +0000 |
|---|---|---|
| committer | Daniel Boles <dboles@src.gnome.org> | 2017-11-01 20:24:56 +0000 |
| commit | f24b286417f854dd674e50e378cc5a2c87b399ca (patch) | |
| tree | dfc7d8789c4e3d73e3070c0304ca83ed017618c7 /gtk/theme | |
| parent | a58a5219b9e85a6209f658d637a34bd6cc745c94 (diff) | |
| download | gtk+-f24b286417f854dd674e50e378cc5a2c87b399ca.tar.gz | |
Adwaita: Fix Entry:has-frame if backdrop/disabled
by explicitly including these in the selector removing the border, to
avoid other rules on these pseudoclasses overriding the .flat class.
https://bugzilla.gnome.org/show_bug.cgi?id=789733
Diffstat (limited to 'gtk/theme')
| -rw-r--r-- | gtk/theme/Adwaita/_common.scss | 2 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/gtk-contained-dark.css | 2 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/gtk-contained.css | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 419853280e..eaeb54cc4e 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -272,7 +272,7 @@ entry { } &.flat { - &:focus, & { + &:focus, &:backdrop, &:disabled, &:backdrop:disabled, & { min-height: 0; padding: 2px; background-color: transparent; diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index a29acde24e..c5abe78ed4 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -98,7 +98,7 @@ spinbutton:not(.vertical) undershoot.left, entry undershoot.left { background-co spinbutton:not(.vertical) undershoot.right, entry undershoot.right { background-color: transparent; background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); padding-right: 1px; background-size: 1px 10px; background-repeat: repeat-y; background-origin: content-box; background-position: right center; border: none; box-shadow: none; } -spinbutton.flat:focus:not(.vertical), spinbutton.flat:not(.vertical), entry.flat:focus, entry.flat { min-height: 0; padding: 2px; background-color: transparent; border-color: transparent; border-radius: 0; } +spinbutton.flat:focus:not(.vertical), spinbutton.flat:backdrop:not(.vertical), spinbutton.flat:disabled:not(.vertical), spinbutton.flat:backdrop:disabled:not(.vertical), spinbutton.flat:not(.vertical), entry.flat:focus, entry.flat:backdrop, entry.flat:disabled, entry.flat:backdrop:disabled, entry.flat { min-height: 0; padding: 2px; background-color: transparent; border-color: transparent; border-radius: 0; } spinbutton:focus:not(.vertical), entry:focus { box-shadow: inset 0 0 0 1px #215d9c; border-color: #0f2b48; outline: none; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index a5f5ee1202..c126927366 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -98,7 +98,7 @@ spinbutton:not(.vertical) undershoot.left, entry undershoot.left { background-co spinbutton:not(.vertical) undershoot.right, entry undershoot.right { background-color: transparent; background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); padding-right: 1px; background-size: 1px 10px; background-repeat: repeat-y; background-origin: content-box; background-position: right center; border: none; box-shadow: none; } -spinbutton.flat:focus:not(.vertical), spinbutton.flat:not(.vertical), entry.flat:focus, entry.flat { min-height: 0; padding: 2px; background-color: transparent; border-color: transparent; border-radius: 0; } +spinbutton.flat:focus:not(.vertical), spinbutton.flat:backdrop:not(.vertical), spinbutton.flat:disabled:not(.vertical), spinbutton.flat:backdrop:disabled:not(.vertical), spinbutton.flat:not(.vertical), entry.flat:focus, entry.flat:backdrop, entry.flat:disabled, entry.flat:backdrop:disabled, entry.flat { min-height: 0; padding: 2px; background-color: transparent; border-color: transparent; border-radius: 0; } spinbutton:focus:not(.vertical), entry:focus { box-shadow: inset 0 0 0 1px #4a90d9; border-color: #4a90d9; outline: none; } |