Merge branch 'adwaita-more-border-spacing' into 'master'

Adwaita: Add border-spacing to some container widgets and style classes (properly)

See merge request GNOME/gtk!2479
This commit is contained in:
Matthias Clasen 2020-08-31 21:17:21 +00:00
commit 9377ce984d

View File

@ -1293,6 +1293,7 @@ combobox {
************/
%toolbar {
padding: 4px;
border-spacing: 4px;
background-color: $bg_color;
}
@ -1300,8 +1301,6 @@ combobox {
toolbar {
@extend %toolbar;
padding: 4px 3px 3px 4px;
// on OSD
.osd & { background-color: transparent; }
@ -1319,21 +1318,19 @@ toolbar {
}
// toolbar separators
&.horizontal separator { margin: 0 7px 1px 6px; }
&.vertical separator { margin: 6px 1px 7px 0; }
&.horizontal > separator { margin: 4px 0; }
&.vertical > separator { margin: 0 4px; }
}
//searchbar & location-bar
searchbar {
padding: 0px;
>revealer>box {
padding: 6px;
@extend %toolbar;
searchbar > revealer > box {
padding: 6px;
border-spacing: 6px;
@extend %toolbar;
@extend %darkbar;
@extend %darkbar;
border-width: 0 0 1px;
}
border-width: 0 0 1px;
}
%darkbar {
@ -1407,11 +1404,6 @@ headerbar {
transition: $backdrop_transition;
}
box.start,
box.end {
border-spacing: 6px;
}
.title {
padding-left: 12px;
padding-right: 12px;
@ -1487,7 +1479,13 @@ headerbar {
}
headerbar {
border-spacing: 6px;
> windowhandle > box {
&,
> box.start,
> box.end {
border-spacing: 6px;
}
}
// add vertical margins to common widget on the headerbar to avoid them spanning the whole height
entry,
@ -3014,8 +3012,9 @@ frame {
}
}
actionbar > revealer > box {
actionbar > revealer > box {
padding: 6px;
border-spacing: 6px;
border-top: 1px solid $borders_color;
}
@ -3171,11 +3170,11 @@ row {
/*********************
* App Notifications *
*********************/
.app-notification,
.app-notification.frame {
.app-notification {
@extend %osd;
padding: 10px;
border-spacing: 10px;
border-radius: 0 0 5px 5px;
background-color: $osd_bg_color;
background-image: linear-gradient(to bottom, transparentize(black, 0.8),