Skip to content

v5: Underline links #30389

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

Merged
mdo merged 7 commits into from
Mar 20, 2020
Merged

v5: Underline links #30389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f3692bf
Enable underlines for links
mdo Mar 12, 2020
a66e5e6
Remove links from docs sidebar
mdo Mar 12, 2020
685da5c
supress underline on toc
mdo Mar 17, 2020
1e0575c
remove dupe text-decoration
mdo Mar 17, 2020
39c11c6
Restore hover text decoration on toc links
MartijnCuppens Mar 20, 2020
7fc4037
Remove redundant text decoration from hover states
MartijnCuppens Mar 20, 2020
4a37677
Merge branch 'master' into underline-links
MartijnCuppens Mar 20, 2020
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 scss/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

&:hover {
color: $body-color;
text-decoration: none;
text-decoration: if($link-hover-decoration == underline, none, null);
}

&:focus,
Expand Down
2 changes: 1 addition & 1 deletion scss/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
&:hover,
&:focus {
color: $dropdown-link-hover-color;
text-decoration: none;
text-decoration: if($link-hover-decoration == underline, none, null);
@include gradient-bg($dropdown-link-hover-bg);
}

Expand Down
2 changes: 1 addition & 1 deletion scss/_nav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

&:hover,
&:focus {
text-decoration: none;
text-decoration: if($link-hover-decoration == underline, none, null);
}

// Disabled state lightens text
Expand Down
2 changes: 1 addition & 1 deletion scss/_pagination.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
&:hover {
z-index: 2;
color: $pagination-hover-color;
text-decoration: none;
text-decoration: if($link-hover-decoration == underline, none, null);
background-color: $pagination-hover-bg;
border-color: $pagination-hover-border-color;
}
Expand Down
4 changes: 2 additions & 2 deletions scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,9 @@ $body-text-align: null !default;
// Style anchor elements.

$link-color: $primary !default;
$link-decoration: none !default;
$link-decoration: underline !default;
$link-hover-color: darken($link-color, 15%) !default;
$link-hover-decoration: underline !default;
$link-hover-decoration: null !default;
// Darken percentage for links with `.text-*` class (e.g. `.text-success`)
$emphasized-link-hover-darken-percentage: 15% !default;

Expand Down
4 changes: 2 additions & 2 deletions site/assets/scss/_sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
padding: .25rem .625rem .25rem .5rem;
font-weight: 600;
color: rgba($black, .65);
text-decoration: none;
Comment thread
mdo marked this conversation as resolved.
@include border-radius(.25rem);

> * { pointer-events: none; }

&:hover,
&:focus {
color: rgba($black, .85);
text-decoration: none;
background-color: rgba($bd-purple-bright, .1);
}
}
Expand Down Expand Up @@ -64,12 +64,12 @@
padding: .25rem .5rem;
@include font-size(.875rem);
color: rgba($black, .65);
text-decoration: none;
@include border-radius(.25rem);

&:hover,
&:focus {
color: rgba($black, .85);
text-decoration: none;
background-color: rgba($bd-purple-bright, .1);
}
}
Expand Down
6 changes: 5 additions & 1 deletion site/assets/scss/_toc.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// stylelint-disable selector-max-type, selector-max-combinators, selector-max-compound-selectors
// stylelint-disable selector-max-type, selector-max-compound-selectors

.bd-toc nav {
padding-top: .125em;
Expand All @@ -14,6 +14,10 @@
list-style-type: disc;
}

a:not(:hover) {
text-decoration: none;
}

a code {
font: inherit;
}
Expand Down