diff --git a/assets/scss/common/tabs.scss b/assets/scss/common/tabs.scss index 2242602..69eb549 100644 --- a/assets/scss/common/tabs.scss +++ b/assets/scss/common/tabs.scss @@ -28,8 +28,8 @@ .v-slide-group__content { border-bottom: 1px solid map-deep-get($config, - #{$theme}, - "v-tabs-items-border-color" + #{$theme}, + "v-tabs-items-border-color" ); } @@ -68,11 +68,11 @@ } &:hover { - color: map-deep-get( + color: map-deep-get( $config, #{$theme}, "v-tabs-hover-color" - ) !important + ) !important; } &:not(.v-tab--active){ diff --git a/assets/scss/var.scss b/assets/scss/var.scss index da9a557..5defad7 100644 --- a/assets/scss/var.scss +++ b/assets/scss/var.scss @@ -120,7 +120,7 @@ $config: ( v-tabs-active-border-color: rgba(255, 255, 255, 0.7), v-dialog-card-text-color: #fff, tui-datepicker-backgroundColor: #0d0f17, - tui-datepicker-border-color: rgb(66, 66, 66), + tui-datepicker-border-color: rgba(255, 255, 255, 0.3), tui-datepicker-selectable-hover-color: #2d3355, tui-datepicker-selected-color: #1a4e87, tui-datepicker-calendar-color: #fff, @@ -252,7 +252,7 @@ $config: ( v-tabs-hover-color: #1677FF, v-dialog-card-text-color: #111, tui-datepicker-backgroundColor: #fff, - tui-datepicker-border-color: #D9D9D9, + tui-datepicker-border-color: #b4b8c9, tui-datepicker-selectable-hover-color: #e1e7f3, tui-datepicker-selected-color: #4777d9, tui-datepicker-calendar-color: #111, diff --git a/components/common/Calendar.vue b/components/common/Calendar.vue index bbd4ed4..c48a8b3 100644 --- a/components/common/Calendar.vue +++ b/components/common/Calendar.vue @@ -170,9 +170,10 @@ export default { month : month, day : day } - this.$refs['planPop'].blocId = this.pageData.blocMstrList[ - this.pageData.blocId - ].blocId; + // commect blocId to run UI + // this.$refs['planPop'].blocId = this.pageData.blocMstrList[ + // this.pageData.blocId + // ].blocId; this.$refs['planPop'].dialog = true; }, updatePlan(val) { diff --git a/components/common/modal/PlanPop.vue b/components/common/modal/PlanPop.vue index 33af36e..2986c40 100644 --- a/components/common/modal/PlanPop.vue +++ b/components/common/modal/PlanPop.vue @@ -1,268 +1,195 @@