updated SCSS to match BS4 LESS

This commit is contained in:
David Miller 2017-03-01 12:08:56 -05:00
parent de8e9600d1
commit 1cd2fada7e
2 changed files with 66 additions and 104 deletions

View File

@ -5,9 +5,9 @@
$theme-primary: #fed136; $theme-primary: #fed136;
$theme-danger: #e74c3c; $theme-danger: #e74c3c;
$gray-base: #000 !default; $gray-base: #000 !default;
$gray-darker: lighten($gray-base, 13.5%) !default; // #222 $gray-darker: lighten($gray-base, 13.5%) !default; // #222
$gray-dark: lighten($gray-base, 20%) !default; // #333 $gray-dark: lighten($gray-base, 20%) !default; // #333
$gray: lighten($gray-base, 33.5%) !default; // #555 $gray: lighten($gray-base, 33.5%) !default; // #555
$gray-light: lighten($gray-base, 46.7%) !default; // #777 $gray-light: lighten($gray-base, 46.7%) !default; // #777
$gray-lighter: lighten($gray-base, 93.5%) !default; // #eee $gray-lighter: lighten($gray-base, 93.5%) !default; // #eee

View File

@ -8,40 +8,22 @@ body {
@include body-font; @include body-font;
} }
.text-muted {
color: $gray-light;
}
.text-primary { .text-primary {
color: $theme-primary !important; color: $theme-primary !important;
} }
p { p {
font-size: 14px;
line-height: 1.75; line-height: 1.75;
} }
p.large {
font-size: 16px;
}
a,
a:hover,
a:focus,
a:active,
a.active {
outline: none;
}
a { a {
color: $theme-primary; color: $theme-primary;
} &:hover,
&:focus,
a:hover, &:active,
a:focus, &.active {
a:active, color: darken($theme-primary, 10%);
a.active { }
color: darken($theme-primary, 10%);
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
@ -49,18 +31,6 @@ h1, h2, h3, h4, h5, h6 {
font-weight: 700; font-weight: 700;
} }
.img-centered {
margin: 0 auto;
}
.bg-light-gray {
background-color: $gray-lighter;
}
.bg-darkest-gray {
background-color: $gray-darker;
}
// Restyled Primary Buttons // Restyled Primary Buttons
.btn-primary { .btn-primary {
@ -80,62 +50,51 @@ h1, h2, h3, h4, h5, h6 {
// Custom Navigation Bar // Custom Navigation Bar
.navbar-custom { #mainNav {
background-color: $gray-darker; background-color: $gray-darker;
border-color: transparent; .navbar-toggler {
.navbar-brand { border: 0;
color: $theme-primary;
@include script-font;
&:hover,
&:focus,
&:active,
&.active {
color: darken($theme-primary, 10%);
}
}
.navbar-collapse {
border-color: fade-out(white, .02);
}
.navbar-toggle {
background-color: $theme-primary;
border-color: $theme-primary;
@include heading-font;
color: white; color: white;
background-color: $theme-primary;
font-size: 12px; font-size: 12px;
&:hover, text-transform: uppercase;
&:focus { @include heading-font;
background-color: $theme-primary; padding: 13px;
} right: 0;
} }
.nav { .container {
li { padding: 0;
a { .navbar-brand {
@include heading-font; color: $theme-primary;
font-weight: 400; @include script-font;
letter-spacing: 1px; &:hover,
color: white; &:focus,
&:hover, &:active,
&:focus { &.active {
color: $theme-primary; color: darken($theme-primary, 10%);
outline: none; }
}
.navbar-nav {
.nav-item {
.nav-link {
font-size: 90%;
padding: 0.75em 0;
@include heading-font;
font-weight: 400;
letter-spacing: 1px;
color: white;
&:hover,
&.active {
color: $theme-primary;
}
} }
} }
} }
} }
.navbar-nav>.active>a {
border-radius: 0;
color: white;
background-color: $theme-primary;
}
.navbar-nav>.active>a:hover,
.navbar-nav>.active>a:focus {
color: white;
background-color: darken($theme-primary, 10%);
}
} }
@media(min-width:768px) { @media(min-width:992px) {
.navbar-custom { #mainNav {
background-color: transparent; background-color: transparent;
padding: 25px 0; padding: 25px 0;
-webkit-transition: padding 0.3s; -webkit-transition: padding 0.3s;
@ -143,25 +102,25 @@ h1, h2, h3, h4, h5, h6 {
transition: padding 0.3s; transition: padding 0.3s;
border: none; border: none;
.navbar-brand { .navbar-brand {
font-size: 2em; font-size: 1.75em;
-webkit-transition: all 0.3s; -webkit-transition: all 0.3s;
-moz-transition: all 0.3s; -moz-transition: all 0.3s;
transition: all 0.3s; transition: all 0.3s;
} }
.navbar-nav>.active>a { .navbar-nav {
border-radius: 3px; .nav-item {
.nav-link {
padding: 1.1em 1em !important;
}
}
} }
} &.navbar-shrink {
} background-color: $gray-darker;
padding: 0;
// Navbar Change on Scroll .navbar-brand {
padding: 12px 0;
@media(min-width:768px) { font-size: 1.25em;
.navbar-custom.affix { }
background-color: $gray-darker;
padding: 10px 0;
.navbar-brand {
font-size: 1.5em;
} }
} }
} }
@ -511,7 +470,8 @@ section {
text-align: center; text-align: center;
margin-bottom: 50px; margin-bottom: 50px;
img { img {
margin: 0 auto; height: 225px;
width: 225px;
border: 7px solid white; border: 7px solid white;
} }
h4 { h4 {
@ -590,11 +550,13 @@ footer {
padding: 25px 0; padding: 25px 0;
text-align: center; text-align: center;
span.copyright { span.copyright {
font-size: 90%;
line-height: 40px; line-height: 40px;
@include heading-font; @include heading-font;
text-transform: none; text-transform: none;
} }
ul.quicklinks { ul.quicklinks {
font-size: 90%;
margin-bottom: 0; margin-bottom: 0;
line-height: 40px; line-height: 40px;
@include heading-font; @include heading-font;
@ -640,7 +602,7 @@ ul.social-buttons {
.modal-dialog{ .modal-dialog{
margin: 0; margin: 0;
height: 100%; height: 100%;
width: auto; max-width: none;
} }
.modal-content { .modal-content {
border-radius: 0; border-radius: 0;