From 1cf4888e3f5ccb68e006372e72b23b58cedf56c7 Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Wed, 22 Sep 2021 11:46:00 +0200 Subject: [PATCH] UI, radius --- zero.Web.UI/App/components/tree/tree-item.vue | 1 - zero.Web.UI/Sass/Core/_forms.scss | 4 ++-- zero.Web.UI/Sass/Modules/_button.scss | 8 ++++---- zero.Web.UI/Sass/Settings/_dimensions.scss | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/zero.Web.UI/App/components/tree/tree-item.vue b/zero.Web.UI/App/components/tree/tree-item.vue index 26bfc746..e7a9faf2 100644 --- a/zero.Web.UI/App/components/tree/tree-item.vue +++ b/zero.Web.UI/App/components/tree/tree-item.vue @@ -188,7 +188,6 @@ left: 0; right: 0; background: var(--color-tree-selected); - border-radius: var(--radius); } &.is-selected:after diff --git a/zero.Web.UI/Sass/Core/_forms.scss b/zero.Web.UI/Sass/Core/_forms.scss index eef7daac..6a951f76 100644 --- a/zero.Web.UI/Sass/Core/_forms.scss +++ b/zero.Web.UI/Sass/Core/_forms.scss @@ -25,7 +25,7 @@ textarea, .ui-native-select, .ui-rte-input, .flatpickr-current-month padding: 6px 16px; line-height: 1.5; color: var(--color-text); - border-radius: var(--radius); + border-radius: var(--radius-inner); vertical-align: middle; box-sizing: border-box; width: 100%; @@ -82,7 +82,7 @@ textarea background: none; border: 1px solid transparent; color: var(--color-text); - border-radius: var(--radius); + border-radius: var(--radius-inner); } select:focus diff --git a/zero.Web.UI/Sass/Modules/_button.scss b/zero.Web.UI/Sass/Modules/_button.scss index 968ad096..b291670f 100644 --- a/zero.Web.UI/Sass/Modules/_button.scss +++ b/zero.Web.UI/Sass/Modules/_button.scss @@ -36,7 +36,7 @@ button::-moz-focus-inner color: var(--color-button-text); padding: 0 21px; height: 48px; - border-radius: var(--radius-button); + border-radius: var(--radius-inner); font-size: var(--font-size); font-weight: 700; margin: 0; @@ -348,7 +348,7 @@ button::-moz-focus-inner display: inline-flex; justify-content: center; align-items: center; - border-radius: var(--radius); + border-radius: var(--radius-inner); background: var(--color-button-light); border: 1px solid transparent; color: var(--color-text); @@ -363,7 +363,7 @@ button::-moz-focus-inner font-size: 0; color: transparent; background: var(--color-image-bg); - border-radius: var(--radius); + border-radius: var(--radius-inner); border: 1px solid var(--color-line-onbg); img @@ -371,7 +371,7 @@ button::-moz-focus-inner object-fit: contain; width: 100%; height: 100%; - border-radius: var(--radius); + border-radius: var(--radius-inner); } } } diff --git a/zero.Web.UI/Sass/Settings/_dimensions.scss b/zero.Web.UI/Sass/Settings/_dimensions.scss index 84b78199..169c2b72 100644 --- a/zero.Web.UI/Sass/Settings/_dimensions.scss +++ b/zero.Web.UI/Sass/Settings/_dimensions.scss @@ -10,5 +10,5 @@ --height-top: 74px; --radius: 9px; - --radius-button: 6px; + --radius-inner: 6px; } \ No newline at end of file