From b28dd0617f2ff158dd803c5b6861c3420960d1e6 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 9 Nov 2022 14:09:17 +0000 Subject: [PATCH] Bug 32148: Buttons must inherit Bootstrap size classes This patch removes global font and padding settings which were overriding the Bootstrap classes we use to change the size of Bootstrap buttons. The font and padding settings are moved to the CSS which covers button which are not styled as Bootstrap buttons. To test, apply the patch and view pages where buttons are styled with different Bootstrap size classes: - Circulation -> Check out: - The "Check out" button, the "Show checkouts" button, Renew buttons in the footer. - Patrons -> Patron details -> Edit buttons in each section. - Patrons home -> Buttons in sidebar filter - Catalog -> Bibliographic details -> Item details --- koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss | 4 ---- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss index 4b8b773976..d5924acd0b 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss @@ -13,11 +13,9 @@ $nav-menu-bullet: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/s border-radius: 4px; cursor: pointer; display: inline-block; - font-size: inherit; font-weight: normal; line-height: 1.42857143; margin-bottom: 0; - padding: .5em 1em; text-align: center; touch-action: manipulation; user-select: none; @@ -44,11 +42,9 @@ $nav-menu-bullet: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/s border-radius: 4px; cursor: pointer; display: inline-block; - font-size: inherit; font-weight: normal; line-height: 1.42857143; margin-bottom: 0; - padding: .5em 1em; text-align: center; touch-action: manipulation; user-select: none; diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index f41f3d729b..f0b7640073 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -570,11 +570,13 @@ textarea { input { &[type="submit"] { @include primary-button; + padding: .5em 1em; } &[type="reset"], &[type="button"] { @include default-button; + padding: .5em 1em; &:disabled { @include disabled-button; @@ -590,6 +592,7 @@ input { &.submit { @include primary-button; + padding: .5em 1em; &:disabled { @include disabled-button; -- 2.30.2