Merge branch 'dev' into upgrade/bootstrap-43

This commit is contained in:
Brenda Wallace
2019-07-05 10:05:44 +12:00
committed by GitHub
2 changed files with 0 additions and 32 deletions

View File

@@ -43,23 +43,6 @@ $dark: (
light: lighten($brown, 20%)
);
// $font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif;
// $font-family-serif: Georgia, "Times New Roman", Times, serif;
// $font-family-mono: Monaco, Menlo, Consolas, "Courier New", monospace;
// $font-size-base: 14px;
// $font-family-base: $font-family-sans-serif;
// $line-height-base: 1.5;
// $alt-font-family: $font-family-serif;
// $headings-font-family: $font-family-sans-serif;
// $headings-font-weight: bold;
// $headings-color: inherit;
// // Hero unit
// $jumbotron-bg: darken($body-bg, 10%);
// Nav bar
$navbar-default-bg: $brown;
$navbar-default-bg-highlight: $brown;
@@ -69,10 +52,4 @@ $navbar-default-link-hover-color: $beige;
$navbar-default-link-active-color: darken($beige, 80%);
$navbar-default-brand-color: lighten($green, 20%);
// // Top nav collapse threshold
// $dropdown-link-color: $brown;
// $dropdown-link-hover-color: $brown;
// $dropdown-link-hover-bg: lighten($green, 50%);
$highest-level: 1070;

View File

@@ -69,15 +69,6 @@ h3 {
}
}
}
.navbar .navbar-form {
// padding-top: 0;
// padding-bottom: 0;
// margin-right: 0;
// margin-left: 15px;
// border: 0;
// -webkit-box-shadow: none;
// box-shadow: none;
}
.index-cards {
display: flex;