Skip to content

Commit

Permalink
Merge pull request #361 from ASUWebPlatforms/ws2-2-8-0-theme-compile
Browse files Browse the repository at this point in the history
ws2 theme compilation
  • Loading branch information
bebaps authored Dec 12, 2022
2 parents fc8061c + 0be479b commit ddb0087
Show file tree
Hide file tree
Showing 9 changed files with 79 additions and 10 deletions.
2 changes: 1 addition & 1 deletion assets/css/renovation.style.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/sass/design-tokens/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Do not edit directly
// Generated on Thu, 12 May 2022 11:42:45 GMT
// Generated on Mon, 12 Dec 2022 22:53:00 GMT

$uds-asset-font-icon-name: "FontAwesome";
$uds-asset-font-icon-ttf: "assets/fontawesome/webfonts/fa-regular-400.ttf";
Expand Down
4 changes: 4 additions & 0 deletions src/sass/extends/_anchor-menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@

svg {
margin-left: $uds-size-spacing-1;
margin-right: $uds-size-spacing-1;
margin-top: 0.35rem;
transform: rotate(0deg);
}

Expand All @@ -47,6 +49,7 @@
.nav-link {
color: $uds-color-base-gray-7;
padding: $uds-size-spacing-3 0;
padding-left: 0.5rem;
text-align: start;
font-weight: 400;

Expand All @@ -67,6 +70,7 @@
svg {
width: 2rem !important;
margin-right: $uds-size-spacing-1;
margin-left: -0.5rem;
}
}
}
Expand Down
4 changes: 0 additions & 4 deletions src/sass/extends/_backgrounds.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@
max-width: 1920px;
}

.center-container {
margin: 0 auto;
}

.content-description-container {
background-color: $uds-color-base-gray-1;
width: 100%;
Expand Down
6 changes: 6 additions & 0 deletions src/sass/extends/_breadcrumb.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,9 @@
}
}
}
// WS2-1036 and UDS-1129 hide breadcrumb on mobile
@media screen and (max-width: $uds-breakpoint-sm) {
.breadcrumb {
display: none;
}
}
5 changes: 5 additions & 0 deletions src/sass/extends/_cards.scss
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,11 @@ Cards - Table of Contents
background-color: $uds-color-base-gray-2;
}

h3 {
font-size: 1.25rem;
}

h3,
h4,
h5 {
margin: 0;
Expand Down
61 changes: 60 additions & 1 deletion src/sass/extends/_heroes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ div[class^='uds-hero'] {
.btn {
white-space: normal;
&:last-child {
margin-top: $uds-size-spacing-1;
margin-top: $uds-size-spacing-1;

& + .btn {
margin-left: 0;
Expand All @@ -142,6 +142,11 @@ div[class^='uds-hero'] {
&.hide-content .content {
display: none;
}

&.uds-video-hero video,
&.uds-video-hero .video-hero-controls {
display: none;
}
}

div.uds-hero-sm,
Expand Down Expand Up @@ -306,6 +311,60 @@ div.uds-hero-lg {
.btn-row {
max-width: calc(940px - 34%);
}

&.uds-video-hero {
.hero {
display: none;
}

&.uds-video-hero video {
display: block;
grid-row: 1 / span 6;
grid-column: 1 / span 3;
z-index: 30;
height: 100%;
min-height: 100%;
position: absolute;
top: 0;
left: 50%;
transform: translateX(-50%);
width: 100%;
object-fit: cover;
}

.video-hero-controls {
display: block;
position: relative;
z-index: 40;
grid-column: 2;
grid-row: 6;
align-self: end;
justify-self: flex-end;
top: -3rem;

.btn-circle-large {
width: 56px !important;
height: 56px !important;
font-size: 16px !important;
opacity: 0.3 !important;

&:hover {
opacity: 1 !important;
cursor: pointer;
transform: none;
}

.svg-inline--fa.fa-w-14 {
margin-left: 0 !important;
}
}

#playHeroVid {
// The play button starts as hidden as the video autoplays upoon page load.
display: none;
}
}
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/sass/extends/_sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ $nav-item-min-height: 3rem;
width: 100%;
background-color: $uds-color-base-gold;
text-decoration: none;
bottom: -0.7rem;
bottom: -0.76rem;
left: 50%;
transform: translateX(-50%);
}
Expand Down
3 changes: 1 addition & 2 deletions src/sass/extends/_tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
font-size: 1rem;
text-align: left;
padding: 1rem;
max-width: 700px;
}

tr {
Expand Down Expand Up @@ -38,8 +39,6 @@
background-color: white;

p {
display: flex;
align-items: center;
margin-bottom: 0;
}
}
Expand Down

0 comments on commit ddb0087

Please sign in to comment.