Skip to content

Commit

Permalink
Merge pull request #12 from byuweb/ringside-switch
Browse files Browse the repository at this point in the history
Ringside switch
  • Loading branch information
blakemorgan authored Oct 11, 2018
2 parents bf0f94c + 3c2031f commit ed93353
Show file tree
Hide file tree
Showing 15 changed files with 5,261 additions and 2,877 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
font-size: 1.5em;
font-weight: bold;
color: #002e5d;
font-family: "Vitesse A", "Vitesse B", Georgia, serif;
font-family: "HCo Ringside Narrow SSm", Arial Narrow, sans-serif;
margin: 0;
}

Expand All @@ -109,7 +109,7 @@
@mixin rootBase() {
background-color: #FFFFFF;
color: #515151;
font-family: "Gotham Book", Helvetica, sans-serif;
font-family: "HCo Ringside Narrow SSm", Arial Narrow, sans-serif;
font-weight: 200;
line-height: 20px;
margin: 24px auto 24px auto;
Expand All @@ -128,7 +128,7 @@

@mixin rootSlottedH2() {
color: #002E5D;
font-family: "Vitesse A","Vitesse B",Georgia,serif;
font-family: "HCo Ringside Narrow SSm", Arial Narrow, sans-serif;
margin: 0px 0px 0px 0px;
}

Expand Down
10 changes: 5 additions & 5 deletions components/byu-faculty-profile/byu-faculty-profile-common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
@mixin card() {
background-color: #FFFFFF;
color: #515151;
font-family: "Gotham", Helvetica, sans-serif;
font-family: "HCo Ringside Narrow SSm", Arial Narrow, sans-serif;
font-weight: 200;
line-height: 20px;
margin: 20px auto 20px auto;
Expand Down Expand Up @@ -104,15 +104,15 @@
color: #002e5d;
margin: 0;
font-size: 1.17em;
font-family: "Gotham", Helvetica, sans-serif;
font-family: "HCo Ringside Narrow SSm", Arial Narrow, sans-serif;
font-weight: 600;
line-height: 20px;
}

@mixin content() {
align-content: center;
color: #FFFFFF;
font-family: "Gotham A", "Gotham B", Helvetica, sans-serif;
font-family: "HCo Ringside Narrow SSm", Arial Narrow, sans-serif;
font-weight: 500;
line-height: 24px;
margin: auto;
Expand Down Expand Up @@ -168,13 +168,13 @@
}

@mixin rootBaseSlotted() {
font-family: "Vitesse A", "Vitesse B", Georgia,serif;
font-family: "HCo Ringside Narrow SSm", Arial Narrow, sans-serif;
margin: 0px 0px 8px 0px;
font-weight: 500;
}

@mixin rootBaseSlottedDiv() {
font-family: "Vitesse A", "Vitesse B", Georgia,serif;
font-family: "HCo Ringside Narrow SSm", Arial Narrow, sans-serif;
margin: 0px 0px 8px 0px;
font-weight: 500;
display: block;
Expand Down
4 changes: 2 additions & 2 deletions demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>byu-faculty-directory Demo</title>

<link type="text/css" rel="stylesheet" href="//cloud.typography.com/75214/6517752/css/fonts.css" media="all" />
<link type="text/css" rel="stylesheet" href="https://cdn.byu.edu/theme-fonts/1.x.x/ringside/fonts.css" media="all" />
<link rel="stylesheet" href="https://cdn.byu.edu/byu-theme-components/latest/byu-theme-components.min.css" />
<script async src="https://cdn.byu.edu/byu-theme-components/latest/byu-theme-components.min.js"></script>
<link rel="stylesheet" href="dist/byu-faculty-directory.min.css">
Expand All @@ -39,7 +39,7 @@
.faculty-listing-header {
background-color: #FFFFFF;
color: #002E5D;
font-family: "Vitesse A", "Vitesse B", Helvetica, sans-serif;
font-family: "HCo Ringside Narrow SSm", "Arial Narrow", Arial, sans-serif;
font-weight: 500;
margin: 24px auto 24px auto;
min-width: 250px;
Expand Down
2 changes: 1 addition & 1 deletion dist/byu-faculty-directory.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/byu-faculty-directory.min.css.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/components-compat.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/components-compat.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/components-compat.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/components-compat.min.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/components.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/components.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/components.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/components.min.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit ed93353

Please sign in to comment.