From d4d65317d95333759dbbe91555eb792d07419dee Mon Sep 17 00:00:00 2001 From: Steven H Johnson <shjohnson.pi@gmail.com> Date: Sat, 16 Jul 2016 09:29:51 -0400 Subject: [PATCH] Various fixes for webkit/Apple CSS --- static/css/sass/_footer.scss | 1 - static/css/sass/_genericClasses.scss | 5 +++++ static/css/sass/_nav.scss | 2 ++ static/css/sass/usta.scss | 4 ++++ static/css/usta.css | 12 +++++++++--- usta/templates/usta/base.html | 2 +- 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/static/css/sass/_footer.scss b/static/css/sass/_footer.scss index 8b3169f..d6f21f3 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 b16e1e0..cd339aa 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 bf4cf6b..0bfa428 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 b0d7331..ce4d9c1 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 945215f..238d2e0 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 4c4a880..1e92faf 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> -- GitLab