Merge remote-tracking branch 'origin/finc' into instance/fid

themes/finc/scss/_customVariables.scss

@@ -68,6 +68,20 @@ $pagination-disabled-color: $default-disabled-color !default;
 // *****************************************************************
 // ************ General dimensions *********************************
 // *****************************************************************
+
+// WCAG 2.1 for AA requires a minimum viewport size of 320px
+// -- we therefore need to define the corresponding variables
+// The most common viewport width for narrow devices however, seems to be 360px
+// Please note, that $screen-xs-min = $screen-xs = 480px
+$screen-wcag-mini-viewports-min: 320px !default;
+$screen-wcag-above-mini-below-xs-viewports-min: 360px !default;
+$screen-wcag-mini-viewports-max: $screen-wcag-above-mini-below-xs-viewports-min - 1px !default;
+$screen-wcag-above-mini-below-xs-viewports-max: 479px !default;
+
+
+
+
+
 // The general gutter width (padding between columns) is calculated
 // like so: '$grid-gutter-width / 2'
 // which gives you the left or right gutter width; this can be taken
@@ -91,10 +105,6 @@ $content-top-padding-edit-list-xs: $grid-gutter-width / 2 !default;
 $mainbody-sidebar-top-padding: $content-top-padding !default;
 $mainbody-sidebar-top-padding-xs: 0 !default;
 
-// Sidebar item padding
-$sidebar-item-padding: .75em 1em !default;
-$sidebar-item-padding-sm: .75em .5em !default;
-
 // Table cell padding - adjust in themes to avoid content jumps when switching tabs
 // $table-cell-padding: 5px !default;
 
@@ -176,7 +186,7 @@ $mainbody-link-text-decoration: $link-text-decoration;
 
 $btn-default-color: $oil !default;
 
-$btn-text-decoration: $link-text-decoration;
+$btn-text-decoration: $link-text-decoration !default;
 
 // Use darker text color when default-buttons are used on white BG (new class: bth-transparent
 // for updateCart in search results, date-range slider in sidebar and adv search
@@ -1084,6 +1094,10 @@ $bulk-action-record-view-checkbox-input-margin-top: $input-top-margin !default;
 // ************ Sidebar elements ***********************************
 // *****************************************************************
 
+// Sidebar item padding
+$sidebar-item-padding: .75em 1em !default;
+$sidebar-item-padding-sm: .75em .5em !default;
+
 // Menu in MyAccount, selected facets
 $sidebar-facet-active-background-color: $brand-warning !default;
 $sidebar-facet-active-color: $black !default;

themes/finc/scss/components/_buttons.scss

@@ -4,6 +4,9 @@
 // For Add-to-Bookbag buttons      see bookbag.scss
 // For bulk-action-buttons         see bulk-action-buttons.scss
 
+
+
+
 // *****************************************************************
 // ************ General buttons ************************************
 // *****************************************************************
@@ -16,6 +19,13 @@
 // Buttons have a DEFAULT HEIGHT of 38px, the same
 // as '$navigation-element-default-height' for select boxes and other elements
 
+
+
+
+// *****************************************************************
+// ************ Specific buttons ***********************************
+// *****************************************************************
+
 // Default and secondary buttons
 .btn-default.active,
 .btn-secondary.active {