From a0f8f0eb587c6d3671d0076bf9bcf6bb0c8d580f Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Wed, 24 Oct 2018 11:21:42 +0200 Subject: [PATCH] scss/typography: make link and selection use the palette And remove them from _colorize.scss --- css/style.css | 20 ++++++-------------- scss/_colorize.scss | 11 ----------- scss/_font-face.scss | 2 ++ scss/_typography.scss | 9 ++++++--- 4 files changed, 14 insertions(+), 28 deletions(-) diff --git a/css/style.css b/css/style.css index 7f220f1..a93aa14 100644 --- a/css/style.css +++ b/css/style.css @@ -25,6 +25,7 @@ * */ /* 2.1 - Font Face */ +/* 2.1.1 - OpenSans */ @font-face { font-family: 'OpenSans'; src: url("../fonts/OpenSans-Light-webfont.eot"); @@ -114,8 +115,10 @@ em { font-style: italic; } a { - color: #2484c1; + color: #4e63c9; text-decoration: none; } + a:hover, a:active { + color: #4e63c9; } p { padding: 0; @@ -143,11 +146,11 @@ ol { margin-left: 1.5em; } ::selection { - background: #2484c1; + background: #4e63c9; color: #fff; } ::-moz-selection { - background: #2484c1; + background: #4e63c9; color: #fff; } /* 2.2 - Text Wrapper */ @@ -617,17 +620,6 @@ a.list-group-item:hover { display: block; } /* ------------------ COULEURS ------------------- */ -a, a:hover, a:active { - color: #4e63c9; } - -::selection { - background-color: #4e63c9 !important; - color: #FFF; } - -::-moz-selection { - background-color: #4e63c9 !important; - color: #FFF; } - /* CARDS */ .card-blue > .card-header { background-color: #4e63c9; diff --git a/scss/_colorize.scss b/scss/_colorize.scss index 4624b9c..94b7e6d 100644 --- a/scss/_colorize.scss +++ b/scss/_colorize.scss @@ -43,17 +43,6 @@ color: $text-color; } -a, a:hover, a:active { - color: $color-link; -} - -::selection { - @include background-color($color-selection, #FFF); -} -::-moz-selection { - @include background-color($color-selection, #FFF); -} - /* CARDS */ .card { diff --git a/scss/_font-face.scss b/scss/_font-face.scss index 0fee335..fb9d055 100644 --- a/scss/_font-face.scss +++ b/scss/_font-face.scss @@ -1,5 +1,7 @@ /* 2.1 - Font Face */ +/* 2.1.1 - OpenSans */ + @font-face { font-family: 'OpenSans'; src: url('../fonts/OpenSans-Light-webfont.eot'); diff --git a/scss/_typography.scss b/scss/_typography.scss index 982d0f9..3334bb2 100644 --- a/scss/_typography.scss +++ b/scss/_typography.scss @@ -38,8 +38,11 @@ em { } a { - color:#2484c1; + color: $color-link; text-decoration:none; + &:hover, &:active { + color: $color-link; + } } p { @@ -70,8 +73,8 @@ ol { } -::selection { background: #2484c1; color: #fff; } -::-moz-selection { background: #2484c1; color: #fff; } +::selection { background: $color-selection; color: #fff; } +::-moz-selection { background: $color-selection; color: #fff; } /* 2.2 - Text Wrapper */