From 0712f96a323eca4fada69807228cbf3c2e7a1e0e Mon Sep 17 00:00:00 2001 From: Martijn Cuppens Date: Sun, 14 Oct 2018 17:10:31 +0200 Subject: [PATCH 1/3] Rename skippy to skiplink & skiplink alignment --- site/_includes/skiplink.html | 3 +++ site/_includes/skippy.html | 5 ----- site/_layouts/default.html | 2 +- site/_layouts/docs.html | 2 +- site/_layouts/home.html | 2 +- site/docs/4.1/assets/scss/_skiplink.scss | 13 ++++++------- 6 files changed, 12 insertions(+), 15 deletions(-) create mode 100644 site/_includes/skiplink.html delete mode 100644 site/_includes/skippy.html diff --git a/site/_includes/skiplink.html b/site/_includes/skiplink.html new file mode 100644 index 000000000000..461b089582fd --- /dev/null +++ b/site/_includes/skiplink.html @@ -0,0 +1,3 @@ + diff --git a/site/_includes/skippy.html b/site/_includes/skippy.html deleted file mode 100644 index 2c73089bc37b..000000000000 --- a/site/_includes/skippy.html +++ /dev/null @@ -1,5 +0,0 @@ - -
- Skip to main content -
-
diff --git a/site/_layouts/default.html b/site/_layouts/default.html index 28f4cdccb061..2235d780a8b9 100644 --- a/site/_layouts/default.html +++ b/site/_layouts/default.html @@ -4,7 +4,7 @@ {% include header.html %} - {% include skippy.html %} + {% include skiplink.html %} {% include docs-navbar.html %} diff --git a/site/_layouts/docs.html b/site/_layouts/docs.html index 1d2125508e4c..c444a1b1b450 100644 --- a/site/_layouts/docs.html +++ b/site/_layouts/docs.html @@ -4,7 +4,7 @@ {% include header.html %} - {% include skippy.html %} + {% include skiplink.html %} {% include docs-navbar.html %} diff --git a/site/_layouts/home.html b/site/_layouts/home.html index 88a23d49ce96..62ffb9e190d5 100644 --- a/site/_layouts/home.html +++ b/site/_layouts/home.html @@ -4,7 +4,7 @@ {% include header.html %} - {% include skippy.html %} + {% include skiplink.html %} {% include docs-navbar.html %} diff --git a/site/docs/4.1/assets/scss/_skiplink.scss b/site/docs/4.1/assets/scss/_skiplink.scss index 7ca3074a8c5e..ac126a72b2e7 100644 --- a/site/docs/4.1/assets/scss/_skiplink.scss +++ b/site/docs/4.1/assets/scss/_skiplink.scss @@ -1,14 +1,13 @@ -// stylelint-disable selector-max-id - -#skippy { +.skiplink { display: block; padding: 1em; color: #fff; + text-align: center; background-color: $bd-purple; outline: 0; +} - .skiplink-text { - padding: .5em; - outline: 1px dotted; - } +.skiplink-text { + padding: .5em; + outline: 1px dotted; } From 8c232abdbe450b9260eb0f879abf4a86438b35c7 Mon Sep 17 00:00:00 2001 From: Martijn Cuppens Date: Mon, 15 Oct 2018 10:18:11 +0200 Subject: [PATCH 2/3] Change (hover) color --- site/docs/4.1/assets/scss/_skiplink.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/site/docs/4.1/assets/scss/_skiplink.scss b/site/docs/4.1/assets/scss/_skiplink.scss index ac126a72b2e7..a6c99375a419 100644 --- a/site/docs/4.1/assets/scss/_skiplink.scss +++ b/site/docs/4.1/assets/scss/_skiplink.scss @@ -1,10 +1,14 @@ .skiplink { display: block; padding: 1em; - color: #fff; + color: $white; text-align: center; background-color: $bd-purple; outline: 0; + + @include hover { + color: $white; + } } .skiplink-text { From 951c38273885c06708e5a6a85b0912c980f0a08d Mon Sep 17 00:00:00 2001 From: Martijn Cuppens Date: Mon, 15 Oct 2018 12:42:44 +0200 Subject: [PATCH 3/3] Bring skippy back to life --- site/_includes/skiplink.html | 3 --- site/_includes/skippy.html | 3 +++ site/_layouts/default.html | 2 +- site/_layouts/docs.html | 2 +- site/_layouts/home.html | 2 +- site/docs/4.1/assets/scss/{_skiplink.scss => _skippy.scss} | 4 ++-- site/docs/4.1/assets/scss/docs.scss | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 site/_includes/skiplink.html create mode 100644 site/_includes/skippy.html rename site/docs/4.1/assets/scss/{_skiplink.scss => _skippy.scss} (87%) diff --git a/site/_includes/skiplink.html b/site/_includes/skiplink.html deleted file mode 100644 index 461b089582fd..000000000000 --- a/site/_includes/skiplink.html +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/site/_includes/skippy.html b/site/_includes/skippy.html new file mode 100644 index 000000000000..ec7507d53273 --- /dev/null +++ b/site/_includes/skippy.html @@ -0,0 +1,3 @@ + + Skip to main content + diff --git a/site/_layouts/default.html b/site/_layouts/default.html index 2235d780a8b9..28f4cdccb061 100644 --- a/site/_layouts/default.html +++ b/site/_layouts/default.html @@ -4,7 +4,7 @@ {% include header.html %} - {% include skiplink.html %} + {% include skippy.html %} {% include docs-navbar.html %} diff --git a/site/_layouts/docs.html b/site/_layouts/docs.html index c444a1b1b450..1d2125508e4c 100644 --- a/site/_layouts/docs.html +++ b/site/_layouts/docs.html @@ -4,7 +4,7 @@ {% include header.html %} - {% include skiplink.html %} + {% include skippy.html %} {% include docs-navbar.html %} diff --git a/site/_layouts/home.html b/site/_layouts/home.html index 62ffb9e190d5..88a23d49ce96 100644 --- a/site/_layouts/home.html +++ b/site/_layouts/home.html @@ -4,7 +4,7 @@ {% include header.html %} - {% include skiplink.html %} + {% include skippy.html %} {% include docs-navbar.html %} diff --git a/site/docs/4.1/assets/scss/_skiplink.scss b/site/docs/4.1/assets/scss/_skippy.scss similarity index 87% rename from site/docs/4.1/assets/scss/_skiplink.scss rename to site/docs/4.1/assets/scss/_skippy.scss index a6c99375a419..db971d114cb5 100644 --- a/site/docs/4.1/assets/scss/_skiplink.scss +++ b/site/docs/4.1/assets/scss/_skippy.scss @@ -1,4 +1,4 @@ -.skiplink { +.skippy { display: block; padding: 1em; color: $white; @@ -11,7 +11,7 @@ } } -.skiplink-text { +.skippy-text { padding: .5em; outline: 1px dotted; } diff --git a/site/docs/4.1/assets/scss/docs.scss b/site/docs/4.1/assets/scss/docs.scss index 706bde44e656..0f779710343a 100644 --- a/site/docs/4.1/assets/scss/docs.scss +++ b/site/docs/4.1/assets/scss/docs.scss @@ -34,7 +34,7 @@ @import "masthead"; @import "ads"; @import "content"; -@import "skiplink"; +@import "skippy"; @import "sidebar"; @import "footer"; @import "component-examples";