From f32ba048c7500b88ac5dced42d10e3d7ed5bfa06 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Wed, 14 Sep 2022 14:38:41 +0200 Subject: [PATCH] Bug 30952: Fix style of some buttons Signed-off-by: Martin Renvoize Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi --- .../intranet-tmpl/prog/css/src/_mixins.scss | 1 - .../prog/css/src/staff-global.scss | 15 -------- .../prog/en/modules/catalogue/advsearch.tt | 36 +++++++++---------- .../prog/en/modules/cataloguing/addbiblio.tt | 10 +++--- .../prog/en/modules/members/memberentrygen.tt | 8 ++--- 5 files changed, 26 insertions(+), 44 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss index 85514396b6..d17055405b 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss @@ -29,7 +29,6 @@ $nav-menu-bullet: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/s @mixin disabled-button { background: #EEE none; border: 1px solid #C0C0C0; - color: #999; } @mixin card { 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 93cf6ff9e0..70a0dd657d 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -41,21 +41,6 @@ a { padding: 2px 4px; } - &.btn { - &.btn-link { - &:link, - &:visited { - color: $green-text-color; - } - - &:hover { - text-decoration: underline; - font-weight: bold; - } - } - - } - &.edit-patronimage { color: #333; background-color: #e6e6e6; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt index 9ed3f069cd..1b2272943b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt @@ -59,25 +59,23 @@
-
-
- -
-
- [% IF ( expanded_options ) %] - Fewer options -
- [% ELSE %] - More options -
- [% END %] - - - +
+ +
+
+ [% IF ( expanded_options ) %] + Fewer options +
+ [% ELSE %] + More options + + [% END %] + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index 10ec159911..ddab6672b1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -877,12 +877,12 @@ function PopupMARCFieldDoc(field) { [% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %] [% IF (circborrowernumber) %][%# fast cataloging must lead to items %] - + [% ELSE %]
- - +