Attachment 141043 Details for Bug 30952 – Bug 30952: (follow-up) Use variables for primary and secondary greens

[patch] Bug 30952: (follow-up) Use variables for primary and secondary greens

Bug-30952-follow-up-Use-variables-for-primary-and-.patch (text/plain), 3.49 KB, created by Julian Maurice on 2022-09-28 08:51:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2022-09-28 08:51:40 UTC

Size: 3.49 KB

patch

obsolete

>From 3616b23e61a8c7a7d7a23dbb720cd3746155511c Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 27 Sep 2022 18:08:16 +0000
>Subject: [PATCH] Bug 30952: (follow-up) Use variables for primary and
> secondary greens
>
>_variables.scss currently contains a variable,
>$background-color-primary, which isn't used. I think we should use that
>variable anywhere the color is used, and use SASS color calculation to
>generate the secondary color.
>
>The two colors can be compared in the search header: primary for the
>background, secondary for the submit button color.
>
>To test, apply the patch and rebuild the staff interface CSS.
>
>Test various pages in the staff interface to confirm that the colors
>look the same as before: Search header, tab colors, "Last patron"
>button, etc.
>---
> koha-tmpl/intranet-tmpl/prog/css/src/_header.scss      | 2 +-
> koha-tmpl/intranet-tmpl/prog/css/src/_variables.scss   | 1 +
> koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 8 ++++----
> 3 files changed, 6 insertions(+), 5 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss
>index 250065523f..8e786dbb04 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss
>@@ -180,7 +180,7 @@ a.navbar-toggle {
> 
>     input[type="submit"], button[type="submit"] {
>         height: 31px;
>-        background-color: #71B443;
>+        background-color: $background-color-secondary;
>         color: white;
>         border: 0;
>         text-shadow: unset;
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_variables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_variables.scss
>index 41966bfd6f..42b53140f8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/_variables.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_variables.scss
>@@ -1,5 +1,6 @@
> $green-text-color: #006100;
> $background-color-primary: #408540;
>+$background-color-secondary: lighten(saturate(adjust-hue($background-color-primary, -24), 9), 9);
> 
> // Copied from Bootstrap 5 without system-ui because of
> // https://infinnie.github.io/blog/2017/systemui.html
>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 8689c3c149..eb11e60c29 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>@@ -78,7 +78,7 @@ a {
>         i, img {
>             text-align: center;
>             color: $green-text-color;
>-            border: solid 3px #71B443;
>+            border: solid 3px $background-color-secondary;
>             border-radius: 50%;
>             background-color: transparent;
>             width: 40px;
>@@ -2792,7 +2792,7 @@ td.bundle {
>     }
>     .ui-tabs-nav {
>         li {
>-            background: #71B443;
>+            background: $background-color-secondary;
>             border: 0;
>             margin-right: .4em;
>             border-radius: 4px 4px 0 0;
>@@ -2938,7 +2938,7 @@ td.bundle {
>             position: relative;
>             top: 1px;
>             white-space: nowrap;
>-            background: #71B443;
>+            background: $background-color-secondary;
> 
>             &.active, &:hover {
>                 font-weight: normal;
>@@ -3552,7 +3552,7 @@ code {
> .nav-tabs {
>     > li {
>         > a {
>-            background-color: #71B443;
>+            background-color: $background-color-secondary;
>             color: #111;
>             line-height: 1.42857143;
>             margin-right: .4em;
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 30952: 136810 | 136812 | 136813 | 136815 | 136816 | 136818 | 136819 | 136820 | 136822 | 136823 | 136825 | 136827 | 136828 | 136830 | 136831 | 136833 | 136834 | 136836 | 136837 | 136839 | 136840 | 136842 | 136844 | 136845 | 136847 | 136848 | 136878 | 136879 | 136880 | 136881 | 136882 | 136883 | 136884 | 136885 | 136886 | 136887 | 136888 | 136889 | 136890 | 136891 | 136892 | 136893 | 136894 | 136895 | 136896 | 136897 | 136898 | 136899 | 136900 | 136901 | 136902 | 136950 | 136951 | 136952 | 136953 | 136954 | 136955 | 136956 | 136957 | 136958 | 136959 | 136960 | 136961 | 136962 | 136963 | 136964 | 136965 | 136966 | 136967 | 136968 | 136969 | 136970 | 136971 | 136972 | 136973 | 136974 | 137408 | 137409 | 137410 | 137411 | 137414 | 137415 | 137416 | 137417 | 137418 | 137419 | 137420 | 137744 | 137767 | 137768 | 137775 | 137776 | 137994 | 138091 | 138092 | 138093 | 138094 | 138095 | 138096 | 138097 | 138098 | 138099 | 138100 | 138101 | 138102 | 138103 | 138245 | 138246 | 138247 | 138293 | 138299 | 138300 | 138302 | 140117 | 140118 | 140119 | 140120 | 140121 | 140122 | 140123 | 140124 | 140125 | 140126 | 140127 | 140128 | 140129 | 140130 | 140131 | 140132 | 140133 | 140134 | 140135 | 140136 | 140137 | 140138 | 140139 | 140140 | 140141 | 140142 | 140143 | 140371 | 140372 | 140373 | 140374 | 140433 | 140435 | 140459 | 140460 | 140512 | 140513 | 140514 | 140515 | 140516 | 140517 | 140519 | 140520 | 140521 | 140522 | 140523 | 140524 | 140525 | 140526 | 140527 | 140528 | 140529 | 140530 | 140531 | 140532 | 140533 | 140534 | 140535 | 140536 | 140537 | 140538 | 140539 | 140540 | 140541 | 140542 | 140543 | 140544 | 140545 | 140546 | 140547 | 140548 | 140549 | 140550 | 140551 | 140552 | 140553 | 140554 | 140555 | 140556 | 140557 | 140558 | 140559 | 140560 | 140566 | 140567 | 140570 | 140571 | 140575 | 140576 | 140577 | 140588 | 140613 | 140617 | 140618 | 140619 | 140620 | 140628 | 140629 | 140635 | 140649 | 140650 | 140651 | 140652 | 140653 | 140654 | 140658 | 140687 | 140976 | 140977 | 141020 | 141024 | 141026 | 141027 | 141041 | 141043 | 141044 | 141047 | 141052 | 141053 | 141054 | 141055 | 141056 | 141057 | 141064 | 141074 | 141075 | 141631 | 141632 | 141633 | 141634 | 141635 | 141636 | 141637 | 141638 | 141639 | 141640 | 141641 | 141642 | 141643 | 141644 | 141645 | 141646 | 141647 | 141648 | 141649 | 141650 | 141651 | 141652 | 141653 | 141654 | 141655 | 141656 | 141657 | 141658 | 141659 | 141660 | 141661 | 141662 | 141663 | 141664 | 141665 | 141666 | 141667 | 141668 | 141669 | 141670 | 141671 | 141672 | 141673 | 141674 | 141675 | 141676 | 141677 | 141678 | 141679 | 141680 | 141681 | 141682 | 141683 | 141684 | 141685 | 141686 | 141687 | 141688 | 141689 | 141690 | 141691 | 141692 | 141693 | 141694 | 141695 | 141696 | 141697 | 141698 | 141699 | 141700 | 141701 | 141702 | 141703 | 141704 | 141705 | 141706 | 141707 | 141708 | 141709 | 141710 | 141711 | 141712 | 141713 | 142604 | 142605