Skip to content

Commit

Permalink
Change primary and secondary names
Browse files Browse the repository at this point in the history
  • Loading branch information
darren-arbon committed Aug 9, 2024
1 parent d645c0b commit 002eb18
Show file tree
Hide file tree
Showing 12 changed files with 70 additions and 70 deletions.
6 changes: 3 additions & 3 deletions assets/stylesheets/_error.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.t-error {
background-color: $white;
color: $brand-secondary;
color: $brand-primary;

hr {
height: 1px;
Expand All @@ -23,12 +23,12 @@
.c-error-page__header {
font-size: floor($font-size-base * 4);
font-weight: 700;
color: $brand-secondary;
color: $brand-primary;
}

.c-error-page__subheader {
font-size: floor($font-size-base * 3);
color: $brand-secondary;
color: $brand-primary;
}

.c-error-page__context {
Expand Down
10 changes: 5 additions & 5 deletions assets/stylesheets/_listbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
padding: 12px;
position: relative;
line-height: 1.6;
color: $brand-secondary;
color: $brand-primary;
white-space: nowrap;
border-bottom: 1px solid #e9ecef;
}
Expand All @@ -23,17 +23,17 @@
}

[role="option"]:hover {
background: $brand-secondary;
background: $brand-primary;
color: white;
}

[role="option"].focused {
background: $brand-secondary;
background: $brand-primary;
color: white;
}

[role="option"][aria-selected="true"] {
background-color: $brand-secondary;
background-color: $brand-primary;
color: white;
}

Expand All @@ -55,7 +55,7 @@

.c-fancy-listbox__toggle.c-fancy-listbox__toggle[aria-expanded="true"] {
background-color: white;
color: $brand-secondary;
color: $brand-primary;
transition: none;
}

Expand Down
16 changes: 8 additions & 8 deletions assets/stylesheets/bootstrap/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ input[type="file"]:focus,
input[type="radio"]:focus,
input[type="checkbox"]:focus {
// @include tab-focus;
outline: 2px solid $brand-secondary;
outline: 2px solid $brand-primary;
outline-offset: 2px;
}

Expand Down Expand Up @@ -708,7 +708,7 @@ was-validated .input-group .form-control:invalid, .input-group .form-control.is-
-ms-user-select: none;
user-select: none;
background-color: transparent;
box-shadow: 0 0 0 1px $brand-secondary;
box-shadow: 0 0 0 1px $brand-primary;
}

.custom-control-label:hover::before {
Expand All @@ -732,15 +732,15 @@ was-validated .input-group .form-control:invalid, .input-group .form-control.is-

.custom-control-input:checked~.custom-control-label::before {
color: #fff;
background-color: $brand-secondary;
background-color: $brand-primary;
}

.custom-control-input:disabled~.custom-control-label {
color: $gray700;
}

.custom-control-input:checked~.custom-control-label::before {
color: $brand-secondary;
color: $brand-primary;
background-color: $white;
}

Expand All @@ -758,17 +758,17 @@ was-validated .input-group .form-control:invalid, .input-group .form-control.is-
.custom-checkbox {
.custom-control-input:checked~.custom-control-label::before {
background-color: $white;
box-shadow: 0 0 0 1px $brand-secondary;
box-shadow: 0 0 0 1px $brand-primary;
}

.custom-control-input:focus~.custom-control-label::before {
background-color: $white;
box-shadow: 0 0 0 2px $brand-secondary;
box-shadow: 0 0 0 2px $brand-primary;
}

.custom-control-input:focus:checked~.custom-control-label::before {
background-color: $white;
box-shadow: 0 0 0 2px $brand-secondary;
box-shadow: 0 0 0 2px $brand-primary;
}

.o-custom-control__input--pink:focus~.custom-control-label::before {
Expand Down Expand Up @@ -803,7 +803,7 @@ was-validated .input-group .form-control:invalid, .input-group .form-control.is-
}

.custom-control-input:focus~.custom-control-label::after {
box-shadow: 0 0 0 2px $brand-secondary;
box-shadow: 0 0 0 2px $brand-primary;
border-radius: 1rem;
}

Expand Down
2 changes: 1 addition & 1 deletion assets/stylesheets/bootstrap/_navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
}
}
.divider {
background-color: $brand-secondary;
background-color: $brand-primary;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions assets/stylesheets/bootstrap/_navs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
&:hover,
&:focus {
background-color: $nav-link-hover-bg;
border-color: $brand-secondary;
border-color: $brand-primary;
}
}

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

