misc: 턴 선택기에 색 표기

This commit is contained in:
2021-12-26 00:00:56 +09:00
parent c351ecc299
commit 6712f88037
5 changed files with 154 additions and 126 deletions
+25 -2
View File
@@ -1,14 +1,18 @@
@use "sass:math"; @use "sass:math";
@use "sass:color";
@import "@scss/common/break_500px.scss"; @import "@scss/common/break_500px.scss";
@import "@scss/common/variables.scss"; @import "@scss/common/variables.scss";
@import "@scss/common/bootswatch_custom_variables.scss"; @import "@scss/common/bootswatch_custom_variables.scss";
@import "@scss/game_bg.scss"; @import "@scss/game_bg.scss";
$modcolor2: color.adjust($nbase2color, $lightness: +5%);
.turn_pad { .turn_pad {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
background-color: $nbase2color;
} }
#mainTable { #mainTable {
@@ -18,12 +22,22 @@
line-height: 1.05em; line-height: 1.05em;
} }
.chiefCommand .time_pad { .chiefCommand {
.time_pad {
align-self: center; align-self: center;
text-align: center; text-align: center;
background-color: black; background-color: black;
line-height: 30px; line-height: 30px;
} }
.turn_pad {
line-height: 30px;
}
.row:nth-child(even) .turn_pad {
background-color: $modcolor2;
}
}
} }
.commandBox { .commandBox {
@@ -101,8 +115,12 @@
} }
} }
.commandBox .controlPad{ .commandBox .controlPad {
margin-top: 10px; margin-top: 10px;
.turn_pad:nth-child(even) {
background-color: $modcolor2;
}
} }
#bottomChiefBox { #bottomChiefBox {
@@ -112,6 +130,11 @@
width: 500px; width: 500px;
height: 320px; height: 320px;
overflow: hidden; overflow: hidden;
.turn_pad:nth-child(even) {
background-color: $modcolor2;
}
} }
#bottomChiefList { #bottomChiefList {
+1 -1
View File
@@ -20,7 +20,7 @@
<div class="col">{{ officer?((officer?.turnTime ?? " - ").slice(-5)):'' }}</div> <div class="col">{{ officer?((officer?.turnTime ?? " - ").slice(-5)):'' }}</div>
</div> </div>
<div <div
class="tableCell align-self-center" class="tableCell align-self-center turn_pad"
v-for="(turn, idx) in officer?.turn??[]" v-for="(turn, idx) in officer?.turn??[]"
:key="idx" :key="idx"
:style="{ :style="{
+5 -5
View File
@@ -1,5 +1,5 @@
<template> <template>
<div :class="['subRows', 'c-bg2', 'chiefCommand']" :style="style"> <div :class="['subRows', 'chiefCommand']" :style="style">
<div class="bg1 center row gx-0" style="font-size: 1.2em"> <div class="bg1 center row gx-0" style="font-size: 1.2em">
<div class="col-5 align-self-center text-end"> <div class="col-5 align-self-center text-end">
{{ officer ? `${officer.officerLevelText} : ` : "" }} {{ officer ? `${officer.officerLevelText} : ` : "" }}
@@ -13,12 +13,12 @@
{{ officer?.name }} {{ officer?.name }}
</div> </div>
</div> </div>
<div class="row gx-0" v-for="vidx in maxTurn" :key="vidx"> <div class="row c-bg2 gx-0" v-for="vidx in maxTurn" :key="vidx">
<div class="col-2 time_pad f_tnum"> <div class="col-2 time_pad f_tnum">
{{ turnTimes[vidx - 1] ?? "" }} {{ turnTimes[vidx - 1] }}
</div> </div>
<div <div
class="center turn_pad" class="center"
v-if="!officer || (!officer.turn) || !(vidx - 1 in officer.turn)" v-if="!officer || (!officer.turn) || !(vidx - 1 in officer.turn)"
></div> ></div>
<div <div
@@ -66,7 +66,7 @@ export default defineComponent({
if (!this.officer || !this.officer.turnTime) { if (!this.officer || !this.officer.turnTime) {
// eslint-disable-next-line @typescript-eslint/no-unused-vars // eslint-disable-next-line @typescript-eslint/no-unused-vars
for (const _ of range(this.maxTurn)) { for (const _ of range(this.maxTurn)) {
turnTimes.push(""); turnTimes.push("\xa0");
} }
} else { } else {
const baseTurnTime = parseTime(this.officer.turnTime); const baseTurnTime = parseTime(this.officer.turnTime);
+6
View File
@@ -539,6 +539,8 @@ export default defineComponent({
}); });
</script> </script>
<style lang="scss"> <style lang="scss">
@use "sass:color";
@import "@scss/common/break_500px.scss"; @import "@scss/common/break_500px.scss";
@import "@scss/common/variables.scss"; @import "@scss/common/variables.scss";
@import "@scss/common/bootswatch_custom_variables.scss"; @import "@scss/common/bootswatch_custom_variables.scss";
@@ -616,6 +618,10 @@ export default defineComponent({
background-color: $nbase2color; background-color: $nbase2color;
} }
.turn_pad:nth-child(8n) {
background-color: color.adjust($nbase2color, $lightness: +5%);
}
.turn_pad .turn_text { .turn_pad .turn_text {
display: inline-block; display: inline-block;
white-space: nowrap; white-space: nowrap;
@@ -479,7 +479,6 @@ export default defineComponent({
.turn_pad { .turn_pad {
white-space: nowrap; white-space: nowrap;
background-color: $nbase2color;
} }
.turn_pad .turn_text { .turn_pad .turn_text {