From 0b5d3789efecc3b7a7093588692bbf4f6b28b987 Mon Sep 17 00:00:00 2001 From: Marion Velard Date: Fri, 13 Oct 2023 18:03:45 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20Add=202=20variables=20link-prima?= =?UTF-8?q?ry-color=20and=20button-primary-color=20for=20override=20color?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/arctic_admin/_base.scss | 2 +- app/assets/stylesheets/arctic_admin/_main.scss | 2 +- .../stylesheets/arctic_admin/components/_date_picker.scss | 2 +- .../stylesheets/arctic_admin/components/_inputs.scss | 2 +- .../stylesheets/arctic_admin/components/_pagination.scss | 4 ++-- app/assets/stylesheets/arctic_admin/components/_tabs.scss | 4 ++-- .../stylesheets/arctic_admin/components/_toggle.scss | 4 ++-- app/assets/stylesheets/arctic_admin/layouts/_header.scss | 2 +- app/assets/stylesheets/arctic_admin/layouts/_sidebar.scss | 4 ++-- app/assets/stylesheets/arctic_admin/pages/_index.scss | 8 ++++---- .../stylesheets/arctic_admin/variables/_colors.scss | 2 ++ 11 files changed, 19 insertions(+), 17 deletions(-) diff --git a/app/assets/stylesheets/arctic_admin/_base.scss b/app/assets/stylesheets/arctic_admin/_base.scss index c9d81a9..0493a4a 100644 --- a/app/assets/stylesheets/arctic_admin/_base.scss +++ b/app/assets/stylesheets/arctic_admin/_base.scss @@ -25,6 +25,6 @@ h1, h2, h3, h4, h5, h6 { } a { - color: $primary-color; + color: $link-primary-color; text-decoration: none; } diff --git a/app/assets/stylesheets/arctic_admin/_main.scss b/app/assets/stylesheets/arctic_admin/_main.scss index 0e73648..5296844 100644 --- a/app/assets/stylesheets/arctic_admin/_main.scss +++ b/app/assets/stylesheets/arctic_admin/_main.scss @@ -49,6 +49,6 @@ h6 { } a { - color: $primary-color; + color: $link-primary-color; text-decoration: none; } diff --git a/app/assets/stylesheets/arctic_admin/components/_date_picker.scss b/app/assets/stylesheets/arctic_admin/components/_date_picker.scss index 447914e..0798b9e 100644 --- a/app/assets/stylesheets/arctic_admin/components/_date_picker.scss +++ b/app/assets/stylesheets/arctic_admin/components/_date_picker.scss @@ -11,7 +11,7 @@ margin-bottom: 10px; .ui-datepicker-prev, .ui-datepicker-next { - @include primary-button($primary-color, #fff); + @include primary-button($button-primary-color, #fff); padding: 2px 5px; font-size: 14px; } diff --git a/app/assets/stylesheets/arctic_admin/components/_inputs.scss b/app/assets/stylesheets/arctic_admin/components/_inputs.scss index 4221d6c..9bf93f8 100644 --- a/app/assets/stylesheets/arctic_admin/components/_inputs.scss +++ b/app/assets/stylesheets/arctic_admin/components/_inputs.scss @@ -38,7 +38,7 @@ input[type="number"], textarea { input[type="submit"] { @include appearance(); - @include primary-button($primary-color, white); + @include primary-button($button-primary-color, white); width: 100%; padding: 0 12px; font-size: 15px; diff --git a/app/assets/stylesheets/arctic_admin/components/_pagination.scss b/app/assets/stylesheets/arctic_admin/components/_pagination.scss index a888e33..5937846 100644 --- a/app/assets/stylesheets/arctic_admin/components/_pagination.scss +++ b/app/assets/stylesheets/arctic_admin/components/_pagination.scss @@ -12,11 +12,11 @@ @include transition-button(); &:hover { - color: $primary-color; + color: $link-primary-color; } } .page.current { - background-color: $primary-color; + background-color: $link-primary-color; color: #fff; border-radius: $border-radius; padding: .3rem .4rem; diff --git a/app/assets/stylesheets/arctic_admin/components/_tabs.scss b/app/assets/stylesheets/arctic_admin/components/_tabs.scss index b4ad112..5444a5f 100644 --- a/app/assets/stylesheets/arctic_admin/components/_tabs.scss +++ b/app/assets/stylesheets/arctic_admin/components/_tabs.scss @@ -18,10 +18,10 @@ } &.ui-tabs-active { - border-bottom: 2px solid $primary-color; + border-bottom: 2px solid $link-primary-color; a { - color: $primary-color; + color: $link-primary-color; } } } diff --git a/app/assets/stylesheets/arctic_admin/components/_toggle.scss b/app/assets/stylesheets/arctic_admin/components/_toggle.scss index d42fdc6..149b753 100644 --- a/app/assets/stylesheets/arctic_admin/components/_toggle.scss +++ b/app/assets/stylesheets/arctic_admin/components/_toggle.scss @@ -3,7 +3,7 @@ $toggle-height: 20px !default; $toggle-offset: 3px !default; $toggle-outer-default: #ddd !default; -$toggle-outer-active: $primary-color !default; +$toggle-outer-active: $link-primary-color !default; $toggle-inner-default: #fff !default; $toggle-inner-active: #fff !default; @@ -61,7 +61,7 @@ $toggle-transition: 200ms ease-out !default; // reset style background-image: none; // - background: $primary-color; + background: $link-primary-color; &::before { // reset style diff --git a/app/assets/stylesheets/arctic_admin/layouts/_header.scss b/app/assets/stylesheets/arctic_admin/layouts/_header.scss index 4a06489..458dbd6 100644 --- a/app/assets/stylesheets/arctic_admin/layouts/_header.scss +++ b/app/assets/stylesheets/arctic_admin/layouts/_header.scss @@ -228,7 +228,7 @@ body.active_admin.logged_in { float: right; .action_item a { - @include primary-button($primary-color, #fff); + @include primary-button($button-primary-color, #fff); padding: 5px 8px; } } diff --git a/app/assets/stylesheets/arctic_admin/layouts/_sidebar.scss b/app/assets/stylesheets/arctic_admin/layouts/_sidebar.scss index 6aa2009..29e7100 100644 --- a/app/assets/stylesheets/arctic_admin/layouts/_sidebar.scss +++ b/app/assets/stylesheets/arctic_admin/layouts/_sidebar.scss @@ -47,7 +47,7 @@ &.current { a { - color: $primary-color; + color: $link-primary-color; } } @@ -88,7 +88,7 @@ } .current a { - color: $primary-color; + color: $link-primary-color; } } diff --git a/app/assets/stylesheets/arctic_admin/pages/_index.scss b/app/assets/stylesheets/arctic_admin/pages/_index.scss index 256ec6c..2617487 100644 --- a/app/assets/stylesheets/arctic_admin/pages/_index.scss +++ b/app/assets/stylesheets/arctic_admin/pages/_index.scss @@ -29,7 +29,7 @@ body.index { } .dropdown_menu_button{ - @include secondary-dropdown($primary-color); + @include secondary-dropdown($button-primary-color); } .dropdown_menu_list { @@ -47,7 +47,7 @@ body.index { justify-content: right; a { - @include secondary-button($primary-color); + @include secondary-button($button-primary-color); } .index { @@ -97,7 +97,7 @@ body.index { margin-bottom: -4px; .member_link { - @include primary-button($primary-color, white); + @include primary-button($button-primary-color, white); padding: 4px 8px; margin-right: 4px; margin-bottom: 4px; @@ -106,7 +106,7 @@ body.index { .scopes { .scope { - @include group-button($primary-color); + @include group-button($button-primary-color); a { margin-right: .25rem; diff --git a/app/assets/stylesheets/arctic_admin/variables/_colors.scss b/app/assets/stylesheets/arctic_admin/variables/_colors.scss index 5779e29..d575aa5 100644 --- a/app/assets/stylesheets/arctic_admin/variables/_colors.scss +++ b/app/assets/stylesheets/arctic_admin/variables/_colors.scss @@ -46,3 +46,5 @@ $text-color-important: #526069 !default; $box-shadow: 0 0 4px 0 rgba(0,0,0,0.1) !default; $primary-color: $blue !default; +$link-primary-color: $primary-color !default; +$button-primary-color: $primary-color !default; \ No newline at end of file