diff options
| author | Jakub Steiner <jimmac@gmail.com> | 2020-08-07 17:16:14 +0000 |
|---|---|---|
| committer | Jakub Steiner <jimmac@gmail.com> | 2020-08-07 17:16:14 +0000 |
| commit | cd0b9a2359275f320301705a4aaa0a8d1c4483ec (patch) | |
| tree | 5b4be9bc431034c3ceb2bc421bd50e57d1b9b30d | |
| parent | 51d55e4fbc7b02e54bdb0e8f4708b02eaee1cd0d (diff) | |
| parent | 96500816bc2e459399f74c7251749642875e0277 (diff) | |
| download | gtk+-cd0b9a2359275f320301705a4aaa0a8d1c4483ec.tar.gz | |
Merge branch 'wip/jimmac/vte-bg-color' into 'master'
Wip/jimmac/vte bg color
Closes vte#226
See merge request GNOME/gtk!2403
| -rw-r--r-- | gtk/theme/Adwaita/_colors-public.scss | 3 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/_common.scss | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/gtk/theme/Adwaita/_colors-public.scss b/gtk/theme/Adwaita/_colors-public.scss index 8ccc3413cc..3b638e2bf6 100644 --- a/gtk/theme/Adwaita/_colors-public.scss +++ b/gtk/theme/Adwaita/_colors-public.scss @@ -112,5 +112,8 @@ read if you used those and something break with a version upgrade you're on your //FIXME this is really an API +/* content view background such as thumbnails view in Photos or Boxes */ @define-color content_view_bg #{"" + $base_color}; +/* Very contrasty background for text views (@theme_text_color foreground) */ +@define-color text_view_bg #{"" + if($variant == 'light', $base_color, darken($base_color,6%))}; diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index b33455d539..15e2dd6e46 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -542,6 +542,10 @@ button { min-width: 24px; padding-left: 5px; padding-right: 5px; + + &.circular { + min-height: 24px; + } } &.text-button { |