GTK: Upload for gtk 3.24.21

This commit is contained in:
Daniel Ruiz de Alegría
2020-07-08 16:45:23 +02:00
parent af27429cc2
commit 71d7ce57c6
6 changed files with 189 additions and 308 deletions
@@ -356,10 +356,6 @@ decoration {
border-width: 0;
box-shadow: 0 1px 4px transparentize(black, 0.8);
}
window.csd & {
background: if($variant=='light', white, black);
}
}
// Window Close button
@@ -886,25 +886,13 @@ button {
&.font { > box > box > label { font-weight: bold; }}
// inline-toolbar buttons
.inline-toolbar &, .inline-toolbar &:backdrop {
border-radius: 2px;
border-width: 1px;
@extend %linked;
}
.inline-toolbar & { @extend %linked; }
.primary-toolbar & { -gtk-icon-shadow: none; } // tango icons don't need shadows
.linked > &,
.linked > &:hover,
.linked > &:active,
.linked > &:checked,
.linked > &:backdrop { @extend %linked; }
.linked > & { @extend %linked; }
.linked.vertical > &,
.linked.vertical > &:hover,
.linked.vertical > &:active,
.linked.vertical > &:checked,
.linked.vertical > &:backdrop { @extend %linked_vertical; }
.linked.vertical > & { @extend %linked_vertical; }
&.circular { // The Bloody Circul Button
border-radius: 9999px;
@@ -1004,8 +992,7 @@ button {
}
// More inline toolbar buttons
toolbar.inline-toolbar toolbutton,
toolbar.inline-toolbar toolbutton:backdrop {
toolbar.inline-toolbar toolbutton {
> button.flat { @extend %linked_middle; }
&:first-child > button.flat { @extend %linked_left; }
@@ -1016,38 +1003,29 @@ toolbar.inline-toolbar toolbutton:backdrop {
}
%linked_middle {
border-radius: 0;
border-right-style: none;
border-radius: 0;
-gtk-outline-radius: 0;
}
%linked_left {
border-top-left-radius: $button_radius;
border-bottom-left-radius: $button_radius;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-right-style: none;
-gtk-outline-bottom-left-radius: $button_radius;
-gtk-outline-top-left-radius: $button_radius;
-gtk-outline-top-right-radius: 0;
-gtk-outline-bottom-right-radius: 0;
-gtk-outline-bottom-left-radius: $button_radius;
}
%linked_right {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-right-style: solid;
border-top-right-radius: $button_radius;
border-bottom-right-radius: $button_radius;
border-right-style: solid;
-gtk-outline-bottom-right-radius: $button_radius;
-gtk-outline-top-right-radius: $button_radius;
-gtk-outline-bottom-left-radius: 0;
-gtk-outline-top-left-radius: 0;
-gtk-outline-bottom-right-radius: $button_radius;
}
%linked_only_child {
border-radius: $button_radius;
border-style: solid;
border-radius: $button_radius;
-gtk-outline-radius: $button_radius;
}
@@ -1081,25 +1059,31 @@ toolbar.inline-toolbar toolbutton:backdrop {
%linked_vertical_middle {
border-style: solid solid none solid;
border-radius: 0;
-gtk-outline-radius: 0;
}
%linked_vertical_top {
border-top-left-radius: $button_radius;
border-top-right-radius: $button_radius;
-gtk-outline-top-left-radius: $button_radius;
-gtk-outline-top-right-radius: $button_radius;
}
%linked_vertical_bottom {
border-bottom-style: solid;
border-bottom-left-radius: $button_radius;
border-bottom-right-radius: $button_radius;
border-style: solid;
-gtk-outline-bottom-left-radius: $button_radius;
-gtk-outline-bottom-right-radius: $button_radius;
}
%linked_vertical_only_child {
border-radius: $button_radius;
border-style: solid;
border-radius: $button_radius;
-gtk-outline-radius: $button_radius;
}
%linked_vertical{
%linked_vertical {
@extend %linked_vertical_middle;
&:first-child { @extend %linked_vertical_top; }
@@ -1471,21 +1455,17 @@ combobox {
}
}
.linked > combobox > box > button.combo {
// the combo is a composite widget so the way we do button linking doesn't
// work, special case needed. See
// https://bugzilla.gnome.org/show_bug.cgi?id=733979
&:dir(ltr),
&:dir(rtl) { @extend %linked_middle; } // specificity bump
}
// the combo is a composite widget so the way we do button linking doesn't
// work, special case needed. See
// https://bugzilla.gnome.org/show_bug.cgi?id=733979
.linked:not(.vertical) > combobox > box > button.combo { @extend %linked_middle; }
.linked:not(.vertical) > combobox:first-child > box > button.combo { @extend %linked_left; }
.linked:not(.vertical) > combobox:last-child > box > button.combo { @extend %linked_right; }
.linked:not(.vertical) > combobox:only-child > box > button.combo { @extend %linked_only_child; }
.linked.vertical > combobox > box > button.combo { @extend %linked_vertical_middle; }
.linked.vertical > combobox:first-child > box > button.combo { @extend %linked_vertical_top;}
.linked.vertical > combobox:first-child > box > button.combo { @extend %linked_vertical_top; }
.linked.vertical > combobox:last-child > box > button.combo { @extend %linked_vertical_bottom; }
.linked.vertical > combobox:only-child > box > button.combo { @extend %linked_vertical_only_child; }
@@ -2396,11 +2376,11 @@ notebook {
> tabs {
margin-bottom: -2px;
> tab {
&:hover { box-shadow: inset 0 -3px $borders_color; }
&:hover { box-shadow: inset 0 -4px $borders_color; }
&:backdrop { box-shadow: none; }
&:checked { box-shadow: inset 0 -3px $selected_bg_color; }
&:checked { box-shadow: inset 0 -4px $selected_bg_color; }
}
}
}
@@ -2410,11 +2390,11 @@ notebook {
> tabs {
margin-top: -2px;
> tab {
&:hover { box-shadow: inset 0 3px $borders_color; }
&:hover { box-shadow: inset 0 4px $borders_color; }
&:backdrop { box-shadow: none; }
&:checked { box-shadow: inset 0 3px $selected_bg_color; }
&:checked { box-shadow: inset 0 4px $selected_bg_color; }
}
}
}
@@ -2424,11 +2404,11 @@ notebook {
> tabs {
margin-right: -2px;
> tab {
&:hover { box-shadow: inset -3px 0 $borders_color; }
&:hover { box-shadow: inset -4px 0 $borders_color; }
&:backdrop { box-shadow: none; }
&:checked { box-shadow: inset -3px 0 $selected_bg_color; }
&:checked { box-shadow: inset -4px 0 $selected_bg_color; }
}
}
}
@@ -2438,11 +2418,11 @@ notebook {
> tabs {
margin-left: -2px;
> tab {
&:hover { box-shadow: inset 3px 0 $borders_color; }
&:hover { box-shadow: inset 4px 0 $borders_color; }
&:backdrop { box-shadow: none; }
&:checked { box-shadow: inset 3px 0 $selected_bg_color; }
&:checked { box-shadow: inset 4px 0 $selected_bg_color; }
}
}
}
@@ -2520,14 +2500,15 @@ notebook {
outline-offset: -5px;
color: $insensitive_fg_color;
font-weight: bold;
color: $fg_color;
font-weight: normal;
border-width: 1px; // for reorderable tabs
border-color: transparent; //
&:hover {
color: mix($insensitive_fg_color, $fg_color, 50%);
color: $fg_color;
background-color: darken($bg_color,4%);
&.reorderable-page {
border-color: transparentize($borders_color, 0.7);
@@ -2949,7 +2930,7 @@ switch {
(':backdrop:checked', '-gtk-icontheme(\'object-select-symbolic\')', '#{transparentize($osd_fg_color, 0.2)}', '#{desaturate($checkradio_bg_color, 100%)}'), {
.view.content-view.check#{$check_state}:not(list),
.content-view .tile check#{$check_state}:not(list) {
.content-view:not(list) check#{$check_state} {
margin: 4px;
min-width: 32px;
min-height: 32px;
@@ -3993,36 +3974,20 @@ messagedialog { // Message Dialog styling
.dialog-action-area button {
padding: 10px 14px; // labels are not vertically centered on message dialog, this is a workaround
border-radius: 0;
border-left-style: solid;
border-right-style: none;
border-bottom-style: none;
border-radius: 0;
-gtk-outline-radius: 0;
&:first-child:not(:only-child) {
&:first-child {
border-left-style: none;
border-bottom-left-radius: $button_radius + 2;
-gtk-outline-bottom-left-radius: $button_radius + 2;
-gtk-outline-top-left-radius: 0px;
-gtk-outline-top-right-radius: 0px;
-gtk-outline-bottom-right-radius: 0px;
}
&:last-child:not(:only-child) {
&:last-child {
border-bottom-right-radius: $button_radius + 2;
-gtk-outline-bottom-right-radius: $button_radius + 2;
-gtk-outline-top-right-radius: 0px;
-gtk-outline-bottom-left-radius: 0px;
-gtk-outline-top-left-radius: 0px;
}
&:only-child {
border-top-right-radius: 0;
border-top-left-radius: 0;
border-bottom-left-radius: $button_radius + 2;
border-bottom-right-radius: $button_radius + 2;
-gtk-outline-top-right-radius: 0px;
-gtk-outline-top-left-radius: 0px;
-gtk-outline-bottom-left-radius: $button_radius + 2;
-gtk-outline-bottom-right-radius: $button_radius + 2;
}
}
}
@@ -4610,8 +4575,6 @@ decoration {
.popup & { box-shadow: none; }
.csd & { background-color: black; } // transparent makes gtk3 leak light on the corners #2537
// server-side decorations as used by mutter
.ssd & { box-shadow: 0 0 0 1px $_wm_border; } //just doing borders, wm draws actual shadows
@@ -4,7 +4,7 @@ GREEN='\033[0;32m'
YELLOW='\033[0;33m'
RESET='\033[0m'
VERSION=3.24.20
VERSION=3.24.21
echo
echo -e " $YELLOW[ i ]$RESET Upstream version $VERSION"