diff --git a/src/web/assets/css/main.scss b/src/web/assets/css/main.scss index c4a7133..648eb28 100644 --- a/src/web/assets/css/main.scss +++ b/src/web/assets/css/main.scss @@ -257,6 +257,27 @@ body.has-modal #main { .panel-container { position: relative; + .regions { + @extend .title-color; + @extend .is-size-7; + + position: absolute; + top: 0.45rem; + right: 0.25rem; + + opacity: 0; + transition: opacity 0.15s ease; + + .region { + background: rgba($grey-dark, 0.9); + border: rgba($grey, 0.9); + color: $grey-lighter; + border-radius: 100px; + padding: 0.2rem 0.35rem; + margin-left: 0.2rem; + } + } + .labels { @extend .font-splatoon1; @extend .title-color; @@ -389,6 +410,12 @@ body.has-modal #main { } } +.splatfest.show-regions, .splatfest:hover { + .regions { + opacity: 1; + } +} + .about-box { position: relative; margin-top: 50px; diff --git a/src/web/components/splatoon/SplatfestBox.vue b/src/web/components/splatoon/SplatfestBox.vue index 107b480..33e257f 100644 --- a/src/web/components/splatoon/SplatfestBox.vue +++ b/src/web/components/splatoon/SplatfestBox.vue @@ -11,6 +11,10 @@ +
+ {{ region | upperCase }} +
+
diff --git a/src/web/components/splatoon/SplatfestHistoryDialog.vue b/src/web/components/splatoon/SplatfestHistoryDialog.vue index 737077c..c44ed4b 100644 --- a/src/web/components/splatoon/SplatfestHistoryDialog.vue +++ b/src/web/components/splatoon/SplatfestHistoryDialog.vue @@ -26,9 +26,9 @@
-
+
- +
diff --git a/src/web/support/filters.js b/src/web/support/filters.js index 9b36c9b..08d2caa 100644 --- a/src/web/support/filters.js +++ b/src/web/support/filters.js @@ -86,3 +86,8 @@ Vue.filter('time.in', function(time) { Vue.filter('time.remaining', function (time) { return $t('time.remaining', { time }); }); + +Vue.filter('upperCase', function (value) { + if (value && value.toUpperCase) + return value.toUpperCase(); +});