diff --git a/assets/css/main.css b/assets/css/main.css index 06cf068..bb78221 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -20,6 +20,11 @@ p { margin-top: 0; line-height: 1.5em; } +a { + color: #2da301; } + a:active, a:hover { + color: #1f7001; } + main div.container { margin-top: 10px; } @media (min-width: 992px) { diff --git a/assets/css/main.css.map b/assets/css/main.css.map index ff174ba..b8a78d6 100644 Binary files a/assets/css/main.css.map and b/assets/css/main.css.map differ diff --git a/assets/css/templates/photo.css b/assets/css/templates/photo.css index 977269d..4e9d7f0 100644 --- a/assets/css/templates/photo.css +++ b/assets/css/templates/photo.css @@ -6,9 +6,9 @@ body { color: #fff; } a { - color: #108ffd; } + color: #34bc01; } a:active, a:hover { - color: #75bffe; } + color: #42ef01; } @media (min-width: 544px) { nav ul.nav.main { diff --git a/assets/css/templates/photo.css.map b/assets/css/templates/photo.css.map index d60cf23..26133af 100644 Binary files a/assets/css/templates/photo.css.map and b/assets/css/templates/photo.css.map differ diff --git a/assets/scss/_mainvariables.scss b/assets/scss/_mainvariables.scss index ca659b2..bcc55e8 100644 --- a/assets/scss/_mainvariables.scss +++ b/assets/scss/_mainvariables.scss @@ -1,8 +1,23 @@ -$fontcolor: #000; +$color_font: #000; +$color_bg: #fff; +$color_base: #1779ff; +$color_accent: #2da301; + +$link_color: $color_accent; +$link_active: darken($color_accent, 10%); + $col_xxs_bp: 543px; -$nav_bgColor: #1779ff; +$nav_bgColor: $color_base; $nav_borderColor: darken($nav_bgColor, 15%); $nav_fgColor: #fff; $nav_textXsWidth: 80px; $nav_textSmWidth: 109px; + +$footer_color_bg: #bebebe; + + +$color_bg_inv: #424242; +$color_font_inv: #fff; +$link_color_inv: lighten($color_accent, 5%); +$link_active_inv: lighten($color_accent, 15%); diff --git a/assets/scss/main.scss b/assets/scss/main.scss index 763137d..bf4264e 100644 --- a/assets/scss/main.scss +++ b/assets/scss/main.scss @@ -26,6 +26,12 @@ p { margin-top: 0; line-height: 1.5em; } +a { + color: $link_color; + &:active, &:hover { + color: $link_active; + } +} main div.container { margin-top: 10px; @@ -96,7 +102,7 @@ nav { a.active { color: $nav_fgColor; - border-bottom: 4px solid #2da301; + border-bottom: 4px solid $color_accent; padding-bottom: 1px; } } @@ -110,7 +116,7 @@ nav { color: $nav_bgColor; a.active { color: $nav_fgColor; - border-bottom: 4px solid #2da301; + border-bottom: 4px solid $color_accent; padding-bottom: 1.5px; } } @@ -120,7 +126,7 @@ nav { background-color: $nav_bgColor; } a.active { - border-bottom: 4px solid #2da301; + border-bottom: 4px solid $color_accent; padding-bottom: 1.5px; } } @@ -169,8 +175,8 @@ footer { padding-top: 20px; padding-bottom: 20px; - background-color: #bebebe; - color: $fontcolor; + background-color: $footer_color_bg; + color: $color_font; p { margin-bottom: 0; @@ -184,7 +190,7 @@ footer { } i.fa { - color: $fontcolor; + color: $color_font; font-size: $footer_logoHeight; padding-right: 0.2em; } diff --git a/assets/scss/templates/photo.scss b/assets/scss/templates/photo.scss index 37b5ded..edd5717 100644 --- a/assets/scss/templates/photo.scss +++ b/assets/scss/templates/photo.scss @@ -7,19 +7,15 @@ @import "../mainvariables"; - -$inv_bgColor: #424242; -$inv_fontcolor: #fff; - // change main.scss behavior - inverted color style body { - background-color: $inv_bgColor; - color: $inv_fontcolor; + background-color: $color_bg_inv; + color: $color_font_inv; } a { - color: lighten($link-color, 10%); + color: $link_color_inv; &:active, &:hover { - color: lighten($link-color, 30%); + color: $link_active_inv; } } @include media-breakpoint-up(sm) { @@ -30,8 +26,8 @@ a { } } footer { - background-color: darken($inv_bgColor, 7%); - color: darken($inv_fontcolor, 10%); + background-color: darken($color_bg_inv, 7%); + color: darken($color_font_inv, 10%); } diff --git a/assets/scss/templates/project.scss b/assets/scss/templates/project.scss index 38bec15..e0e23fb 100644 --- a/assets/scss/templates/project.scss +++ b/assets/scss/templates/project.scss @@ -7,7 +7,7 @@ @import "../mainvariables"; -// change main.scss behavior - inverted color style +// change main.scss behavior body { } diff --git a/assets/scss/templates/projects.scss b/assets/scss/templates/projects.scss index 41dc76a..0ce14dd 100644 --- a/assets/scss/templates/projects.scss +++ b/assets/scss/templates/projects.scss @@ -7,7 +7,7 @@ @import "../mainvariables"; -// change main.scss behavior - inverted color style +// change main.scss behavior body { }