From c375f882cacec127ffa92bb83b2fcf07319045b0 Mon Sep 17 00:00:00 2001
From: ckaz <kazzer@ub.uni-leipzig.de>
Date: Mon, 3 Apr 2023 18:26:45 +0200
Subject: [PATCH] refs #23447 finc: Revises anchor underlines
---
themes/finc/scss/_common.scss | 15 +++++++++---
themes/finc/scss/_customVariables.scss | 8 ++++---
.../components/_header-active-filters.scss | 1 +
.../finc/scss/components/_hierarchy-tree.scss | 6 ++---
themes/finc/scss/components/_pagination.scss | 4 ++++
themes/finc/scss/components/_record-tabs.scss | 4 ++++
themes/finc/scss/components/_sidebar.scss | 23 ++++++++++++-------
7 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/themes/finc/scss/_common.scss b/themes/finc/scss/_common.scss
index d5e61ac17e6..5115ded897e 100644
--- a/themes/finc/scss/_common.scss
+++ b/themes/finc/scss/_common.scss
@@ -9,14 +9,23 @@
// ************ Link text decoration *******************************
// *****************************************************************
-.main,
.mainbody {
- a {
- text-decoration: $mainbody-link-text-decoration;
+ // Fixme: Consider better way to differentiate between underlined and non-underlined elements - Ck
+ .record-list,
+ .media-body {
+ a:not(.btn) {
+ text-decoration: $mainbody-link-text-decoration;
+ }
+
+ // 'Merken' etc. in result list
+ .result-links a:not(.btn) {
+ text-decoration: $result-links-text-decoration;
+ }
}
}
+
// *****************************************************************
// ************ Hide empty containers ******************************
// *****************************************************************
diff --git a/themes/finc/scss/_customVariables.scss b/themes/finc/scss/_customVariables.scss
index 0659a764e9b..b95a5b85701 100644
--- a/themes/finc/scss/_customVariables.scss
+++ b/themes/finc/scss/_customVariables.scss
@@ -191,7 +191,7 @@ $mainbody-link-text-decoration: $link-text-decoration !default;
$btn-default-color: $oil !default;
-$btn-text-decoration: $link-text-decoration !default;
+$btn-text-decoration: none !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
@@ -990,6 +990,7 @@ $result-list-result-title-font-weight: normal !default;
// Record entry-related links in result list, incl. QR codes, public favorites lists etc.
$result-links-fa-icons-text-align: left !default;
+$result-links-text-decoration: none !default;
// Favorites list in MyAccount
@@ -1094,7 +1095,7 @@ $pager-hover-color: $black !default;
$pager-border: $border-default-styles !default;
$pager-border-radius: 0 !default;
-
+$pager-text-decoration: none !default;
@@ -1112,7 +1113,7 @@ $book-bag-add-to-in-sidebar-toggler-color: $brand-primary !default;
$record-view-toolbar-button-padding-add-to-bookbag: 1.2rem !default;
$book-bag-add-to-in-sidebar-toggler-padding: $record-view-toolbar-button-padding $record-view-toolbar-button-padding-add-to-bookbag !default;
$book-bag-add-to-in-sidebar-toggler-text-align-xs: left !default;
-$book-bag-add-to-in-sidebar-toggler-text-decoration: $link-text-decoration !default;
+$book-bag-add-to-in-sidebar-toggler-text-decoration: none !default;
$book-bag-add-to-in-sidebar-toggler-width: 100% !default;
$book-bag-add-to-icon-content: '\f067' !default;
@@ -1218,6 +1219,7 @@ $icon-with-text-warning-color: $brand-warning !default;
// *****************************************************************
$record-tabs-padding-left: 1em !default;
$record-tabs-padding-left-xs: 0 !default;
+$record-tabs-nav-text-decoration: none !default;
$record-tabs-tab-content-padding: ($grid-gutter-width / 2) !default;
$record-tabs-tab-content-a-word-break: break-word !default;
diff --git a/themes/finc/scss/components/_header-active-filters.scss b/themes/finc/scss/components/_header-active-filters.scss
index e3c67f2e23b..e4e913a8e04 100644
--- a/themes/finc/scss/components/_header-active-filters.scss
+++ b/themes/finc/scss/components/_header-active-filters.scss
@@ -82,6 +82,7 @@
// show-all-filters-toggler
.filters-toggle {
float: $search-filter-all-filters-toggle;
+ text-decoration: $search-filter-text-decoration;
}
}
diff --git a/themes/finc/scss/components/_hierarchy-tree.scss b/themes/finc/scss/components/_hierarchy-tree.scss
index 45b072e82bd..440e8691ccc 100644
--- a/themes/finc/scss/components/_hierarchy-tree.scss
+++ b/themes/finc/scss/components/_hierarchy-tree.scss
@@ -127,9 +127,9 @@
}
}
-/* ***************************************************************************************** */
-/* TODO move following styles to seprate component (_collection-view.scss) in finc or de_105 */
-/* TODO upcoming refs #22979 */
+// ***************************************************************************************** */
+// TODO move following styles to seprate component (_collection-view.scss) in finc or de_105 */
+// TODO upcoming refs #22979 */
.collection-control {
display: inline-block;
diff --git a/themes/finc/scss/components/_pagination.scss b/themes/finc/scss/components/_pagination.scss
index 0458be07084..5c3e66fc0a4 100644
--- a/themes/finc/scss/components/_pagination.scss
+++ b/themes/finc/scss/components/_pagination.scss
@@ -39,6 +39,10 @@
margin-top: $pager-margin-top-xs;
}
+ a {
+ text-decoration: $pager-text-decoration;
+ }
+
.disabled {
display: none;
}
diff --git a/themes/finc/scss/components/_record-tabs.scss b/themes/finc/scss/components/_record-tabs.scss
index 2daa26546ba..a38fe8d7a69 100644
--- a/themes/finc/scss/components/_record-tabs.scss
+++ b/themes/finc/scss/components/_record-tabs.scss
@@ -11,6 +11,10 @@
@media (max-width: $screen-xs-max) {
padding-left: $record-tabs-padding-left-xs;
}
+
+ .nav-tabs a {
+ text-decoration: $record-tabs-nav-text-decoration;
+ }
}
// Add left and right borders
diff --git a/themes/finc/scss/components/_sidebar.scss b/themes/finc/scss/components/_sidebar.scss
index 9be76eeff5d..c0f84e83742 100644
--- a/themes/finc/scss/components/_sidebar.scss
+++ b/themes/finc/scss/components/_sidebar.scss
@@ -4,15 +4,8 @@
// ************ General ********************************************
// *****************************************************************
-// Sidebar width, when off-canvas is _off_;
-// For more on off-canvas see offcanvas.scss
-.sidebar {
- body:not(.offcanvas) & {
- @media (max-width: $screen-xs-max) {
- width: 100%;
- }
- }
+.sidebar {
// #13625 avoid ugly linebreaks with overlong words, RL
-moz-hyphens: auto;
-ms-hyphens: auto;
@@ -27,6 +20,20 @@
padding-top: $mainbody-sidebar-top-padding-xs;
}
+
+ a {
+ text-decoration: $sidebar-facet-link-text-decoration;
+ }
+
+
+ // Sidebar width, when off-canvas is _off_;
+ // For more on off-canvas see offcanvas.scss
+ body:not(.offcanvas) & {
+ @media (max-width: $screen-xs-max) {
+ width: 100%;
+ }
+ }
+
// pull content to right border for sidebar right
&.right {
@include pull-sidebar-to-right($margin-right-width);
--
GitLab