From db55a744ec25fe24bdac4a73ece37f52fb78168f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Mon, 28 Jun 2021 13:24:30 +0200 Subject: [PATCH] Include disabled state in base button mixin So all disabled buttons have the same styles. --- app/assets/stylesheets/admin/search.scss | 6 +----- app/assets/stylesheets/mixins/buttons.scss | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/admin/search.scss b/app/assets/stylesheets/admin/search.scss index 979dc63fd..82a27fca2 100644 --- a/app/assets/stylesheets/admin/search.scss +++ b/app/assets/stylesheets/admin/search.scss @@ -31,12 +31,8 @@ } [type="submit"] { - @include button($background: $link); + @include regular-button; border-radius: 0; font-size: 1rem; - - &[disabled] { - @include button-disabled; - } } } diff --git a/app/assets/stylesheets/mixins/buttons.scss b/app/assets/stylesheets/mixins/buttons.scss index 5ef6a960d..6738c7b55 100644 --- a/app/assets/stylesheets/mixins/buttons.scss +++ b/app/assets/stylesheets/mixins/buttons.scss @@ -5,6 +5,10 @@ &:hover { text-decoration: none !important; } + + &[disabled] { + @include button-disabled; + } } %button {