diff --git a/assets/scss/common/input.scss b/assets/scss/common/input.scss index 518f1de..aff0420 100644 --- a/assets/scss/common/input.scss +++ b/assets/scss/common/input.scss @@ -50,6 +50,7 @@ } } + .v-input__custom { .v-input__slot { @@ -149,6 +150,11 @@ .v-input { margin-top: 0 !important; padding-top: 0 !important; + &.v-text-field--outlined { + fieldset { + top: -4px + } + } } .v-input__append-inner { @@ -449,7 +455,7 @@ input[type="checkbox"] { transform: none; &.mdi:before { - font-size: 16px; + font-size: 20px; } @if $theme ==dark { diff --git a/assets/scss/var.scss b/assets/scss/var.scss index c3355f9..b42b36d 100644 --- a/assets/scss/var.scss +++ b/assets/scss/var.scss @@ -177,13 +177,10 @@ $config: ( v-header-border: #424242, v-chart-border: #424242, v-sidebar-border: #303030, -<<<<<<< Updated upstream ant-checkbox-bg: #212224, ant-checkbox-border: #424242, -======= ant-btn-popup-bg: #212224, ant-btn-popup-color: #FFFFFFD9, ->>>>>>> Stashed changes ), light: (w-g5: $--color-gray_555, g5-w: $--color-white, @@ -324,12 +321,9 @@ $config: ( v-header-border: #D9D9D9, v-chart-border: #D9D9D9, v-sidebar-border: #F0F0F0, -<<<<<<< Updated upstream ant-checkbox-bg: #FFFFFF, ant-checkbox-border: #D9D9D9, -======= ant-btn-popup-bg: #FFFFFF, ant-btn-popup-color: #000000E0, ->>>>>>> Stashed changes ), ); \ No newline at end of file diff --git a/components/common/select/SelectReadObj.vue b/components/common/select/SelectReadObj.vue index 1d31c81..7d8bc41 100644 --- a/components/common/select/SelectReadObj.vue +++ b/components/common/select/SelectReadObj.vue @@ -21,6 +21,7 @@ outlined append-icon="" :class="['v-select__custom', customClass]" + :menu-props="{ top: false, offsetY: true }" > diff --git a/pages/comm/base/CalendarMngPage.vue b/pages/comm/base/CalendarMngPage.vue index e2473d7..4e82245 100644 --- a/pages/comm/base/CalendarMngPage.vue +++ b/pages/comm/base/CalendarMngPage.vue @@ -250,7 +250,6 @@ export default { { header: '요일', name: 'dtNm', - align: 'center', formatter({ value }) { return value + '요일'; }, @@ -258,7 +257,6 @@ export default { { header: '구분', name: 'hldyFg', - align: 'center', essential: true, formatter({ value }) { return value == 1 ? '휴일' : '평일';