From 6986811ae23a919ab53d13fc954b79dd7023c99b Mon Sep 17 00:00:00 2001 From: Ghazal Salehi Date: Mon, 19 Jun 2023 08:55:08 +1000 Subject: [PATCH 1/2] QOLDEV-77 link list and button states in dfv portal --- .../_blocks/components/link/_qg-link.scss | 2 +- .../_project/_blocks/franchise/DFV/qg-dfv.scss | 16 ++++++++++++++-- .../_blocks/layout/content/_content.scss | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/assets/_project/_blocks/components/link/_qg-link.scss b/src/assets/_project/_blocks/components/link/_qg-link.scss index 66d4f3ed3..29e8d9b82 100644 --- a/src/assets/_project/_blocks/components/link/_qg-link.scss +++ b/src/assets/_project/_blocks/components/link/_qg-link.scss @@ -9,7 +9,7 @@ // make exception for certain classes, which need to re-visit for better optimization &:not(.qg-feature-box .qg-link):not(.qg-index a.qg-index-item):not(.page-item .page-link):not(.dfv-cards--type-top-prompt - a.card):not(.search-categories__index-toggle):not(.search-categories__index):not(.qg-aside-button):not(.QSAR-records-search a) { + a.card):not(.search-categories__index-toggle):not(.search-categories__index):not(.QSAR-records-search a) { text-underline-offset: $text-underline-offset; // not sure why Asif need to add this, which will have side-effect on customised style added by franchise. diff --git a/src/assets/_project/_blocks/franchise/DFV/qg-dfv.scss b/src/assets/_project/_blocks/franchise/DFV/qg-dfv.scss index d86c05ae9..d271487e4 100644 --- a/src/assets/_project/_blocks/franchise/DFV/qg-dfv.scss +++ b/src/assets/_project/_blocks/franchise/DFV/qg-dfv.scss @@ -1,12 +1,24 @@ -.dfv-content a.qg-links-list__link, .dfv-back a { +.dfv-content a.qg-links-list__link, .dfv-back a, a.qg-aside-button { @include qg-link-styles__theme-white; } .dfv-content a:visited:not(.btn, .button, .qg-btn), a.dfv-resource-nav__link { color: currentColor; } -.dfv-back a { +.dfv-back a, a.qg-aside-button { text-decoration: none !important; + font-size: 1rem; + font-weight: 700 !important; +} +.dfv-back span, .dfv-back a, a.qg-aside-button { + &:hover { + text-decoration: underline !important; + text-decoration-thickness: 2px !important; + } } #qg-primary-content .dfv-page-introduction a, #qg-primary-content .dfv-content a:not(.qg-links-list__link) { color: $qg-blue-dark !important; } + +#qg-content #qg-primary-content .dfv-topics__link { + margin: 0 !important; +} diff --git a/src/assets/_project/_blocks/layout/content/_content.scss b/src/assets/_project/_blocks/layout/content/_content.scss index 46d376c04..55b3d718b 100644 --- a/src/assets/_project/_blocks/layout/content/_content.scss +++ b/src/assets/_project/_blocks/layout/content/_content.scss @@ -31,7 +31,7 @@ } ul, ol { // don't add margins to contexts that manage their own spacing - li:not(.select2 li, .graph li, #tabbed-nav li):not(.qg-quick-exit__item):not(.qg-share-list-item) { + li:not(.select2 li, .graph li, #tabbed-nav li):not(.qg-quick-exit__item):not(.qg-share-list-item):not(.dfv-topics__item) { margin-bottom: 0.5em; } } From 563ac27a6b3890d85257e026808f198ef0bafb8c Mon Sep 17 00:00:00 2001 From: Ghazal Salehi Date: Tue, 20 Jun 2023 11:28:33 +1000 Subject: [PATCH 2/2] QOLDEV-77 Calling qg-global-link-styles with margin zero to override default margin --- src/assets/_project/_blocks/franchise/DFV/qg-dfv.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/_project/_blocks/franchise/DFV/qg-dfv.scss b/src/assets/_project/_blocks/franchise/DFV/qg-dfv.scss index d271487e4..c436a34bc 100644 --- a/src/assets/_project/_blocks/franchise/DFV/qg-dfv.scss +++ b/src/assets/_project/_blocks/franchise/DFV/qg-dfv.scss @@ -20,5 +20,5 @@ } #qg-content #qg-primary-content .dfv-topics__link { - margin: 0 !important; + @include qg-global-link-styles($margin: 0); }