Skip to content

Commit c70cc43

Browse files
Merge pull request #1587 from ASU/uds-1916
Uds 1916
2 parents dcfd318 + 5004074 commit c70cc43

File tree

61 files changed

+445
-397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+445
-397
lines changed
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

packages/unity-bootstrap-theme/src/scss/_custom-asu-variables.scss

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,22 @@ $uds-color-base-blue: #00a3e0; // ASU Blue
4444
$uds-color-base-bluefocus: #00baff; // A11y Focus Blue - used for highlighting the page element with current focus
4545
$uds-color-base-darkgold: #7f6227; // Visited state of ASU Gold
4646
$uds-color-base-darkmaroon: #440e22; // Visited state of ASU Maroon
47-
$uds-color-base-gray-1: #fafafa;
48-
$uds-color-base-gray-2: #e8e8e8;
49-
$uds-color-base-gray-3: #d0d0d0;
50-
$uds-color-base-gray-4: #bfbfbf;
51-
$uds-color-base-gray-5: #747474;
52-
$uds-color-base-gray-6: #484848;
53-
$uds-color-base-gray-7: #191919; // Base font color and default black level
47+
// Deprecated-start
48+
$uds-color-base-gray-1: #fafafa; // Deprecated use $asu-gray-7 instead.
49+
$uds-color-base-gray-2: #e8e8e8; // Deprecated use $asu-gray-6 instead.
50+
$uds-color-base-gray-3: #d0d0d0; // Deprecated use $asu-gray-5 instead.
51+
$uds-color-base-gray-4: #bfbfbf; // Deprecated use $asu-gray-4 instead.
52+
$uds-color-base-gray-5: #747474; // Deprecated use $asu-gray-3 instead.
53+
$uds-color-base-gray-6: #484848; // Deprecated use $asu-gray-2 instead.
54+
$uds-color-base-gray-7: #191919; // Deprecated use $asu-gray-1 instead.
55+
// Deprecated-end
56+
$asu-gray-1: #191919; // Brand guideline ASU Gray 1 - Base font color and default black level
57+
$asu-gray-2: #484848; // Brand guideline ASU Gray 2
58+
$asu-gray-3: #747474; // Brand guideline ASU Gray 3
59+
$asu-gray-4: #bfbfbf; // Brand guideline ASU Gray 4
60+
$asu-gray-5: #d0d0d0; // Brand guideline ASU Gray 5
61+
$asu-gray-6: #e8e8e8; // Brand guideline ASU Gray 6
62+
$asu-gray-7: #fafafa; // Brand guideline ASU Gray 7
5463

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

6372
$uds-color-background-white: $uds-color-base-white; // Background - White
64-
$uds-color-background-gray: $uds-color-base-gray-2; // Background - Gray
65-
$uds-color-background-dark: $uds-color-base-gray-7; // Background - Dark
73+
$uds-color-background-gray: $asu-gray-6; // Background - Gray
74+
$uds-color-background-dark: $asu-gray-1; // Background - Dark
6675
$uds-color-background-success: #e9f5db; // Background - Success
6776
$uds-color-background-error: #f7dddd; // Background - Error
6877
$uds-color-background-warning: #ffeade; // Background - Warning
6978
$uds-color-background-info: #d6f0fa; // Background - Information
7079

71-
$uds-color-font-dark-base: $uds-color-base-gray-7; // Default text color on light background
80+
$uds-color-font-dark-base: $asu-gray-1; // Default text color on light background
7281
$uds-color-font-dark-error: #FF7B7D; // Error text on dark background
7382
$uds-color-font-dark-success: #446d12; // Success text on dark background
74-
$uds-color-font-light-base: $uds-color-base-gray-1; // Default text on dark background
83+
$uds-color-font-light-base: $asu-gray-7; // Default text on dark background
7584
$uds-color-font-light-link: $uds-color-base-gold; // Link text on dark background
7685
$uds-color-font-light-visited: $uds-color-base-darkgold; // Visited link text on dark background
7786
$uds-color-font-light-info: #00b0f3; // Information text on dark background

packages/unity-bootstrap-theme/src/scss/extends/_alerts.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
div[class='alert alert-block'] {
5959
/* Catch-all for default alert class */
6060
background-color: $uds-color-background-gray;
61-
border-color: $uds-color-base-gray-3;
61+
border-color: $asu-gray-5;
6262
}
6363

6464
// Media Queries

packages/unity-bootstrap-theme/src/scss/extends/_alt_styling.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
*/
55

66
// Mapping for Design Tokens
7-
$ws2-gray-darkest: $uds-color-base-gray-7;
8-
$ws2-gray-darker: $uds-color-base-gray-6;
9-
$ws2-gray-dark: $uds-color-base-gray-5;
10-
$ws2-gray: $uds-color-base-gray-4;
11-
$ws2-gray-light: $uds-color-base-gray-3;
12-
$ws2-gray-lighter: $uds-color-base-gray-2;
13-
$ws2-gray-lightest: $uds-color-base-gray-1;
7+
$ws2-gray-darkest: $asu-gray-1;
8+
$ws2-gray-darker: $asu-gray-2;
9+
$ws2-gray-dark: $asu-gray-3;
10+
$ws2-gray: $asu-gray-4;
11+
$ws2-gray-light: $asu-gray-5;
12+
$ws2-gray-lighter: $asu-gray-6;
13+
$ws2-gray-lightest: $asu-gray-7;
1414