&:focus {
outline: 2px solid $brand-secondary;
outline: 2px solid $brand-primary;
outline-offset: -1px;
background-color: $white;
// border-top: 1px solid $nav-tabs-border-color;
Expand Down
8 changes: 4 additions & 4 deletions assets/stylesheets/bootstrap/_pager.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

> a:focus {
outline: 0;
border-color: $brand-secondary;
box-shadow: 0 0 0 1px $brand-secondary;
border-color: $brand-primary;
box-shadow: 0 0 0 1px $brand-primary;
}

> a:active {
Expand Down Expand Up @@ -67,8 +67,8 @@
}

> a:focus {
border: 1px solid $brand-secondary;
box-shadow: 0 0 0 1px $brand-secondary;
border: 1px solid $brand-primary;
box-shadow: 0 0 0 1px $brand-primary;
}
}
}
10 changes: 5 additions & 5 deletions assets/stylesheets/bootstrap/_pagination.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@
&:focus {
z-index: 3;
outline: 0;
border-color: $brand-secondary;
box-shadow: 0 0 0 1px inset $brand-secondary;
border-color: $brand-primary;
box-shadow: 0 0 0 1px inset $brand-primary;
}

&:hover:focus {
z-index: 3;
border-color: $brand-secondary;
box-shadow: 0 0 0 1px inset $brand-secondary;
border-color: $brand-primary;
box-shadow: 0 0 0 1px inset $brand-primary;

}
}
Expand All @@ -89,7 +89,7 @@
&:focus {
z-index: 3;
color: $pagination-active-color;
background-image: linear-gradient(0deg, $brand-secondary 4px, transparent 4px);
background-image: linear-gradient(0deg, $brand-primary 4px, transparent 4px);
font-weight: 600;

background-color: $pagination-active-bg;
Expand Down
56 changes: 28 additions & 28 deletions assets/stylesheets/bootstrap/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ $deathstar: $gray;
$battleship: $gray-light;
$misty: $gray-lighter;

$brand-primary: $turquoise !default;
$brand-secondary: $inquisitive-blue !default;
$brand-primary: $inquisitive-blue !default;
$brand-secondary: $turquoise !default;
$brand-success: #77E0CE !default;
$brand-info: #4CC3D6 !default;
$brand-warning: #FFC943 !default;
Expand All @@ -60,9 +60,9 @@ $body-bg: #fff !default;
$text-color: $gray700 !default;

//** Global textual link color.
$link-color: $brand-secondary !default;
$link-color: $brand-primary !default;
//** Link hover color set via `darken()` function.
$link-hover-color: $brand-secondary !default;
$link-hover-color: $brand-primary !default;
//** Link hover decoration.
$link-hover-decoration: none !default;

Expand Down Expand Up @@ -152,7 +152,7 @@ $border-radius-small: 3px !default;
//** Global color for active items (e.g., navs or dropdowns).
$component-active-color: #fff !default;
//** Global background color for active items (e.g., navs or dropdowns).
$component-active-bg: $brand-secondary !default;
$component-active-bg: $brand-primary !default;

//** Width of the `border` for generating carets that indicate dropdowns.
$caret-width-base: 4px !default;
Expand Down Expand Up @@ -189,13 +189,13 @@ $table-header-color: $black !default;

$btn-font-weight: 600 !default;

$btn-default-color: $brand-secondary !default;
$btn-default-color: $brand-primary !default;
$btn-default-bg: $white !default;
$btn-default-border: $brand-secondary !default;
$btn-default-border: $brand-primary !default;

$btn-primary-color: $white !default;
$btn-primary-bg: $brand-secondary !default;
$btn-primary-border: $brand-secondary !default;
$btn-primary-bg: $brand-primary !default;
$btn-primary-border: $brand-primary !default;

$btn-success-color: $white !default;
$btn-success-bg: $brand-success !default;
Expand Down Expand Up @@ -245,7 +245,7 @@ $input-border-radius-large: $border-radius-large !default;
$input-border-radius-small: $border-radius-small !default;

//** Border color for inputs on focus
$input-border-focus: $brand-secondary !default;
$input-border-focus: $brand-primary !default;

//** Placeholder text color
$input-color-placeholder: $gray700 !default;
Expand Down Expand Up @@ -288,11 +288,11 @@ $dropdown-fallback-border: $battleship !default;
$dropdown-divider-bg: $misty !default;

//** Dropdown link text color.
$dropdown-link-color: $brand-secondary !default;
$dropdown-link-color: $brand-primary !default;
//** Hover color for dropdown links.
$dropdown-link-hover-color: #fff !default;
//** Hover background for dropdown links.
$dropdown-link-hover-bg: $brand-secondary !default;
$dropdown-link-hover-bg: $brand-primary !default;

//** Active dropdown menu item text color.
$dropdown-link-active-color: $component-active-color !default;
Expand Down Expand Up @@ -412,15 +412,15 @@ $navbar-padding-vertical: (($navbar-height - $line-height-computed) * 0
$navbar-collapse-max-height: 340px !default;

$navbar-default-color: $white !default;
$navbar-default-bg: $brand-primary !default;
$navbar-default-bg: $brand-secondary !default;
$navbar-default-border: $white !default;

// Navbar links
$navbar-default-link-color: $brand-secondary !default;
$navbar-default-link-hover-color: $brand-secondary !default;
$navbar-default-link-hover-bg: $brand-primary !default;
$navbar-default-link-active-color: $brand-secondary !default;
$navbar-default-link-active-bg: $brand-secondary !default;
$navbar-default-link-color: $brand-primary !default;
$navbar-default-link-hover-color: $brand-primary !default;
$navbar-default-link-hover-bg: $brand-secondary !default;
$navbar-default-link-active-color: $brand-primary !default;
$navbar-default-link-active-bg: $brand-primary !default;
$navbar-default-link-disabled-color: #ccc !default;
$navbar-default-link-disabled-bg: transparent !default;

Expand All @@ -430,9 +430,9 @@ $navbar-default-brand-hover-color: darken($navbar-default-brand-color, 1
$navbar-default-brand-hover-bg: transparent !default;

// Navbar toggle
$navbar-default-toggle-hover-bg: $brand-secondary !default;
$navbar-default-toggle-hover-bg: $brand-primary !default;
$navbar-default-toggle-icon-bar-bg: $white !default;
$navbar-default-toggle-border-color: $brand-secondary !default;
$navbar-default-toggle-border-color: $brand-primary !default;


//=== Inverted navbar
Expand Down Expand Up @@ -474,21 +474,21 @@ $nav-disabled-link-color: #ADB5BD !default;
$nav-disabled-link-hover-color: #ADB5BD !default;

//== Tabs
$nav-tabs-border-color: $brand-secondary !default;
$nav-tabs-border-color: $brand-primary !default;

$nav-tabs-link-hover-border-color: $gray200 !default;

$nav-tabs-active-link-hover-bg: $body-bg !default;
$nav-tabs-active-link-hover-color: $brand-secondary !default;
$nav-tabs-active-link-hover-border-color: $brand-secondary !default;
$nav-tabs-active-link-hover-color: $brand-primary !default;
$nav-tabs-active-link-hover-border-color: $brand-primary !default;

$nav-tabs-justified-link-border-color: $gray200 !default;
$nav-tabs-justified-active-link-border-color: $body-bg !default;

//== Pills
$nav-pills-border-radius: $border-radius-base !default;
$nav-pills-active-link-hover-bg: $body-bg !default;
$nav-pills-active-link-border-color: $brand-secondary !default;
$nav-pills-active-link-border-color: $brand-primary !default;
$nav-pills-active-link-hover-color: $component-active-color !default;


Expand All @@ -498,16 +498,16 @@ $nav-pills-active-link-hover-color: $component-active-color !default;

$pagination-color: $link-color !default;
$pagination-bg: #fff !default;
$pagination-border: $brand-secondary !default;
$pagination-border: $brand-primary !default;

$pagination-hover-color: $link-hover-color !default;
$pagination-hover-bg: $gray200 !default;
$pagination-down-bg: $gray200 !default;
$pagination-hover-border: $brand-secondary !default;
$pagination-hover-border: $brand-primary !default;

$pagination-active-color: $brand-secondary !default;
$pagination-active-color: $brand-primary !default;
$pagination-active-bg: #fff !default;
$pagination-active-border: $brand-secondary !default;
$pagination-active-border: $brand-primary !default;

$pagination-disabled-color: #ADB5BD !default;
$pagination-disabled-bg: #fff !default;
Expand Down
2 changes: 1 addition & 1 deletion assets/stylesheets/bootstrap/_wells.scss
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ $all-text-inputs: _assing-inputs($_text-inputs-list);
border-color: $input-border;

&:focus {
border-color: $brand-secondary;
border-color: $brand-primary;
}
}
// #{$all-text-inputs} {
Expand Down
2 changes: 1 addition & 1 deletion assets/stylesheets/bootstrap/mixins/_tab-focus.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
outline: thin dotted;
// WebKit
outline: 0;
box-shadow: 0 0 0 1px $brand-secondary;
box-shadow: 0 0 0 1px $brand-primary;
}
Loading

0 comments on commit 002eb18

Please sign in to comment.