Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qoldev 77 hyperlinks on dfv #986

Merged
merged 3 commits into from
Jun 20, 2023
Merged

Qoldev 77 hyperlinks on dfv #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6986811
QOLDEV-77 link list and button states in dfv portal
ghazal-salehi Jun 18, 2023
563ac27
QOLDEV-77 Calling qg-global-link-styles with margin zero to override …
ghazal-salehi Jun 20, 2023
9765d39
Merge branch 'release-v4.3.0' into QOLDEV-77-hyperlinks-on-DFV
ghazal-salehi Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/assets/_project/_blocks/components/link/_qg-link.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
16 changes: 14 additions & 2 deletions src/assets/_project/_blocks/franchise/DFV/qg-dfv.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
@include qg-global-link-styles($margin: 0);
}
2 changes: 1 addition & 1 deletion src/assets/_project/_blocks/layout/content/_content.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down