1515
// Custom variables (semantic renaming, mapping, etc.)
1616
$the-base: 16px;

packages/unity-bootstrap-theme/src/scss/extends/_anchor-menu.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.uds-anchor-menu {
22
background-color: white;
3-
border-bottom: 1px solid $uds-color-base-gray-3;
3+
border-bottom: 1px solid $asu-gray-5;
44
z-index: 100;
55

66
&-wrapper {
@@ -47,14 +47,14 @@
4747
}
4848

4949
.nav-link {
50-
color: $uds-color-base-gray-7;
50+
color: $asu-gray-1;
5151
padding: $uds-size-spacing-3 0;
5252
padding-left: 0.5rem;
5353
text-align: start;
5454
font-weight: 400;
5555

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

6060
&:hover,
@@ -64,11 +64,11 @@
6464
}
6565

6666
&:visited {
67-
color: $uds-color-base-gray-7;
67+
color: $asu-gray-1;
6868
}
6969

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

7474
svg {
@@ -80,7 +80,7 @@
8080
}
8181

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

8585
.uds-anchor-menu-wrapper {
8686
flex-direction: row;

packages/unity-bootstrap-theme/src/scss/extends/_back-to-top-buttton.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.uds-back-to-top-button {
22
align-items: center;
3-
background-color: $uds-color-base-gray-5;
3+
background-color: $asu-gray-3;
44
border: none;
55
bottom: 50%;
66
color: $uds-color-base-white;

packages/unity-bootstrap-theme/src/scss/extends/_backgrounds.scss

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,36 @@
22
height: 322px;
33
}
44

5-
.gray-7-bg {
6-
background: $uds-color-base-gray-7;
5+
.gray-7-bg, .gray-dark-bg {
6+
background: $asu-gray-1;
77
}
88

9-
.gray-2-bg {
10-
background: $uds-color-base-gray-2;
9+
.text-gray-dark-bg {
10+
background-color: $asu-gray-1;
11+
color: $asu-gray-7;
1112
}
1213

13-
.gray-1-bg {
14-
background: $uds-color-base-gray-1;
14+
.gray-2-bg, .gray-light-bg {
15+
background: $asu-gray-6;
16+
}
17+
18+
.text-gray-light-bg {
19+
background-color: $asu-gray-6;
20+
color: $asu-gray-1;
21+
}
22+
23+
.gray-1-bg, .gray-faint-bg {
24+
background: $asu-gray-7;
25+
}
26+
27+
.text-gray-faint-bg {
28+
background-color: $asu-gray-7;
29+
color: $asu-gray-1;
1530
}
1631

1732
.white-bg {
1833
background: $uds-color-base-white;
19-
border: 1px solid $uds-color-base-gray-3;
34+
border: 1px solid $asu-gray-5;
2035
}
2136

2237
.image-bg {
@@ -45,9 +60,9 @@
4560
}
4661

4762
.content-description-container {
48-
background-color: $uds-color-base-gray-1;
63+
background-color: $asu-gray-7;
4964
width: 100%;
50-
border: 1px solid $uds-color-base-gray-3;
65+
border: 1px solid $asu-gray-5;
5166
margin-top: 16px;
5267
}
5368

@@ -56,11 +71,11 @@
5671
flex-direction: column;
5772
align-items: center;
5873
justify-content: center;
59-
border: 1px dashed $uds-color-base-gray-5;
74+
border: 1px dashed $asu-gray-3;
6075
height: 251px;
6176
margin: 20px 0 100px 0;
6277
font-size: 50px;
63-
color: $uds-color-base-gray-3;
78+
color: $asu-gray-5;
6479
}
6580

6681
.bg {

packages/unity-bootstrap-theme/src/scss/extends/_blockquotes.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ blockquote:before {
5252

5353
svg {
5454
grid-column: 1;
55-
fill: $uds-color-base-gray-7;
55+
fill: $asu-gray-1;
5656
width: $uds-size-spacing-5;
5757
height: auto;
5858
}
@@ -251,7 +251,7 @@ blockquote:before {
251251
&:before {
252252
content: '';
253253
display: block;
254-
background-color: $uds-color-base-gray-7;
254+
background-color: $asu-gray-1;
255255
height: $uds-size-spacing-half;
256256
width: $uds-size-spacing-9;
257257
margin: $uds-size-spacing-2 0;

packages/unity-bootstrap-theme/src/scss/extends/_breadcrumb.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
& {
33
padding-left: 0;
44
}
5-
&.bg-gray-7 {
5+
&.bg-gray-7, &.gray-dark-bg {
66
a {
77
color: $uds-color-base-gold;
88
}
99
li.active {
1010
&, a {
11-
color: $uds-color-base-gray-1;
11+
color: $asu-gray-7;
1212
}
1313
}
1414
}

0 commit comments

Comments
 (0)