Skip to content

Commit

Permalink
💄 Add 2 variables link-primary-color and button-primary-color for ove…
Browse files Browse the repository at this point in the history
…rride color
  • Loading branch information
Marion Velard authored and cprodhomme committed Oct 13, 2023
1 parent e2ceaf3 commit 0b5d378
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 17 deletions.
2 changes: 1 addition & 1 deletion app/assets/stylesheets/arctic_admin/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ h1, h2, h3, h4, h5, h6 {
}

a {
color: $primary-color;
color: $link-primary-color;
text-decoration: none;
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/arctic_admin/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ h6 {
}

a {
color: $primary-color;
color: $link-primary-color;
text-decoration: none;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/arctic_admin/components/_tabs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/arctic_admin/components/_toggle.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/arctic_admin/layouts/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/arctic_admin/layouts/_sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

&.current {
a {
color: $primary-color;
color: $link-primary-color;
}
}

Expand Down Expand Up @@ -88,7 +88,7 @@
}

.current a {
color: $primary-color;
color: $link-primary-color;
}
}

Expand Down
8 changes: 4 additions & 4 deletions app/assets/stylesheets/arctic_admin/pages/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ body.index {
}

.dropdown_menu_button{
@include secondary-dropdown($primary-color);
@include secondary-dropdown($button-primary-color);
}

.dropdown_menu_list {
Expand All @@ -47,7 +47,7 @@ body.index {
justify-content: right;

a {
@include secondary-button($primary-color);
@include secondary-button($button-primary-color);
}

.index {
Expand Down Expand Up @@ -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;
Expand All @@ -106,7 +106,7 @@ body.index {

.scopes {
.scope {
@include group-button($primary-color);
@include group-button($button-primary-color);

a {
margin-right: .25rem;
Expand Down
2 changes: 2 additions & 0 deletions app/assets/stylesheets/arctic_admin/variables/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

0 comments on commit 0b5d378

Please sign in to comment.