Skip to content

Uds 1916 #1587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
+445 −397
Open

Uds 1916 #1587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a033807
chore(unity-bootstrap-theme): fix sass gray names
scott-williams-az Sep 26, 2025
5004074
refactor(unity-bootstrap-theme): fix gray classes conflicting with brand
scott-williams-az Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/unity-bootstrap-theme/public/img/font-awesome-svg/search-gray-dark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/unity-bootstrap-theme/public/img/font-awesome-svg/search-gray-darker.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 20 additions & 11 deletions packages/unity-bootstrap-theme/src/scss/_custom-asu-variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,22 @@ $uds-color-base-blue: #00a3e0; // ASU Blue
$uds-color-base-bluefocus: #00baff; // A11y Focus Blue - used for highlighting the page element with current focus
$uds-color-base-darkgold: #7f6227; // Visited state of ASU Gold
$uds-color-base-darkmaroon: #440e22; // Visited state of ASU Maroon
$uds-color-base-gray-1: #fafafa;
$uds-color-base-gray-2: #e8e8e8;
$uds-color-base-gray-3: #d0d0d0;
$uds-color-base-gray-4: #bfbfbf;
$uds-color-base-gray-5: #747474;
$uds-color-base-gray-6: #484848;
$uds-color-base-gray-7: #191919; // Base font color and default black level
// Deprecated-start
$uds-color-base-gray-1: #fafafa; // Deprecated use $asu-gray-7 instead.
$uds-color-base-gray-2: #e8e8e8; // Deprecated use $asu-gray-6 instead.
$uds-color-base-gray-3: #d0d0d0; // Deprecated use $asu-gray-5 instead.
$uds-color-base-gray-4: #bfbfbf; // Deprecated use $asu-gray-4 instead.
$uds-color-base-gray-5: #747474; // Deprecated use $asu-gray-3 instead.
$uds-color-base-gray-6: #484848; // Deprecated use $asu-gray-2 instead.
$uds-color-base-gray-7: #191919; // Deprecated use $asu-gray-1 instead.
// Deprecated-end
$asu-gray-1: #191919; // Brand guideline ASU Gray 1 - Base font color and default black level
$asu-gray-2: #484848; // Brand guideline ASU Gray 2
$asu-gray-3: #747474; // Brand guideline ASU Gray 3
$asu-gray-4: #bfbfbf; // Brand guideline ASU Gray 4
$asu-gray-5: #d0d0d0; // Brand guideline ASU Gray 5
$asu-gray-6: #e8e8e8; // Brand guideline ASU Gray 6
$asu-gray-7: #fafafa; // Brand guideline ASU Gray 7

$uds-color-brand-gold: $uds-color-base-gold; // ASU Gold brand color
$uds-color-brand-maroon: $uds-color-base-maroon; // ASU Maroon brand color
Expand All @@ -61,17 +70,17 @@ $uds-color-alerts-info: $uds-color-base-blue; // Information
$uds-color-alerts-success: $uds-color-base-green; // Success

$uds-color-background-white: $uds-color-base-white; // Background - White
$uds-color-background-gray: $uds-color-base-gray-2; // Background - Gray
$uds-color-background-dark: $uds-color-base-gray-7; // Background - Dark
$uds-color-background-gray: $asu-gray-6; // Background - Gray
$uds-color-background-dark: $asu-gray-1; // Background - Dark
$uds-color-background-success: #e9f5db; // Background - Success
$uds-color-background-error: #f7dddd; // Background - Error
$uds-color-background-warning: #ffeade; // Background - Warning
$uds-color-background-info: #d6f0fa; // Background - Information

$uds-color-font-dark-base: $uds-color-base-gray-7; // Default text color on light background
$uds-color-font-dark-base: $asu-gray-1; // Default text color on light background
$uds-color-font-dark-error: #FF7B7D; // Error text on dark background
$uds-color-font-dark-success: #446d12; // Success text on dark background
$uds-color-font-light-base: $uds-color-base-gray-1; // Default text on dark background
$uds-color-font-light-base: $asu-gray-7; // Default text on dark background
$uds-color-font-light-link: $uds-color-base-gold; // Link text on dark background
$uds-color-font-light-visited: $uds-color-base-darkgold; // Visited link text on dark background
$uds-color-font-light-info: #00b0f3; // Information text on dark background
Expand Down
2 changes: 1 addition & 1 deletion packages/unity-bootstrap-theme/src/scss/extends/_alerts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
div[class='alert alert-block'] {
/* Catch-all for default alert class */
background-color: $uds-color-background-gray;
border-color: $uds-color-base-gray-3;
border-color: $asu-gray-5;
}

