From aca3080bb05a170df88a1c54be2a931ba7581583 Mon Sep 17 00:00:00 2001 From: Arthur Shlain Date: Thu, 20 Feb 2020 18:13:01 +0500 Subject: [PATCH 01/12] Update _buttons.scss Removed .btn redundant text-decoration when dom element is link (a.btn) and $link-decoration variable is set to 'underline'. --- scss/_buttons.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/_buttons.scss b/scss/_buttons.scss index 9d4f3efc8b0d..0b9d75871f38 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -9,6 +9,7 @@ line-height: $btn-line-height; color: $body-color; text-align: center; + text-decoration: none; white-space: $btn-white-space; vertical-align: middle; cursor: if($enable-pointer-cursor-for-buttons, pointer, null); From 37ad1118be0f9a3066d3b243b9acdc4a0756e572 Mon Sep 17 00:00:00 2001 From: Arthur Shlain Date: Thu, 20 Feb 2020 19:19:32 +0500 Subject: [PATCH 02/12] Update _pagination.scss Removed redundant text-decoration when element is link with .page-link class (a.page-link) and $link-decoration variable is set to 'underline'. --- scss/_pagination.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/_pagination.scss b/scss/_pagination.scss index d987d0fbec3b..6f5210407a55 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -6,6 +6,7 @@ .page-link { position: relative; display: block; + text-decoration: none; color: $pagination-color; background-color: $pagination-bg; border: $pagination-border-width solid $pagination-border-color; From c4de21eee5a6b1717c7b2b37708d3e824854502f Mon Sep 17 00:00:00 2001 From: Arthur Shlain Date: Thu, 20 Feb 2020 19:29:59 +0500 Subject: [PATCH 03/12] Update _pagination.scss .page-link property ordering --- scss/_pagination.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scss/_pagination.scss b/scss/_pagination.scss index 6f5210407a55..687e245d894e 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -4,12 +4,12 @@ } .page-link { - position: relative; - display: block; - text-decoration: none; color: $pagination-color; + display: block; background-color: $pagination-bg; border: $pagination-border-width solid $pagination-border-color; + text-decoration: none; + position: relative; &:hover { z-index: 2; From 9e74c1087fe1d9251b6c4e3cad48176c080bb324 Mon Sep 17 00:00:00 2001 From: Arthur Shlain Date: Thu, 20 Feb 2020 19:33:34 +0500 Subject: [PATCH 04/12] Update _pagination.scss .page-link property ordering --- scss/_pagination.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scss/_pagination.scss b/scss/_pagination.scss index 687e245d894e..ca8e4ec1b450 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -4,12 +4,12 @@ } .page-link { - color: $pagination-color; display: block; + color: $pagination-color; background-color: $pagination-bg; - border: $pagination-border-width solid $pagination-border-color; - text-decoration: none; position: relative; + text-decoration: none; + border: $pagination-border-width solid $pagination-border-color; &:hover { z-index: 2; From f99d5d00b34076899e42560a93ba67134ba8235f Mon Sep 17 00:00:00 2001 From: Arthur Shlain Date: Thu, 20 Feb 2020 19:36:02 +0500 Subject: [PATCH 05/12] Update _pagination.scss .page-link property ordering --- scss/_pagination.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_pagination.scss b/scss/_pagination.scss index ca8e4ec1b450..a97b96d58534 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -4,10 +4,10 @@ } .page-link { + position: relative; display: block; color: $pagination-color; background-color: $pagination-bg; - position: relative; text-decoration: none; border: $pagination-border-width solid $pagination-border-color; From 955caa9c763d9d8294aa7a781c1578d212eba33a Mon Sep 17 00:00:00 2001 From: Arthur Shlain Date: Thu, 20 Feb 2020 19:39:22 +0500 Subject: [PATCH 06/12] Update _pagination.scss .page-link property ordering --- scss/_pagination.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_pagination.scss b/scss/_pagination.scss index a97b96d58534..3ed112a2b6b4 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -7,8 +7,8 @@ position: relative; display: block; color: $pagination-color; - background-color: $pagination-bg; text-decoration: none; + background-color: $pagination-bg; border: $pagination-border-width solid $pagination-border-color; &:hover { From 2204f9770742f91f49984c0c1bd854ca9c4cc643 Mon Sep 17 00:00:00 2001 From: Arthur Shlain Date: Thu, 20 Feb 2020 21:37:58 +0500 Subject: [PATCH 07/12] Update _buttons.scss check $link-decoration variable for .btn "text-decoration: none" --- scss/_buttons.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_buttons.scss b/scss/_buttons.scss index 0b9d75871f38..701c097cf3de 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -9,7 +9,7 @@ line-height: $btn-line-height; color: $body-color; text-align: center; - text-decoration: none; + text-decoration: if($link-decoration == none, null, none); white-space: $btn-white-space; vertical-align: middle; cursor: if($enable-pointer-cursor-for-buttons, pointer, null); From 6c917e6170876490d5e87165144ddf7cd4a00cb9 Mon Sep 17 00:00:00 2001 From: Arthur Shlain Date: Thu, 20 Feb 2020 21:38:53 +0500 Subject: [PATCH 08/12] Update _pagination.scss check $link-decoration variable for .page-link "text-decoration: none" --- scss/_pagination.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_pagination.scss b/scss/_pagination.scss index 3ed112a2b6b4..9d728aad3250 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -7,7 +7,7 @@ position: relative; display: block; color: $pagination-color; - text-decoration: none; + text-decoration: if($link-decoration == none, null, none); background-color: $pagination-bg; border: $pagination-border-width solid $pagination-border-color; From 2af07d31c92ea4bb6c623ff72a8f089a96932da4 Mon Sep 17 00:00:00 2001 From: Arthur Shlain Date: Thu, 20 Feb 2020 22:54:36 +0500 Subject: [PATCH 09/12] Update _nav.scss .nav-link text-decoration: none; --- scss/_nav.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/_nav.scss b/scss/_nav.scss index 6d77aeba8687..368b4f3bc534 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -13,6 +13,7 @@ .nav-link { display: block; + text-decoration: if($link-decoration == none, null, none); padding: $nav-link-padding-y $nav-link-padding-x; &:hover, From b0f0c3627b4865f353c5f5fa3ee266e0338bef94 Mon Sep 17 00:00:00 2001 From: Arthur Shlain Date: Thu, 20 Feb 2020 22:58:14 +0500 Subject: [PATCH 10/12] Update _nav.scss .nav-link attr ordering --- scss/_nav.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_nav.scss b/scss/_nav.scss index 368b4f3bc534..d82e9172dc11 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -13,8 +13,8 @@ .nav-link { display: block; - text-decoration: if($link-decoration == none, null, none); padding: $nav-link-padding-y $nav-link-padding-x; + text-decoration: if($link-decoration == none, null, none); &:hover, &:focus { From d30155424840fe708c04d58db5283aa84b625fe1 Mon Sep 17 00:00:00 2001 From: Arthur Shlain Date: Thu, 20 Feb 2020 23:06:25 +0500 Subject: [PATCH 11/12] Update _dropdown.scss text-decoration: none; for .dropdown-item --- scss/_dropdown.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index 00f0cba6e822..48cceed40fb9 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -130,6 +130,7 @@ font-weight: $font-weight-normal; color: $dropdown-link-color; text-align: inherit; // For `