diff --git a/public/css/app.css b/public/css/app.css index b38afb8..a565206 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -8514,6 +8514,16 @@ button.close { margin-right: 10px; } +.team .team-icon.outlined { + border-width: 4px; + border-style: solid; + margin-right: 0; +} + +.team .team-icon.empty { + background-color: transparent !important; +} + .team .team-name { font-weight: bold; } @@ -8700,3 +8710,16 @@ button.close { height: 200px; } +.scoreboard td.score, +.scoreboard th.score { + text-align: center; +} + +.scoreboard td.total.score { + font-size: 20px; +} + +.scoreboard td .team-wrap { + display: inline-block; +} + diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index e041475..8d26907 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -22,6 +22,14 @@ border-radius: 20px; margin-right: 10px; } + .team-icon.outlined { + border-width: 4px; + border-style: solid; + margin-right: 0; + } + .team-icon.empty { + background-color: transparent !important; + } .team-name { font-weight: bold; @@ -211,3 +219,19 @@ width: 35%; height: 200px; } + + + +.scoreboard { + td.score, th.score { + text-align: center; + } + td.total.score { + font-size: 20px; + } + td .team-wrap { + display: inline-block; + } +} + + diff --git a/resources/views/scoreboard.blade.php b/resources/views/scoreboard.blade.php index 4821b16..04c9bb1 100644 --- a/resources/views/scoreboard.blade.php +++ b/resources/views/scoreboard.blade.php @@ -5,17 +5,17 @@
Team | @foreach($missions as $mission) -+ |
{{ $mission->id }}{{ $mission->hashtag }} |
@endforeach
- Score | +Score |
- @if(Auth::guest())
- {{ $mission->complete($team) ? 'Complete' : '' }}
- @else
- {{ $mission->score($team) }}
- {{ $mission->complete($team) ? 'Complete' : '' }}
- {{ $mission->progress($team)[0].'/'.$mission->progress($team)[1] }}
+ |
+ @if(!Auth::guest())
+ {{ $mission->score($team) }}pts
@endif
+
+
+ @if($mission->progress($team)[0] >= 1)
+
+ @endif
+
+ |
@endforeach
- + | {{ $team->total_score() }} |
---|