AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-16 15:14:17 +00:00
Code Issues Projects Releases Wiki Activity

Adwaita: Add linked styling for particular button widgets

Browse Source 
Those button widgets need some special linked styling like what
combobox has.

Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/1903
Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/2939
This commit is contained in:
nana-4 2020-08-02 18:48:54 +09:00
parent 5f00675de4
commit 891027f0c3
1 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gtk/theme/Adwaita/_common.scss
View File

@ -387,6 +387,13 @@ entry {
.linked:not(.vertical) > &:drop(active) + &,
.linked:not(.vertical) > &:drop(active) + button,
.linked:not(.vertical) > &:drop(active) + menubutton > button,
.linked:not(.vertical) > &:drop(active) + dropdown > button,
.linked:not(.vertical) > &:drop(active) + colorbutton > button,
.linked:not(.vertical) > &:drop(active) + fontbutton > button,
.linked:not(.vertical) > &:drop(active) + filechooserbutton > button,
.linked:not(.vertical) > &:drop(active) + filechooserbutton > combobox > box > button.combo,
.linked:not(.vertical) > &:drop(active) + appchooserbutton > combobox > box > button.combo,
.linked:not(.vertical) > &:drop(active) + combobox > box > button.combo { border-left-color: $drop_target_color; }
// Vertically linked entries
@ -411,6 +418,13 @@ entry {
+ %entry,
+ entry,
+ button,
+ menubutton > button,
+ dropdown > button,
+ colorbutton > button,
+ fontbutton > button,
+ filechooserbutton > button,
+ filechooserbutton > combobox > box > button.combo,
+ appchooserbutton > combobox > box > button.combo,
+ combobox > box > button.combo { border-top-color: $drop_target_color; }
}
}
@ -826,6 +840,31 @@ button {
-gtk-icon-shadow: none;
}
.linked:not(.vertical) > menubutton,
.linked:not(.vertical) > dropdown,
.linked:not(.vertical) > colorbutton,
.linked:not(.vertical) > fontbutton,
.linked:not(.vertical) > filechooserbutton {
&:dir(ltr) {
&:not(:first-child) > button { @extend %linked_not_left; }
&:not(:last-child) > button { @extend %linked_not_right; }
}
&:dir(rtl) {
&:not(:first-child) > button { @extend %linked_not_right; }
&:not(:last-child) > button { @extend %linked_not_left; }
}
}
.linked.vertical > menubutton,
.linked.vertical > dropdown,
.linked.vertical > colorbutton,
.linked.vertical > fontbutton,
.linked.vertical > filechooserbutton {
&:not(:first-child) > button { @extend %linked_not_top; }
&:not(:last-child) > button { @extend %linked_not_bottom; }
}
/* menu buttons */
modelbutton.flat {
min-height: 26px;
@ -1214,6 +1253,8 @@ combobox {
// work, special case needed. See
// https://bugzilla.gnome.org/show_bug.cgi?id=733979
.linked:not(.vertical) > filechooserbutton > combobox,
.linked:not(.vertical) > appchooserbutton > combobox,
.linked:not(.vertical) > combobox {
&:dir(ltr) {
&:not(:first-child) > box > button.combo { @extend %linked_not_left; }
@ -1226,6 +1267,8 @@ combobox {
}
}
.linked.vertical > filechooserbutton > combobox,
.linked.vertical > appchooserbutton > combobox,
.linked.vertical > combobox {
&:not(:first-child) > box > button.combo { @extend %linked_not_top; }
&:not(:last-child) > box > button.combo { @extend %linked_not_bottom; }