diff --git a/static/css/sass/_footer.scss b/static/css/sass/_footer.scss index 8b3169f32e413a2b428544f13391c5259ce257c2..d6f21f359309591e75e74d4ac6c93014e4a274c4 100644 --- a/static/css/sass/_footer.scss +++ b/static/css/sass/_footer.scss @@ -142,7 +142,6 @@ footer { .link-div { width: 90%; - height: 100%; max-height: 50px; padding-top: 5px; } diff --git a/static/css/sass/_genericClasses.scss b/static/css/sass/_genericClasses.scss index b16e1e0fab3e122de47db9daa542fe768884b91a..cd339aaf325131493da7e4bce4f3f50d1ee9e53e 100644 --- a/static/css/sass/_genericClasses.scss +++ b/static/css/sass/_genericClasses.scss @@ -56,6 +56,11 @@ flex-basis: $value; } +@mixin flex-shrink($value) { + -webkit-flex-shrink: $value; + flex-shrink: $value; +} + @mixin align-self($value) { -webkit-align-self: $value; align-self: $value; diff --git a/static/css/sass/_nav.scss b/static/css/sass/_nav.scss index bf4cf6b1b6f13bbc473260e672745adf4191f259..0bfa428084fb9cc6579c990b8f42e0868e8d5975 100644 --- a/static/css/sass/_nav.scss +++ b/static/css/sass/_nav.scss @@ -275,10 +275,12 @@ nav { @include align-items(center); // Cross axis alignment. @include flex-wrap(wrap); @include flex-grow(1); + @include flex-shrink(0); } .nav-sublink { @include flex-grow(1); + @include flex-basis(100%); } .nav-sublink a { diff --git a/static/css/sass/usta.scss b/static/css/sass/usta.scss index b0d733115c56c8ce141250a857c65bc9fcb8c3a3..ce4d9c13e460056bd82d3ea1ec25724513e4466d 100644 --- a/static/css/sass/usta.scss +++ b/static/css/sass/usta.scss @@ -169,6 +169,10 @@ label.required { margin-right: auto; } +.pointer { + cursor: pointer; +} + //************************* //END Misc Subblock //************************* diff --git a/static/css/usta.css b/static/css/usta.css index 945215fe13869d2335e1a4ea2f7e014d523a1dd2..238d2e00418cc226cd603ddfb2f6746edde0876e 100644 --- a/static/css/usta.css +++ b/static/css/usta.css @@ -90,6 +90,9 @@ label.required { margin-left: auto; margin-right: auto; } +.pointer { + cursor: pointer; } + ul.messagelist { padding: 0; margin: 0; } @@ -622,10 +625,14 @@ nav ul ul li a { -webkit-flex-wrap: wrap; flex-wrap: wrap; -webkit-flex-grow: 1; - flex-grow: 1; } + flex-grow: 1; + -webkit-flex-shrink: 0; + flex-shrink: 0; } .vert-nav .nav-sublink { -webkit-flex-grow: 1; - flex-grow: 1; } + flex-grow: 1; + -webkit-flex-basis: 100%; + flex-basis: 100%; } .vert-nav .nav-sublink a { -webkit-justify-content: center; justify-content: center; } @@ -1234,7 +1241,6 @@ footer { footer .link-div { width: 90%; - height: 100%; max-height: 50px; padding-top: 5px; } footer p { diff --git a/usta/templates/usta/base.html b/usta/templates/usta/base.html index 4c4a8804299af4defa8df90011e76302b9d56749..1e92faf5108133668987d914053f8dc53bcc98d7 100644 --- a/usta/templates/usta/base.html +++ b/usta/templates/usta/base.html @@ -109,7 +109,7 @@ </ul> </nav> <div class="sitemap-toggle"> - <a href="#footer"><img src="{% static 'images/misc_icons/Map.svg' %}" alt="trifold map">Site Map</a> + <a class="pointer"><img src="{% static 'images/misc_icons/Map.svg' %}" alt="trifold map">Site Map</a> </div> </div> <p>Copyright © 1999 – {% now "Y" %} Boys' 18 & 16 National Tennis Championships. All rights reserved.</p>