From 44fcc0435cc4742183827894832a079ba4278049 Mon Sep 17 00:00:00 2001 From: Alex Monday Date: Mon, 4 Mar 2019 21:51:48 +0500 Subject: Adwaita: Replace spinbutton border-radii with variables Replace hardcoded border-radius values with $button_radius variable on spinbuttons. --- gtk/theme/Adwaita/_common.scss | 12 ++++++------ gtk/theme/Adwaita/gtk-contained-dark.css | 12 ++++++------ gtk/theme/Adwaita/gtk-contained.css | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 5a47e28cbb..32392b93e1 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1237,9 +1237,9 @@ spinbutton { &:dir(rtl) { border-style: none solid none none; } } - &:dir(ltr):last-child { border-radius: 0 3px 3px 0; } + &:dir(ltr):last-child { border-radius: 0 $button_radius $button_radius 0; } - &:dir(rtl):first-child { border-radius: 3px 0 0 3px; } + &:dir(rtl):first-child { border-radius: $button_radius 0 0 $button_radius; } } } @@ -1289,9 +1289,9 @@ spinbutton { box-shadow: none; } - &:dir(ltr):last-child { border-radius: 0 3px 3px 0; } + &:dir(ltr):last-child { border-radius: 0 $button_radius $button_radius 0; } - &:dir(rtl):first-child { border-radius: 3px 0 0 3px; } + &:dir(rtl):first-child { border-radius: $button_radius 0 0 $button_radius; } } } @@ -1330,12 +1330,12 @@ spinbutton { } %top_button { - border-radius: 3px 3px 0 0; + border-radius: $button_radius $button_radius 0 0; border-style: solid solid none solid; } %bottom_button { - border-radius: 0 0 3px 3px; + border-radius: 0 0 $button_radius $button_radius; border-style: none solid solid solid; } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index cf6e68acfc..4fb11b3fbc 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -511,9 +511,9 @@ spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(91, 91, 91, 0.3 spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; } -spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 3px 3px 0; } +spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 5px 5px 0; } -spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 3px 0 0 3px; } +spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 5px 0 0 5px; } .osd spinbutton:not(.vertical) button { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #eeeeec; border-style: none none none solid; border-color: rgba(0, 0, 0, 0.4); border-radius: 0; box-shadow: none; -gtk-icon-shadow: 0 1px black; } @@ -525,9 +525,9 @@ spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 3px 0 0 3 .osd spinbutton:not(.vertical) button:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #89888b; border-color: rgba(0, 0, 0, 0.5); -gtk-icon-shadow: none; box-shadow: none; } -.osd spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 3px 3px 0; } +.osd spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 5px 5px 0; } -.osd spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 3px 0 0 3px; } +.osd spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 5px 0 0 5px; } spinbutton.vertical:disabled { color: #919190; } @@ -539,9 +539,9 @@ spinbutton.vertical entry { min-height: 32px; min-width: 32px; padding: 0; borde spinbutton.vertical button { min-height: 32px; min-width: 32px; padding: 0; } -spinbutton.vertical button.up { border-radius: 3px 3px 0 0; border-style: solid solid none solid; } +spinbutton.vertical button.up { border-radius: 5px 5px 0 0; border-style: solid solid none solid; } -spinbutton.vertical button.down { border-radius: 0 0 3px 3px; border-style: none solid solid solid; } +spinbutton.vertical button.down { border-radius: 0 0 5px 5px; border-style: none solid solid solid; } .osd spinbutton.vertical button:first-child { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(36, 33, 42, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 7af08af2e4..88c37f3137 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -519,9 +519,9 @@ spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(212, 207, 202, spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; } -spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 3px 3px 0; } +spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 5px 5px 0; } -spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 3px 0 0 3px; } +spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 5px 0 0 5px; } .osd spinbutton:not(.vertical) button { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #eeeeec; border-style: none none none solid; border-color: rgba(0, 0, 0, 0.4); border-radius: 0; box-shadow: none; -gtk-icon-shadow: 0 1px black; } @@ -533,9 +533,9 @@ spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 3px 0 0 3 .osd spinbutton:not(.vertical) button:disabled { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #89888b; border-color: rgba(0, 0, 0, 0.5); -gtk-icon-shadow: none; box-shadow: none; } -.osd spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 3px 3px 0; } +.osd spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 5px 5px 0; } -.osd spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 3px 0 0 3px; } +.osd spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 5px 0 0 5px; } spinbutton.vertical:disabled { color: #929595; } @@ -547,9 +547,9 @@ spinbutton.vertical entry { min-height: 32px; min-width: 32px; padding: 0; borde spinbutton.vertical button { min-height: 32px; min-width: 32px; padding: 0; } -spinbutton.vertical button.up { border-radius: 3px 3px 0 0; border-style: solid solid none solid; } +spinbutton.vertical button.up { border-radius: 5px 5px 0 0; border-style: solid solid none solid; } -spinbutton.vertical button.down { border-radius: 0 0 3px 3px; border-style: none solid solid solid; } +spinbutton.vertical button.down { border-radius: 0 0 5px 5px; border-style: none solid solid solid; } .osd spinbutton.vertical button:first-child { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(36, 33, 42, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } -- cgit v1.2.1