diff --git a/css/ebi-css-build/_ebi_masthead_styles.scss b/css/ebi-css-build/_ebi_masthead_styles.scss index 1ffe79a49be80fa5329030d2b7568933df1cf0b9..6e2b4143ed77e10a7f9a06862c2bd07ad9ba5cc0 100644 --- a/css/ebi-css-build/_ebi_masthead_styles.scss +++ b/css/ebi-css-build/_ebi_masthead_styles.scss @@ -8,7 +8,7 @@ .masthead { // underline links in the textual area of the local masthead #local-title .columns { - a { border-bottom: 1px dotted rgb(255,255,255); } + a { border-bottom: 1px dotted $masthead-font-color; } a.button, a:hover { border-bottom: none; } } @@ -60,7 +60,7 @@ li a:focus, li.active a, li.active-trail a { - color: #fff; + color: $ebi-colour-white; border-bottom: none; background-color: #000; // margin-left: 3px; @@ -253,6 +253,7 @@ background-repeat: no-repeat; background-position: 100% 82%; background-size: cover; + background-color: $masthead-background; // triangle svg background background-image: url('data:image/svg+xml;charset=UTF-8,<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="147 248 60 248" xml:space="preserve"><polygon class="st0" fill="#000" fill-opacity="0.05" points="147,363.6 259.3,363.6 259.3,428.4 203.2,460.9 147,428.4 "/></svg>'); @@ -266,7 +267,7 @@ h4, p, a, a:hover, a:focus, a:active, a:visited { - color: #fff; + color: $masthead-font-color; } ul li a { border-bottom: 0; @@ -274,16 +275,23 @@ ul li.is-active a, ul li a:hover, nav ul li a.hover, - nav ul li a:hover { background-color: rgba(0,0,0,.9); color: $ebi-colour-light; } + nav ul li a:hover { + background-color: rgba($ebi-colour-dark,.9); + color: color-pick-contrast($masthead-font-color, $ebi-colour-light $ebi-colour-dark, 30%); + } nav ul li.active a, nav ul li a:active, ul li.active-trail a, ul li.active a:visited, - ul li.active-trail a:visited { background-color: rgba(255,255,255,1); color: #444;border-bottom: 0;} + ul li.active-trail a:visited { + background-color: color-pick-contrast($masthead-background, $ebi-colour-dark $ebi-colour-light, 30%); + color: $masthead-background; + border-bottom: 0; + } nav { clear: both; } - nav ul.menu li { border-right: 1px solid $ebi-colour-light; float: left; + nav ul.menu li { border-right: 1px solid $masthead-font-color; float: left; margin-left: 0; /* compliance compatibility */ } nav ul.menu li:last-child, diff --git a/css/ebi-css-build/_ebi_theme_settings.scss b/css/ebi-css-build/_ebi_theme_settings.scss index cd090b61bae7278250fa93796e9357edad552ea0..b76aefabc160db54a3391ebab8d0384fbc7c5ef2 100644 --- a/css/ebi-css-build/_ebi_theme_settings.scss +++ b/css/ebi-css-build/_ebi_theme_settings.scss @@ -44,6 +44,10 @@ $code-font-family: 'Fira Code', Consolas, 'Liberation Mono', Courier, monospace; $table-font-family: $code-font-family; $table-font-size: 0.9rem; +// masthead +$masthead-background: $secondary-color; +$masthead-font-color: $body-background; + // Set foundation colours $foundation-palette: ( primary: $primary-color, diff --git a/css/ebi-css-build/_ebi_utility_styles.scss b/css/ebi-css-build/_ebi_utility_styles.scss index b6eae6c9f3f56c9047aab4e89e0bfaedf2a97dd6..251f1eec2dc4c8888c06ebc193e2b56dc1bc6df2 100644 --- a/css/ebi-css-build/_ebi_utility_styles.scss +++ b/css/ebi-css-build/_ebi_utility_styles.scss @@ -7,7 +7,6 @@ .font-code { font-family: $code-font-family; } .font-serif, .serif { font-family: $body-font-family-serif; } .font-sans-serif, .sans-serif { font-family: $body-font-family; } - // .serif .sans-serif { font-size: 1rem; } // reset font size when nesting .block { display: block; } .clear { clear: both; }