From 3858720f4b49d380e4240b1e94f385d4e316be87 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Wed, 2 Apr 2025 12:59:12 +0000 Subject: [PATCH] Bug 37054: Convert primary green color variables from SCSS tp CSS --- .../intranet-tmpl/prog/css/src/_header.scss | 30 ++++++++++--------- .../intranet-tmpl/prog/css/src/_tables.scss | 6 ++-- .../intranet-tmpl/prog/css/src/mainpage.scss | 2 +- .../prog/css/src/staff-global.scss | 24 +++++++-------- .../opac-tmpl/bootstrap/css/src/_common.scss | 2 +- 5 files changed, 33 insertions(+), 31 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss index d20a76d12da..26e70c535e5 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss @@ -8,9 +8,9 @@ } #header_search { - background-color: $background-color-primary; + background-color: var(--library-color); border-radius: 0; - border: 1px solid $background-color-primary; + border: 1px solid var(--library-color); display: flex; flex-direction: column; padding: 0; @@ -22,7 +22,7 @@ display: flex; align-items: center; color: white; - background-color: $background-color-primary; + background-color: var(--library-color); z-index: 2; flex-grow: 1; @@ -55,7 +55,7 @@ .form-title { padding: 0 16px 0 .5rem; - background-color: $background-color-primary; + background-color: var(--library-color); border-radius: 0 16px 16px 0; display: flex; align-items: center; @@ -120,7 +120,7 @@ background-color: white; padding: 1em; border-radius: 0 0 8px 8px; - border: 1px solid $background-color-primary; + border: 1px solid var(--library-color); border-top: 0 none; box-shadow: 0 2px 2px 1px #00000030; z-index: 1000; @@ -167,7 +167,7 @@ input[type="submit"], button[type="submit"] { height: 31px; - background-color: $background-color-secondary; + background-color: var(--library-color); color: white; border: 0; text-shadow: unset; @@ -178,7 +178,8 @@ padding-right: .9em; &:hover { - background-color: lighten( $background-color-secondary, 5 ); + background-color: var(--library-color); + filter: brightness(85%); } } @@ -220,8 +221,8 @@ > li { > a { - background-color: $background-color-primary; - border: 2px solid $background-color-primary; + background-color: var(--library-color); + border: 2px solid var(--library-color); border-radius: 0; color: #FFF; font-weight: normal; @@ -241,9 +242,9 @@ } &:hover, &:focus, &:active { - background-color: $background-color-primary; - border: 2px solid $background-color-primary; - border-bottom-color: $background-color-secondary; + background-color: var(--library-color); + border: 2px solid var(--library-color); + border-bottom-color: var(--library-color); padding: 0 .25em; text-decoration: none; } @@ -345,7 +346,8 @@ &:hover, &.catalog-search-dropdown-hover { - background-color: darken( $background-color-primary, 5% ); + background-color: var(--library-color); + filter: brightness(115%); border-left: 1px solid lighten( $green-text-color, 15% ); } } @@ -401,7 +403,7 @@ } #catalog-search-link { - border-right: 1px solid $background-color-primary; + border-right: 1px solid var(--library-color); } } diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss index 7927c8841da..ccd4729a989 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss @@ -434,7 +434,7 @@ div { &.dt-container { .dt-processing { background-color: #F4F8F9; - border: 2px solid $background-color-primary; + border: 2px solid var(--library-color); border-radius: 3px; box-shadow: 2px 2px 3px 1px rgba( 0, 0, 0, .2 ); color: #333; @@ -637,7 +637,7 @@ div { } &.buttons-html5:not( .disabled )::before { - color: $background-color-primary; + color: var(--library-color); display: inline-block; font-family: "Font Awesome 6 Free"; margin-right: .5em; @@ -657,7 +657,7 @@ div { } &.buttons-print:not( .disabled )::before { - color: $background-color-primary; + color: var(--library-color); content: "\f02f"; display: inline-block; font-family: "Font Awesome 6 Free"; diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/mainpage.scss b/koha-tmpl/intranet-tmpl/prog/css/src/mainpage.scss index f8c1f54dabb..dff59750b94 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/mainpage.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/mainpage.scss @@ -44,7 +44,7 @@ ul { text-decoration: none; &:hover { - background-color: $background-color-primary; + background-color: var(--library-color); color: #FFF; img { 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 d8a1d8aca37..f0284b4d671 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -109,7 +109,7 @@ $enable-dark-mode: false; } ::selection { - background: $background-color-primary; + background: var(--library-color); color: #FFFFFF; } @@ -229,7 +229,7 @@ a { i, img { background-color: transparent; - border-color: $background-color-primary; + border-color: var(--library-color); color: $green-text-color; } } @@ -503,19 +503,19 @@ aside { a:hover, a.current { background-color: #F3F4F4; - border-left: solid 5px $background-color-primary; + border-left: solid 5px var(--library-color); color: $green-text-color; font-weight: bold; text-decoration: none; } a:hover:not( .current ) { - border-left: solid 5px $background-color-secondary; + border-left: solid 5px var(--library-color); font-weight: normal; } &.active > a:hover { - border-left: solid 5px $background-color-primary; + border-left: solid 5px var(--library-color); font-weight: bold; } } @@ -851,7 +851,7 @@ cite { input, textarea { &:focus { - border-color: $background-color-primary; + border-color: var(--library-color); border-radius: 4px; } } @@ -2121,8 +2121,8 @@ li { } #table_search_selections { - background-color: lighten( $background-color-primary, 60 ); - border: 1px solid $background-color-primary; + background-color: var(--library-color); + border: 1px solid var(--library-color); border-color: lighten( $background-color-primary, 30 ) lighten( $background-color-primary, 50 ) lighten( $background-color-primary, 50 ) lighten( $background-color-primary, 30 ); border-radius: 4px; color: #333; @@ -2150,7 +2150,7 @@ li { background-color: #E6E6E6; h4 { - background-color: $background-color-primary; + background-color: var(--library-color); border-radius: 0 4px 0 0; color: #FFFFFF; font-size: 100%; @@ -3348,7 +3348,7 @@ code { padding: .2em 1.4em 0 0; .nav-link { - background-color: $background-color-primary; + background-color: var(--library-color); border-radius: 5px; color: #FFF; font-weight: bold; @@ -4158,7 +4158,7 @@ input.renew { padding: 10px; &:hover { - background-color: $background-color-primary; + background-color: var(--library-color); color: #FFF; text-decoration: none; } @@ -4680,7 +4680,7 @@ div .suggestion_note { padding: 0.4em 20px; &:hover { - background-color: $background-color-primary; + background-color: var(--library-color); text-decoration: none; } } diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss index 0f9516bd00f..682620bb625 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss @@ -923,7 +923,7 @@ table { .nav-link { background-color: #F0F3F3; border: 1px solid $nav-tabs-border-color; - color: var( --bs-link-color ); + color: var( --library-color ); font-weight: normal; margin-right: .4em; -- 2.39.5