From eedc8274da571145f41a7a7041b85b602954e021 Mon Sep 17 00:00:00 2001 From: Matthias M <62722460+kleinerpirat@users.noreply.github.com> Date: Mon, 24 May 2021 11:21:42 +0200 Subject: [PATCH] Use !important instead of :not() selector !important cannot be used with the radius mixin, so I had to state them explicitly. --- ts/editor/legacy.scss | 10 ++++++++-- ts/sass/buttons.scss | 10 +++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ts/editor/legacy.scss b/ts/editor/legacy.scss index bb2ca9b98..45da78103 100644 --- a/ts/editor/legacy.scss +++ b/ts/editor/legacy.scss @@ -4,10 +4,16 @@ display: inline-block; background-color: white; border: 1px solid var(--medium-border); - @include button.btn-border-radius; + + /* !important cannot be used with @include */ + border-top-left-radius: var(--border-left-radius) !important; + border-bottom-left-radius: var(--border-left-radius) !important; + border-top-right-radius: var(--border-right-radius) !important; + border-bottom-right-radius: var(--border-right-radius) !important; + min-width: 28px; margin-left: -1px; - padding: 3.5px; + padding: 3.5px !important; } .linkb:hover { diff --git a/ts/sass/buttons.scss b/ts/sass/buttons.scss index 31d3b062d..bddc3baff 100644 --- a/ts/sass/buttons.scss +++ b/ts/sass/buttons.scss @@ -15,10 +15,8 @@ .isLin { button { font-size: 14px; + -webkit-appearance: none; - } - - button:not(.btn-group button) { border-radius: 3px; padding: 5px; border: 1px solid var(--border); @@ -38,15 +36,13 @@ ); box-shadow: 0 0 3px fusion_vars.$button-outline; border: 1px solid fusion_vars.$button-border; - } - - button:not(.btn-group button) { + border-radius: 2px; padding: 10px; padding-top: 3px; padding-bottom: 3px; } - + button:hover { background: fusion_vars.$button-hover-bg; }