diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-12-17 00:35:18 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-12-17 00:35:18 +0000 |
commit | a4760bcff7e8c2c258ed6b397b2ef1dfeb0df0f0 (patch) | |
tree | 5202a5e4385a9c2e63823dd02cccfe4a37f931c4 /gtk/theme | |
parent | 72e571a3de60fc824a11f165d638117930b825fa (diff) | |
parent | 031c37c7b0b8d2cdcd0e94b7ffa4c849ee11dd85 (diff) | |
download | gtk+-a4760bcff7e8c2c258ed6b397b2ef1dfeb0df0f0.tar.gz |
Merge branch 'toolbar-combobox' into 'main'
Don't make all buttons in toolbars flat
Closes #4384
See merge request GNOME/gtk!4103
Diffstat (limited to 'gtk/theme')
-rw-r--r-- | gtk/theme/Default/_common.scss | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/gtk/theme/Default/_common.scss b/gtk/theme/Default/_common.scss index 12584b3298..ab04b3cc83 100644 --- a/gtk/theme/Default/_common.scss +++ b/gtk/theme/Default/_common.scss @@ -622,7 +622,7 @@ button { min-width: 26px; min-height: 32px; - &.image-button { + &.image-button { min-width: 30px; &:only-child { margin: 4px; @@ -911,7 +911,15 @@ modelbutton.flat arrow { /* oldstyle toolbar buttons */ -.toolbar button { +.toolbar > button, +.toolbar > :not(.linked) > button, +.toolbar :not(.linked) > menubutton > button, +.toolbar :not(.linked) > scalebutton > button, +.toolbar :not(.linked) > dropdown > button, +.toolbar :not(.linked) > colorbutton > button, +.toolbar :not(.linked) > fontbutton > button, +.toolbar :not(.linked) > appchooserbutton > button, +.toolbar :not(.linked) > combobox > box > button { margin: 1px; @extend %button_basic_flat; @@ -1319,8 +1327,7 @@ combobox { background-color: $bg_color; } -.toolbar, -toolbar { +.toolbar { @extend %toolbar; // on OSD @@ -1869,7 +1876,7 @@ popover.background { > list, > .view, - > toolbar { + > .toolbar { border-style: none; background-color: transparent; } @@ -2424,7 +2431,7 @@ switch { border-radius: 50%; transition: $button_transition; } - + > image { color: transparent; } /* only show i / o for the accessible theme */ &:hover > slider { @@ -2533,7 +2540,7 @@ radio { } } } - + @if $variant == 'light' { // the borders of the light variant versions of checks and radios are too similar in luminosity to the selected background // color, hence we need special casing. |