diff --git a/_layouts/default.html b/_layouts/default.html index 41154cd..a020ed9 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -4,6 +4,8 @@ + + {% capture title %}{{ page.title | replace:'$YYYY',site.year }} | {{ site.title }}{% endcapture %} {{ title }} diff --git a/_sass/brand b/_sass/brand index f16eb74..b00ad7d 160000 --- a/_sass/brand +++ b/_sass/brand @@ -1 +1 @@ -Subproject commit f16eb74bac7f3a15cde8a104cd8825591c96da83 +Subproject commit b00ad7d202b33c67a62a99abf534ecd61349ef3e diff --git a/_sass/comp/common.scss b/_sass/comp/common.scss index 0da4336..4037c73 100644 --- a/_sass/comp/common.scss +++ b/_sass/comp/common.scss @@ -109,7 +109,44 @@ ul.comp-nav { padding: 0 1em; } - > li:not(:first-child) { - border-left: 1px solid silver; + @include desktop-only { + > li:not(:first-child) { + border-left: 1px solid silver; + } + } + + @include mobile-only { + max-width: 100%; + margin: 0 auto; + overflow: hidden; + flex-direction: column; + + a { + text-decoration: none; + } + + > li:not(:last-child) > a { + display: block; + border-bottom: 1px solid silver; + padding-top: .1rem; + padding-bottom: .1rem; + } + } +} + +.floated-chooser { + float: right; + margin-left: 25px; + margin-bottom: 1em; + + & > :last-child { + margin-bottom: 0; + } + + & + * { + clear: both; + @include media-query("small") { + clear: none; + } } } diff --git a/_sass/comp/index.scss b/_sass/comp/index.scss index 9953faa..900a3b9 100644 --- a/_sass/comp/index.scss +++ b/_sass/comp/index.scss @@ -22,9 +22,23 @@ #live-stream-wrapper { text-align: center; + position: relative; + width: 100%; + max-width: 760px; + margin: auto; + + & > iframe { + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; + } - & > * { - margin: auto; + &::after { + content: ""; + display: block; + padding-top: 56.25%; } } @@ -47,9 +61,11 @@ } div#leaderboard-container { - float: right; - padding-right: 40px; - width: 330px; + @include desktop-only { + float: right; + padding-right: 40px; + width: 330px; + } } div#leaderboard { margin-right: 50px; @@ -68,9 +84,28 @@ } #match-info { - float: left; text-align: center; - width: 600px; + @include desktop-only { + float: left; + width: 600px; + } + + #more-scores { + position: absolute; + @include desktop-only { + margin-left: 50px; + left: 0; + } + @include mobile-only { + right: 0; + } + } + + #latest-scores { + @include mobile-only { + text-align: left; + } + } div.match { padding: 5px 0; @@ -108,6 +143,9 @@ div.game.headings.single { margin-left: -35px; + @include mobile-only { + margin-left: -15px; + } } } } diff --git a/_sass/comp/points.scss b/_sass/comp/points.scss index b649c57..c507fa3 100644 --- a/_sass/comp/points.scss +++ b/_sass/comp/points.scss @@ -1,6 +1,5 @@ .comp-points #content { #match-chooser { - float: right; margin-left: 50px; input { diff --git a/_sass/comp/team.scss b/_sass/comp/team.scss index 0456185..75d9a3c 100644 --- a/_sass/comp/team.scss +++ b/_sass/comp/team.scss @@ -1,10 +1,6 @@ @import "../brand/sass/srobo/variables/index"; .comp-team #content { - #team-chooser { - float: right; - } - #per-team-details { text-align: center; } diff --git a/comp/index.html b/comp/index.html index d6bd474..8ab21aa 100644 --- a/comp/index.html +++ b/comp/index.html @@ -9,13 +9,15 @@ --> {% if site.youtube_stream_link %} -
- +
+
+ +
{% endif %} @@ -25,10 +27,10 @@
- - more scores… + + more scores… -

+

Latest Scores: [[ previous_match.display_name ]]

No scores yet recorded.

diff --git a/comp/points.html b/comp/points.html index 75443c6..bb9978f 100644 --- a/comp/points.html +++ b/comp/points.html @@ -14,7 +14,7 @@

Match Points

-
+