[gtk/gtk-3-24: 1/4] Adwaita: Replace all %linked radii with variables
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-3-24: 1/4] Adwaita: Replace all %linked radii with variables
- Date: Mon, 11 Mar 2019 11:00:17 +0000 (UTC)
commit 625a0e3d6cf2f89f35393784fa2a3ee97a86e091
Author: Alex Monday <monday15 gmx com>
Date: Mon Mar 4 21:26:49 2019 +0500
Adwaita: Replace all %linked radii with variables
Some of hardcoded border-radius values on linked elements were left
unchanged during Adwaita refresh.
gtk/theme/Adwaita/_common.scss | 12 ++++++------
gtk/theme/Adwaita/gtk-contained-dark.css | 8 ++++----
gtk/theme/Adwaita/gtk-contained.css | 8 ++++----
3 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 1cb2c7da66..5a47e28cbb 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1004,7 +1004,7 @@ toolbar.inline-toolbar toolbutton:backdrop {
}
&:only-child {
- border-radius: 3px;
+ border-radius: $button_radius;
border-style: solid;
}
}
@@ -1018,18 +1018,18 @@ toolbar.inline-toolbar toolbutton:backdrop {
@extend %linked_vertical_middle;
&:first-child {
- border-top-left-radius: 3px;
- border-top-right-radius: 3px;
+ border-top-left-radius: $button_radius;
+ border-top-right-radius: $button_radius;
}
&:last-child {
- border-bottom-left-radius: 3px;
- border-bottom-right-radius: 3px;
+ border-bottom-left-radius: $button_radius;
+ border-bottom-right-radius: $button_radius;
border-style: solid;
}
&:only-child {
- border-radius: 3px;
+ border-radius: $button_radius;
border-style: solid;
}
}
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index c2d39a52c9..cf6e68acfc 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -428,15 +428,15 @@ toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutt
.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child,
.inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child
button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) >
combobox:only-child > box > button.combo { border-radius: 5px; border-style: solid; }
-filechooser .path-bar.linked > button:only-child { border-radius: 3px; border-style: solid; }
+filechooser .path-bar.linked > button:only-child { border-radius: 5px; border-style: solid; }
.linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button,
.linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked,
.linked.vertical > button:backdrop, .linked.vertical > combobox > box > button.combo { border-style: solid
solid none solid; border-radius: 0; }
-.linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child,
.linked.vertical > button:first-child, .linked.vertical > combobox:first-child > box > button.combo {
border-top-left-radius: 3px; border-top-right-radius: 3px; }
+.linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child,
.linked.vertical > button:first-child, .linked.vertical > combobox:first-child > box > button.combo {
border-top-left-radius: 5px; border-top-right-radius: 5px; }
-.linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child,
.linked.vertical > button:last-child, .linked.vertical > combobox:last-child > box > button.combo {
border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; border-style: solid; }
+.linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child,
.linked.vertical > button:last-child, .linked.vertical > combobox:last-child > box > button.combo {
border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-style: solid; }
-.linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child,
.linked.vertical > button:only-child, .linked.vertical > combobox:only-child > box > button.combo {
border-radius: 3px; border-style: solid; }
+.linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child,
.linked.vertical > button:only-child, .linked.vertical > combobox:only-child > box > button.combo {
border-radius: 5px; border-style: solid; }
modelbutton.flat, .menuitem.button.flat, modelbutton.flat:backdrop, modelbutton.flat:backdrop:hover,
.menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, list row button, button:link,
button:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover,
button:visited:active, button:visited:checked, calendar.button, .scale-popup button:hover, .scale-popup
button:backdrop:hover, .scale-popup button:backdrop:disabled, .scale-popup button:backdrop {
background-color: transparent; background-image: none; border-color: transparent; box-shadow: inset 0 1px
rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 1b20d3812f..7af08af2e4 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -430,15 +430,15 @@ toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutt
.linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child,
.inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child
button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) >
combobox:only-child > box > button.combo { border-radius: 5px; border-style: solid; }
-filechooser .path-bar.linked > button:only-child { border-radius: 3px; border-style: solid; }
+filechooser .path-bar.linked > button:only-child { border-radius: 5px; border-style: solid; }
.linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button,
.linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked,
.linked.vertical > button:backdrop, .linked.vertical > combobox > box > button.combo { border-style: solid
solid none solid; border-radius: 0; }
-.linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child,
.linked.vertical > button:first-child, .linked.vertical > combobox:first-child > box > button.combo {
border-top-left-radius: 3px; border-top-right-radius: 3px; }
+.linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child,
.linked.vertical > button:first-child, .linked.vertical > combobox:first-child > box > button.combo {
border-top-left-radius: 5px; border-top-right-radius: 5px; }
-.linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child,
.linked.vertical > button:last-child, .linked.vertical > combobox:last-child > box > button.combo {
border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; border-style: solid; }
+.linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child,
.linked.vertical > button:last-child, .linked.vertical > combobox:last-child > box > button.combo {
border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-style: solid; }
-.linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child,
.linked.vertical > button:only-child, .linked.vertical > combobox:only-child > box > button.combo {
border-radius: 3px; border-style: solid; }
+.linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child,
.linked.vertical > button:only-child, .linked.vertical > combobox:only-child > box > button.combo {
border-radius: 5px; border-style: solid; }
modelbutton.flat, .menuitem.button.flat, modelbutton.flat:backdrop, modelbutton.flat:backdrop:hover,
.menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, list row button, button:link,
button:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover,
button:visited:active, button:visited:checked, calendar.button, .scale-popup button:hover, .scale-popup
button:backdrop:hover, .scale-popup button:backdrop:disabled, .scale-popup button:backdrop {
background-color: transparent; background-image: none; border-color: transparent; box-shadow: inset 0 1px
rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]