diff --git a/hwe/css/common.css b/hwe/css/common.css index 0dfca57d..60be225d 100644 --- a/hwe/css/common.css +++ b/hwe/css/common.css @@ -245,11 +245,6 @@ div.bar_out div.bar_in { padding: 0; } -.commandBasic { - background-color: black; - color: white; -} - .compensatePositive { color: skyblue; } @@ -258,10 +253,6 @@ div.bar_out div.bar_in { color: orange; } -.compensateNeutral { - color: white; -} - .commandBasic.commandImpossible { background-color: red; color: white; diff --git a/hwe/func.php b/hwe/func.php index 1600a95d..f65e3cf2 100644 --- a/hwe/func.php +++ b/hwe/func.php @@ -480,6 +480,7 @@ function getCommandTable(General $general){ 'compensation'=>$commandObj->getCompensationStyle(), 'possible'=>$commandObj->hasMinConditionMet(), 'title'=>$commandObj->getCommandDetailTitle(), + 'simpleName'=>$commandObj->getName(), 'reqArg'=>$commandObj::$reqArg, ]; } diff --git a/hwe/sammo/Command/General/che_랜덤임관.php b/hwe/sammo/Command/General/che_랜덤임관.php index 6343735e..84761596 100644 --- a/hwe/sammo/Command/General/che_랜덤임관.php +++ b/hwe/sammo/Command/General/che_랜덤임관.php @@ -25,7 +25,7 @@ use sammo\MustNotBeReachedException; class che_랜덤임관 extends Command\GeneralCommand { - static protected $actionName = '랜덤임관'; + static protected $actionName = '무작위 국가로 임관'; protected function argTest(): bool { diff --git a/hwe/sammo/Command/General/che_장수대상임관.php b/hwe/sammo/Command/General/che_장수대상임관.php index 8977fc79..939e40f1 100644 --- a/hwe/sammo/Command/General/che_장수대상임관.php +++ b/hwe/sammo/Command/General/che_장수대상임관.php @@ -24,7 +24,7 @@ use sammo\CityConst; class che_장수대상임관 extends Command\GeneralCommand{ - static protected $actionName = '따라 임관'; + static protected $actionName = '장수를 따라 임관'; static public $reqArg = true; protected function argTest():bool{ diff --git a/hwe/scss/common_legacy.scss b/hwe/scss/common_legacy.scss index 9520d2af..7fd1ee0a 100644 --- a/hwe/scss/common_legacy.scss +++ b/hwe/scss/common_legacy.scss @@ -247,26 +247,26 @@ div.bar_out div.bar_in { padding: 0; } -.commandBasic { - background-color: black; - color: white; -} - .compensatePositive { - color: skyblue; + color: $cyan; + display: inline-block; + width: 1rem; } .compensateNegative { - color: orange; + color: $red; + display: inline-block; + width: 1rem; } -.compensateNeutral { - color: white; +.compensateNeutral{ + display: inline-block; + width: 1rem; } -.commandBasic.commandImpossible { - background-color: red; - color: white; +.commandImpossible { + color: $red; + text-decoration: line-through $red; } .select2-selection--single.simple-select2-align-center .select2-selection__rendered { diff --git a/hwe/scss/vue-multiselect.scss b/hwe/scss/vue-multiselect.scss index 223d410d..acbe7415 100644 --- a/hwe/scss/vue-multiselect.scss +++ b/hwe/scss/vue-multiselect.scss @@ -1,12 +1,5 @@ @use "sass:math"; - -$vue-multiselect-disabled-color: $white; -$vue-multiselect-disabled-bg: $gray-700; -$form-select-color: $white; -$vue-multiselect-bg: $black; -$vue-multiselect-color: $white; -$vue-multiselect-tag-color: $white; -$vue-multiselect-spinner-color: $white; +$vue-multiselect-disabled-bg: $gray-400; $vue-multiselect-padding-x: $form-select-padding-x !default; $vue-multiselect-padding-y: $form-select-padding-y !default; diff --git a/hwe/ts/ReservedCommand.vue b/hwe/ts/ReservedCommand.vue index c2f4d8d2..5ca6a61b 100644 --- a/hwe/ts/ReservedCommand.vue +++ b/hwe/ts/ReservedCommand.vue @@ -75,7 +75,7 @@ 'white-space': 'nowrap', 'font-size': `${Math.min( 14, - (70 / (`${turnObj.year ?? 1}`.length + 8)) * 1.8 + (75 / (`${turnObj.year ?? 1}`.length + 8)) * 1.8 )}px`, overflow: 'hidden', }" @@ -136,7 +136,7 @@ :group-select="false" group-values="values" group-label="category" - label="title" + label="searchText" track-by="value" open-direction="top" :show-labels="false" @@ -149,7 +149,34 @@ :maxHeight="400" > 검색 결과가 없습니다. - {{ props.option.title }} + + + ▲ + ▼ + + + {{ props.option.title }} + + + + + {{ props.option.category }} + + + + {{ props.option.simpleName }} +