Skip to content

Commit

Permalink
Merge pull request #6 from byuweb/bug-fixes
Browse files Browse the repository at this point in the history
Bug fixes
  • Loading branch information
blakemorgan authored Nov 14, 2018
2 parents 7aa4f77 + e821839 commit 82eb0ba
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 78 deletions.
50 changes: 13 additions & 37 deletions css/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/style.css.map

Large diffs are not rendered by default.

28 changes: 21 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 6 additions & 33 deletions scss/_byu_default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,6 @@ byu-menu a:hover, .nav > li > a:hover, .nav > li > a:focus {
font-family: 'Roboto', sans-serif;
}

p {
color: $darkestgray;
}

[slot="site-title"] p, [slot="site-title"] span, [slot="site-title"] div, [slot="site-title"] a,
#site-title p,
#site-title span,
Expand All @@ -115,25 +111,6 @@ p {
font-style: italic;
}

byu-header[mobile-view] [slot="actions"] a {
color: $navy;
font-weight: 500;
}

byu-header[mobile-view] [slot="actions"] p {
padding-bottom: 0;
margin: 0;
}

[slot="actions"] div,
[slot="actions"] p {
padding-bottom: 0;
margin: 0 15px;
}
[slot="actions"] a:hover {
text-decoration: none;
}

[slot="actions"].royal div.block {
margin: 0 10px;
padding: 2px;
Expand Down Expand Up @@ -312,10 +289,12 @@ byu-menu {
}

.main {
@media screen and (min-width: 769px) {
padding: 35px 30px 30px;
margin-left: auto;
margin-right: auto;
padding: 35px 30px 30px;
margin-left: auto;
margin-right: auto;

@media screen and (min-width: 1024px) {
padding-top: 70px;
}

&.no-min-height {
Expand Down Expand Up @@ -510,12 +489,6 @@ h1, h2, h3, h4, h5 {
color: $darkestgray;
}

@media screen and (max-width: 1200px) {
.main{
margin: 0 16px;
}
}



/* ------------- Do NOT make custom changes here - if you do they will be overridden when you update the theme.
Expand Down

0 comments on commit 82eb0ba

Please sign in to comment.