diff --git a/themes/finc/scss/_customMixins.scss b/themes/finc/scss/_customMixins.scss index 2dd5bb11a874f29b0ebc1148047a4d3293e96abf..b511a3e60b4bb88632453e18cca574ad0a7ff279 100644 --- a/themes/finc/scss/_customMixins.scss +++ b/themes/finc/scss/_customMixins.scss @@ -22,8 +22,8 @@ margin: 1.5em auto; } -// Outline Mixin -- overwrites BS outline mixin in partials/mixin -@mixin outline($size: 1px, $color: $outline-default-color, $style: $outline-default-style) { +// Outline Mixin -- complements BS outline mixin in partials/mixin but does not rewrite it +@mixin outline($size: $outline-default-size-finc, $color: $outline-default-color-finc, $style: $outline-default-style-finc) { outline: $style $size $color; } diff --git a/themes/finc/scss/_customVariables.scss b/themes/finc/scss/_customVariables.scss index 7e8f50e0377c76cc2ecb663b8d7afc0445705e1a..29bdd7bb4c4dd89e9cf6d91289b3e4d5242021a1 100644 --- a/themes/finc/scss/_customVariables.scss +++ b/themes/finc/scss/_customVariables.scss @@ -115,9 +115,10 @@ $border-default-white: 1px solid $white !default; $border-right-width: 1px !default; $margin-right-width: inherit !default; -//// Outlines (focus, accessibility etc.) -- overwrites BS values -$outline-default-style: solid !default; -$outline-default-color: $brand-warning !default; +//// Outlines (focus, accessibility etc.) -- complements similar BS values +$outline-default-color-finc: $black !default; +$outline-default-size-finc: 1px !default; +$outline-default-style-finc: solid !default; //// PAGER $pagination-disabled-color: $gainsboro !default; @@ -295,14 +296,6 @@ $button-top-padding: 6px; //// and the '.narrow-toggle ...' in compiled.scss $narrow-toggle-text-alignment: left !default; -//// Pagination (Search results) AND searchtools (Search results) -//// Default is left, we use centered alignment. If left is desired, -//// comment out next mixing and '.pagination ...' and 'searchtools ...' in compiled.scss -@mixin content-centered-display-as-table { - display: table; - margin: 1.5em auto; -} - // ALIGNMENTS - END // FUNCTIONS diff --git a/themes/finc/scss/compiled.scss b/themes/finc/scss/compiled.scss index 02f339e2d13c012c0107b8fb9f4a3a525254533a..f225ac9b883d6d17fb55761d494c0673d47fdc47 100644 --- a/themes/finc/scss/compiled.scss +++ b/themes/finc/scss/compiled.scss @@ -10,7 +10,6 @@ // ------------------------------------------------------- // 1. Define or re-define KEY VARIABLES and MIXINS (see 1.1 ff below) OR import your own @import 'customVariables'; -@import 'customMixins'; // ------------------------------------------------------- // 1.1 Unless imported, define standard colour variables here which are used in variables below prior to finc.scss import // e.g. $brand-primary: #083152 !default; // blue @@ -41,6 +40,7 @@ // 3. import entire BS (finc) OR import (instances) finc compiled.scss to have variables and mixins defined above applied to it @import '../../finc-accessibility/scss/compiled'; // @import '../../finc/scss/compiled.scss' +@import 'customMixins'; // ------------------------------------------------------- // 4. Customize further - this for BASIC SETTINGS ONLY - all colour customization will be done in in site-specific themes // ATTENTION: any change made here will affect ALL subsequent branches !!! @@ -1639,7 +1639,7 @@ header, } &:hover { - @include outline(1px); + @include outline(); outline-offset: -2px; } @@ -2192,7 +2192,7 @@ footer { //// Harmonize behaviour to the edit button .result-links .dropdown-toggle { &:focus { - outline: 1px dotted $black; // FIXME: REPLACE with variable, consider using '$input-border-focus' + outline: 1px dotted $black; // FIXME: REPLACE with variable, consider using '$input-border-focus' } } @@ -2733,7 +2733,7 @@ body:not(.offcanvas) .sidebar { &:not(.active-filters) .title { &:hover, &:focus { - @include outline(1px); + @include outline(); background-color: $button-title-hover-bg; } } @@ -2953,7 +2953,7 @@ footer ul { } a:hover { - @include outline(1px); + @include outline(); } }