misc: 턴 선택기에 색 표기

This commit is contained in:
2021-12-26 00:00:56 +09:00
parent dad01b45e4
commit e6038b854e
5 changed files with 154 additions and 126 deletions
+142 -119
View File
@@ -1,157 +1,180 @@
@use "sass:math";
@use "sass:color";
@import "@scss/common/break_500px.scss";
@import "@scss/common/variables.scss";
@import "@scss/common/bootswatch_custom_variables.scss";
@import "@scss/game_bg.scss";
$modcolor2: color.adjust($nbase2color, $lightness: +5%);
.turn_pad {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
background-color: $nbase2color;
}
#mainTable {
.subRows {
display: grid;
grid-template-columns: 1fr;
line-height: 1.05em;
}
.subRows {
display: grid;
grid-template-columns: 1fr;
line-height: 1.05em;
}
.chiefCommand .time_pad {
align-self: center;
text-align: center;
background-color: black;
line-height: 30px;
}
.chiefCommand {
.time_pad {
align-self: center;
text-align: center;
background-color: black;
line-height: 30px;
}
.turn_pad {
line-height: 30px;
}
.row:nth-child(even) .turn_pad {
background-color: $modcolor2;
}
}
}
.commandBox {
position: relative;
position: relative;
}
@include media-1000px {
#container {
width: 1000px;
margin: 0 auto;
position: relative;
}
#mainTable {
display: grid;
grid-template-columns: 24px repeat(4, 1fr) 24px;
.commandPad {
margin-left: 0;
#container {
width: 1000px;
margin: 0 auto;
position: relative;
}
.subRows {
display: grid;
grid-template-columns: 1fr;
#mainTable {
display: grid;
grid-template-columns: 24px repeat(4, 1fr) 24px;
.commandPad {
margin-left: 0;
}
.subRows {
display: grid;
grid-template-columns: 1fr;
}
.turnIdx {
text-align: center;
}
.time_pad {
height: 30px;
}
}
.turnIdx {
text-align: center;
#bottomChiefBox {
display: none;
}
.time_pad {
height: 30px;
.only500px {
display: none !important;
}
}
#bottomChiefBox {
display: none;
}
.only500px {
display: none !important;
}
}
@include media-500px {
.only1000px {
display: none !important;
}
.targetIsNotMe {
display: none;
}
#container {
position: relative;
width: 500px;
height: 460px;
margin: auto;
overflow: hidden;
}
#mainTable {
display: block;
height: 420px;
}
#mainTable.targetIsNotMe {
display: grid;
grid-template-columns: 24px 260px 24px;
margin-top: 10px;
margin-left: calc((500px - 24px - 260px - 24px) / 2);
.commandBox {
display: none;
}
}
.commandBox .controlPad{
margin-top: 10px;
}
#bottomChiefBox {
position: relative;
left: calc(50% - 250px);
width: 500px;
height: 320px;
overflow: hidden;
}
#bottomChiefList {
bottom: 0;
left: 0;
width: 1000px;
font-size: 20px;
transform-origin: left top;
transform: scale(0.5);
display: grid;
grid-template-columns: 24px repeat(4, 1fr) 24px;
.subRows {
display: grid;
grid-template-columns: 1fr;
line-height: 1.05em;
.only1000px {
display: none !important;
}
.subRows:not(:first-child) {
border-left: solid 1px white;
.targetIsNotMe {
display: none;
}
.tableCell {
overflow: hidden;
white-space: nowrap;
text-align: center;
#container {
position: relative;
width: 500px;
height: 460px;
margin: auto;
overflow: hidden;
}
.nameHeader {
text-align: center;
font-size: 28px;
line-height: 36px;
overflow: hidden;
white-space: nowrap;
#mainTable {
display: block;
height: 420px;
}
.turnIdx {
font-size: 20px;
text-align: center;
#mainTable.targetIsNotMe {
display: grid;
grid-template-columns: 24px 260px 24px;
margin-top: 10px;
margin-left: calc((500px - 24px - 260px - 24px) / 2);
.commandBox {
display: none;
}
}
.commandBox .controlPad {
margin-top: 10px;
.turn_pad:nth-child(even) {
background-color: $modcolor2;
}
}
#bottomChiefBox {
position: relative;
left: calc(50% - 250px);
width: 500px;
height: 320px;
overflow: hidden;
.turn_pad:nth-child(even) {
background-color: $modcolor2;
}
}
#bottomChiefList {
bottom: 0;
left: 0;
width: 1000px;
font-size: 20px;
transform-origin: left top;
transform: scale(0.5);
display: grid;
grid-template-columns: 24px repeat(4, 1fr) 24px;
.subRows {
display: grid;
grid-template-columns: 1fr;
line-height: 1.05em;
}
.subRows:not(:first-child) {
border-left: solid 1px white;
}
.tableCell {
overflow: hidden;
white-space: nowrap;
text-align: center;
}
.nameHeader {
text-align: center;
font-size: 28px;
line-height: 36px;
overflow: hidden;
white-space: nowrap;
}
.turnIdx {
font-size: 20px;
text-align: center;
}
}
}
}
+1 -1
View File
@@ -20,7 +20,7 @@
<div class="col">{{ officer?((officer?.turnTime ?? " - ").slice(-5)):'' }}</div>
</div>
<div
class="tableCell align-self-center"
class="tableCell align-self-center turn_pad"
v-for="(turn, idx) in officer?.turn??[]"
:key="idx"
:style="{
+5 -5
View File
@@ -1,5 +1,5 @@
<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="col-5 align-self-center text-end">
{{ officer ? `${officer.officerLevelText} : ` : "" }}
@@ -13,12 +13,12 @@
{{ officer?.name }}
</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">
{{ turnTimes[vidx - 1] ?? "" }}
{{ turnTimes[vidx - 1] }}
</div>
<div
class="center turn_pad"
class="center"
v-if="!officer || (!officer.turn) || !(vidx - 1 in officer.turn)"
></div>
<div
@@ -66,7 +66,7 @@ export default defineComponent({
if (!this.officer || !this.officer.turnTime) {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
for (const _ of range(this.maxTurn)) {
turnTimes.push("");
turnTimes.push("\xa0");
}
} else {
const baseTurnTime = parseTime(this.officer.turnTime);
+6
View File
@@ -539,6 +539,8 @@ export default defineComponent({
});
</script>
<style lang="scss">
@use "sass:color";
@import "@scss/common/break_500px.scss";
@import "@scss/common/variables.scss";
@import "@scss/common/bootswatch_custom_variables.scss";
@@ -616,6 +618,10 @@ export default defineComponent({
background-color: $nbase2color;
}
.turn_pad:nth-child(8n) {
background-color: color.adjust($nbase2color, $lightness: +5%);
}
.turn_pad .turn_text {
display: inline-block;
white-space: nowrap;
@@ -479,7 +479,6 @@ export default defineComponent({
.turn_pad {
white-space: nowrap;
background-color: $nbase2color;
}
.turn_pad .turn_text {