// Media Queries
Expand Down
14 changes: 7 additions & 7 deletions packages/unity-bootstrap-theme/src/scss/extends/_alt_styling.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
*/

// Mapping for Design Tokens
$ws2-gray-darkest: $uds-color-base-gray-7;
$ws2-gray-darker: $uds-color-base-gray-6;
$ws2-gray-dark: $uds-color-base-gray-5;
$ws2-gray: $uds-color-base-gray-4;
$ws2-gray-light: $uds-color-base-gray-3;
$ws2-gray-lighter: $uds-color-base-gray-2;
$ws2-gray-lightest: $uds-color-base-gray-1;
$ws2-gray-darkest: $asu-gray-1;
$ws2-gray-darker: $asu-gray-2;
$ws2-gray-dark: $asu-gray-3;
$ws2-gray: $asu-gray-4;
$ws2-gray-light: $asu-gray-5;
$ws2-gray-lighter: $asu-gray-6;
$ws2-gray-lightest: $asu-gray-7;

// Custom variables (semantic renaming, mapping, etc.)
$the-base: 16px;
Expand Down
12 changes: 6 additions & 6 deletions packages/unity-bootstrap-theme/src/scss/extends/_anchor-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.uds-anchor-menu {
background-color: white;
border-bottom: 1px solid $uds-color-base-gray-3;
border-bottom: 1px solid $asu-gray-5;
z-index: 100;

&-wrapper {
Expand Down Expand Up @@ -47,14 +47,14 @@
}

.nav-link {
color: $uds-color-base-gray-7;
color: $asu-gray-1;
padding: $uds-size-spacing-3 0;
padding-left: 0.5rem;
text-align: start;
font-weight: 400;

&:not(:last-child) {
border-bottom: 1px solid $uds-color-base-gray-3;
border-bottom: 1px solid $asu-gray-5;
}

&:hover,
Expand All @@ -64,11 +64,11 @@
}

&:visited {
color: $uds-color-base-gray-7;
color: $asu-gray-1;
}

&:focus {
box-shadow: 0px 0px 0px 2px $uds-color-base-gray-7 !important;
box-shadow: 0px 0px 0px 2px $asu-gray-1 !important;
}

svg {
Expand All @@ -80,7 +80,7 @@
}

@mixin uds-anchor-menu-expanded {
border-bottom: 1px solid $uds-color-base-gray-3;
border-bottom: 1px solid $asu-gray-5;

.uds-anchor-menu-wrapper {
flex-direction: row;
Expand Down
2 changes: 1 addition & 1 deletion packages/unity-bootstrap-theme/src/scss/extends/_back-to-top-buttton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.uds-back-to-top-button {
align-items: center;
background-color: $uds-color-base-gray-5;
background-color: $asu-gray-3;
border: none;
bottom: 50%;
color: $uds-color-base-white;
Expand Down
37 changes: 26 additions & 11 deletions packages/unity-bootstrap-theme/src/scss/extends/_backgrounds.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,36 @@
height: 322px;
}

.gray-7-bg {
background: $uds-color-base-gray-7;
.gray-7-bg, .gray-dark-bg {
background: $asu-gray-1;
}

.gray-2-bg {
background: $uds-color-base-gray-2;
.text-gray-dark-bg {
background-color: $asu-gray-1;
color: $asu-gray-7;
}

.gray-1-bg {
background: $uds-color-base-gray-1;
.gray-2-bg, .gray-light-bg {
background: $asu-gray-6;
}

.text-gray-light-bg {
background-color: $asu-gray-6;
color: $asu-gray-1;
}

.gray-1-bg, .gray-faint-bg {
background: $asu-gray-7;
}

.text-gray-faint-bg {
background-color: $asu-gray-7;
color: $asu-gray-1;
}

.white-bg {
background: $uds-color-base-white;
border: 1px solid $uds-color-base-gray-3;
border: 1px solid $asu-gray-5;
}

.image-bg {
Expand Down Expand Up @@ -45,9 +60,9 @@
}

.content-description-container {
background-color: $uds-color-base-gray-1;
background-color: $asu-gray-7;
width: 100%;
border: 1px solid $uds-color-base-gray-3;
border: 1px solid $asu-gray-5;
margin-top: 16px;
}

Expand All @@ -56,11 +71,11 @@
flex-direction: column;
align-items: center;
justify-content: center;
border: 1px dashed $uds-color-base-gray-5;
border: 1px dashed $asu-gray-3;
height: 251px;
margin: 20px 0 100px 0;
font-size: 50px;
color: $uds-color-base-gray-3;
color: $asu-gray-5;
}

.bg {
Expand Down
4 changes: 2 additions & 2 deletions packages/unity-bootstrap-theme/src/scss/extends/_blockquotes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ blockquote:before {

svg {
grid-column: 1;
fill: $uds-color-base-gray-7;
fill: $asu-gray-1;
width: $uds-size-spacing-5;
height: auto;
}
Expand Down Expand Up @@ -251,7 +251,7 @@ blockquote:before {
&:before {
content: '';
display: block;
background-color: $uds-color-base-gray-7;
background-color: $asu-gray-1;
height: $uds-size-spacing-half;
width: $uds-size-spacing-9;
margin: $uds-size-spacing-2 0;
Expand Down
4 changes: 2 additions & 2 deletions packages/unity-bootstrap-theme/src/scss/extends/_breadcrumb.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
& {
padding-left: 0;
}
&.bg-gray-7 {
&.bg-gray-7, &.gray-dark-bg {
a {
color: $uds-color-base-gold;
}
li.active {
&, a {
color: $uds-color-base-gray-1;
color: $asu-gray-7;
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions packages/unity-bootstrap-theme/src/scss/extends/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,27 @@
padding: $uds-component-button-padding-y-small
$uds-component-button-padding-x-small;
margin-top: 8px;
background: $gray-2;
background: $asu-gray-6;
&.btn-tag-alt-white {
background: $gray-2;
background: $asu-gray-6;
color: $body-color;
}
&.btn-tag-alt-gray {
background: $gray-3;
background: $asu-gray-5;
color: $body-color;
}
&.btn-tag-alt-black {
background: $gray-4;
background: $asu-gray-4;
color: $body-color;
}
}
&.btn-circle {
padding: $uds-size-spacing-half $uds-size-spacing-half;
width: $uds-size-spacing-4 !important;
height: $uds-size-spacing-4;
border: solid 1px $gray-3;
border: solid 1px $asu-gray-5;
&.btn-circle-alt-white {
background: $gray-2;
background: $asu-gray-6;
color: $body-color;
}
&.btn-circle-alt-gray {
Expand All @@ -60,7 +60,7 @@
}
&.btn-circle-alt-black {
background: $white;
color: $gray-7;
color: $asu-gray-1;
}
&.btn-circle-large {
width: $uds-size-spacing-8 !important;
Expand All @@ -81,7 +81,7 @@
}
}
.bg-light-gray {
background-color: $gray-1;
background-color: $asu-gray-7;
}


Expand Down
16 changes: 8 additions & 8 deletions packages/unity-bootstrap-theme/src/scss/extends/_calendar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
.body {
display: grid;
grid-template-columns: repeat(7, 1fr);
border-top: 1px solid $uds-color-base-gray-5;
border-left: 1px solid $uds-color-base-gray-5;
border-top: 1px solid $asu-gray-3;
border-left: 1px solid $asu-gray-3;
.calendar-item {
font-size: $uds-size-font-medium;
padding: $uds-size-spacing-8 $uds-size-spacing-1 $uds-size-spacing-1;
cursor: pointer;
border-bottom: 1px solid $uds-color-base-gray-5;
border-right: 1px solid $uds-color-base-gray-5;
border-bottom: 1px solid $asu-gray-3;
border-right: 1px solid $asu-gray-3;
margin: 0;
}
.today {
Expand All @@ -35,16 +35,16 @@
}
.prev,
.next {
color: $uds-color-base-gray-5;
color: $asu-gray-3;
}
}
}
.calendar-nav {
text-align: center;
button {
border: 1px solid $uds-color-base-gray-3;
border: 1px solid $asu-gray-5;
border-radius: $uds-component-border-radius;
background-color: $uds-color-base-gray-2;
background-color: $asu-gray-6;
padding: calc(#{$uds-size-spacing-3} / 2) calc(#{$uds-size-spacing-7} / 3);
svg {
font-size: $uds-size-spacing-3;
Expand All @@ -65,7 +65,7 @@ Mobile
padding-right: 0;
text-align: center;
.heading {
border-bottom: 1px solid $uds-color-base-gray-5;
border-bottom: 1px solid $asu-gray-3;
padding-bottom: $uds-size-spacing-1;
&.desktop {
display: none;
Expand Down
Loading