diff --git a/assets/scss/common/button.scss b/assets/scss/common/button.scss index b300118..0466fdc 100644 --- a/assets/scss/common/button.scss +++ b/assets/scss/common/button.scss @@ -144,11 +144,10 @@ } &.ant-btn-danger { - &.ant-btn-background-ghost { - color: map-deep-get($config, #{$theme}, "ant-btn-danger-color"); - border-color: map-deep-get($config, #{$theme}, "ant-btn-danger-color"); - // background: map-deep-get($config, #{$theme}, "ant-btn-danger-color") !important; + color:map-deep-get($config, #{$theme}, "ant-btn-danger-color"); + border-color:map-deep-get($config, #{$theme}, "ant-btn-danger-border"); + background: map-deep-get($config, #{$theme}, "ant-btn-danger-bg") !important; } } diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss index aced6bc..f6c637a 100644 --- a/assets/scss/common/grid.scss +++ b/assets/scss/common/grid.scss @@ -204,7 +204,7 @@ overflow: auto; &::-webkit-scrollbar { - width: $scrollbar-width !important; + // width: $scrollbar-width !important; height: $scrollbar-width !important; -webkit-appearance: initial; background-color: rgba(0, 0, 0, 0) !important; @@ -352,10 +352,11 @@ } &.tui-grid-layer-editing { - background:map-deep-get($config, - #{$theme}, - "tui-grid-cell-insert-color" - ); + background: transparent; + // background:map-deep-get($config, + // #{$theme}, + // "tui-grid-cell-insert-color" + // ); } } } diff --git a/assets/scss/var.scss b/assets/scss/var.scss index 94607bc..01242e8 100644 --- a/assets/scss/var.scss +++ b/assets/scss/var.scss @@ -166,7 +166,7 @@ $config: ( ant-btn-primary-color: #212224, ant-btn-danger-bg:#D32029, ant-btn-danger-border:#D32029, - ant-btn-danger-color:#D32029, + ant-btn-danger-color:#212224, ant-btn-default-border:#FFFFFF2E, ant-btn-default-bg:#FFFFFF2E, ant-btn-default-color:#FFFFFFD9, diff --git a/components/common/modal/EqpmSelectPop.vue b/components/common/modal/EqpmSelectPop.vue index 382a439..7cea177 100644 --- a/components/common/modal/EqpmSelectPop.vue +++ b/components/common/modal/EqpmSelectPop.vue @@ -94,7 +94,7 @@ - 닫기 + 닫기 확인 diff --git a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue index 0bc2e42..d66d241 100644 --- a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue +++ b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue @@ -175,7 +175,7 @@ export default { header: '사용여부', name: 'useFg', align: 'left', - width: 100, + minWidth: 80, formatter({ value }) { value = value === true ? '1' : '0'; const newValue = _this.pageData.useFgList.filter( @@ -190,7 +190,7 @@ export default { // } // } }, - { header: '비고', name: 'rmrk', align: 'left' }, + { header: '비고', name: 'rmrk', align: 'left', minWidth: 50, }, ]; this.setGridColumn({ diff --git a/pages/comm/base/NoticeMngPage.vue b/pages/comm/base/NoticeMngPage.vue index 55fcb86..6f38061 100644 --- a/pages/comm/base/NoticeMngPage.vue +++ b/pages/comm/base/NoticeMngPage.vue @@ -60,9 +60,13 @@ 파일목록 -
- -
+
+ +
mdi-paperclip {{ fileData.apndFileNm + '.' + fileData.apndFileExt }} @@ -96,7 +100,8 @@ 파일첨부
+ :class="['file-item d-flex justify-space-between', isDarkMode?'dark':'light']" + >
mdi-paperclip {{ fileData.name }} @@ -144,7 +149,8 @@ 파일첨부
+ :class="['file-item d-flex justify-space-between', isDarkMode?'dark':'light']" + >
mdi-paperclip {{ fileData.name }} @@ -173,7 +179,7 @@
-
+
@@ -195,7 +201,8 @@ 파일첨부
+ :class="['file-item d-flex justify-space-between', isDarkMode?'dark':'light']" + >
mdi-paperclip {{ fileData.name }} @@ -204,9 +211,11 @@ @click="updateActionData.fileData.splice(index, 1)" />
-
+
+ :key="fileData.apndFileId" + :class="['file-item d-flex justify-space-between', isDarkMode?'dark':'light']" + >
mdi-paperclip .tab-item { + border: none; + background-color: transparent; + color: map-deep-get($config, #{$theme}, "card-title-color") !important; + + &.active { + color: map-deep-get($config, #{$theme}, "card-text-info-color") !important; + border-top: 1px solid map-deep-get($config, #{$theme}, "card-text-info-color"); + } + + } + } + + } + } + + .file-item { + &.#{$theme} { + width: auto; + margin: 2px 0; + padding: 4px; + background-color: map-deep-get($config, #{$theme}, "v-calendar-day-in-not-month-color"); + + .file-item-name { + color: map-deep-get($config, #{$theme}, "card-text-info-color"); + } + + } + } +}