From 0d816cb23077aedb920a25d3f55709889e75e3ff Mon Sep 17 00:00:00 2001 From: tan-nate Date: Wed, 2 Sep 2020 21:30:34 -0700 Subject: [PATCH 01/21] navbar burger item appears --- client/components/main/header/Header.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/components/main/header/Header.jsx b/client/components/main/header/Header.jsx index 1d05b9c91..b905dd75b 100644 --- a/client/components/main/header/Header.jsx +++ b/client/components/main/header/Header.jsx @@ -31,6 +31,9 @@ const Header = () => { BETA + - - - Date: Wed, 9 Sep 2020 17:31:29 -0700 Subject: [PATCH 13/21] styling --- client/styles/main/_header.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/styles/main/_header.scss b/client/styles/main/_header.scss index 6ebb8db2c..35d5dc314 100644 --- a/client/styles/main/_header.scss +++ b/client/styles/main/_header.scss @@ -60,9 +60,9 @@ } .navbar-selected { - border-bottom: 5px solid $brand-cta1-color; + border-bottom: 4px solid $brand-cta1-color; padding-bottom: 2px; - margin-bottom: -7px; + margin-top: 6px; } .beta-tag-wrapper { From 8e2b8934a7a616a686b1d3baeb2a35197c1900bf Mon Sep 17 00:00:00 2001 From: tan-nate Date: Wed, 9 Sep 2020 18:15:47 -0700 Subject: [PATCH 14/21] social links never disappear and "Last Updated" never overlaps other elements in footer --- client/components/main/footer/SocialMediaLinks.jsx | 4 ++-- client/styles/main/_footer.scss | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/client/components/main/footer/SocialMediaLinks.jsx b/client/components/main/footer/SocialMediaLinks.jsx index 520734922..e04e30b0e 100644 --- a/client/components/main/footer/SocialMediaLinks.jsx +++ b/client/components/main/footer/SocialMediaLinks.jsx @@ -4,7 +4,7 @@ import TwitterSVG from '@assets/twitter-round.svg'; import FacebookSVG from '@assets/facebook-round.svg'; const SocialMediaLinks = () => ( -
+ ( > -
+ ); export default SocialMediaLinks; diff --git a/client/styles/main/_footer.scss b/client/styles/main/_footer.scss index de021146a..c7ae5054a 100644 --- a/client/styles/main/_footer.scss +++ b/client/styles/main/_footer.scss @@ -17,6 +17,10 @@ footer.navbar { display: inline-block; margin: 0 auto; line-height: $footer-height; + + @media only screen and (max-width: 1190px) { + display: none; + } } .version { @@ -41,7 +45,9 @@ footer.navbar { } .social-media-links { - display: table; + margin: 5px 20px 0 0; + position: absolute; + right: 0; a { display: table-cell; From 5d14869cb06b13e5119338488025b6906bb553f4 Mon Sep 17 00:00:00 2001 From: tan-nate Date: Wed, 9 Sep 2020 18:19:07 -0700 Subject: [PATCH 15/21] package-lock.json --- client/package-lock.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/client/package-lock.json b/client/package-lock.json index ca2aaa2f8..b1b4e83d6 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -5930,6 +5930,11 @@ } } }, + "focus-visible": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/focus-visible/-/focus-visible-5.1.0.tgz", + "integrity": "sha512-nPer0rjtzdZ7csVIu233P2cUm/ks/4aVSI+5KUkYrYpgA7ujgC3p6J7FtFU+AIMWwnwYQOB/yeiOITxFeYIXiw==" + }, "follow-redirects": { "version": "1.5.10", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", From 5afb9ec270dd7561656347e10eb76e9ba7b59909 Mon Sep 17 00:00:00 2001 From: tan-nate Date: Wed, 9 Sep 2020 18:22:00 -0700 Subject: [PATCH 16/21] aria-expanded attribute of Hamburger changed to "dynamic" --- client/components/main/header/Header.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/main/header/Header.jsx b/client/components/main/header/Header.jsx index 736aa250e..62795559a 100644 --- a/client/components/main/header/Header.jsx +++ b/client/components/main/header/Header.jsx @@ -43,7 +43,7 @@ const Header = () => { tabIndex={0} className={clx('navbar-burger', { 'is-active': activeBurger })} aria-label="menu" - aria-expanded="false" + aria-expanded="dynamic" onClick={handleClick} onKeyDown={handleClick} > From 0c109b760c387ab1c5c2c87f01d47044c2401c59 Mon Sep 17 00:00:00 2001 From: tan-nate Date: Wed, 9 Sep 2020 18:29:49 -0700 Subject: [PATCH 17/21] trying to get cypress to pass --- client/components/main/footer/SocialMediaLinks.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/components/main/footer/SocialMediaLinks.jsx b/client/components/main/footer/SocialMediaLinks.jsx index e04e30b0e..be506a77a 100644 --- a/client/components/main/footer/SocialMediaLinks.jsx +++ b/client/components/main/footer/SocialMediaLinks.jsx @@ -4,7 +4,7 @@ import TwitterSVG from '@assets/twitter-round.svg'; import FacebookSVG from '@assets/facebook-round.svg'; const SocialMediaLinks = () => ( - +
( > - +
); export default SocialMediaLinks; From 08d4bd42595713ebf3f9a45e3f219fcec212e22d Mon Sep 17 00:00:00 2001 From: tan-nate Date: Wed, 9 Sep 2020 18:45:10 -0700 Subject: [PATCH 18/21] fix aria-expanded --- client/components/main/header/Header.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/main/header/Header.jsx b/client/components/main/header/Header.jsx index 62795559a..d6d7fdf53 100644 --- a/client/components/main/header/Header.jsx +++ b/client/components/main/header/Header.jsx @@ -43,7 +43,7 @@ const Header = () => { tabIndex={0} className={clx('navbar-burger', { 'is-active': activeBurger })} aria-label="menu" - aria-expanded="dynamic" + aria-expanded="true" onClick={handleClick} onKeyDown={handleClick} > From e31ea7012a85cab411a0a5aad172d3c005ad0f09 Mon Sep 17 00:00:00 2001 From: tan-nate Date: Mon, 14 Sep 2020 22:44:48 -0700 Subject: [PATCH 19/21] "Date Updated Through" doesn't disappear too early, Static Footer responsive styling, navbar items moved back right --- client/components/main/header/Header.jsx | 4 +-- client/styles/main/_footer.scss | 9 ++++++- client/styles/main/_staticfooter.scss | 32 +++++++++++++++++++----- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/client/components/main/header/Header.jsx b/client/components/main/header/Header.jsx index d6d7fdf53..0b974e1d1 100644 --- a/client/components/main/header/Header.jsx +++ b/client/components/main/header/Header.jsx @@ -54,7 +54,7 @@ const Header = () => {