From bf38ba486c59a750d8e41dcdbecbf4f250354132 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Wed, 12 Apr 2023 09:26:54 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20css=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tiles/biz/layout-tiles-biz-main.jsp | 2 +- .../webapp/resources/biz/common/css/etc.css | 22 ++++++++++++++++++- .../webapp/resources/biz/common/css/index.css | 18 +-------------- .../framework/css/common/xit-core-extend.css | 12 +++++----- .../framework/css/common/xit-core.css | 6 ++--- 5 files changed, 31 insertions(+), 29 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-main.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-main.jsp index 54061323..89dbdcf8 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-main.jsp @@ -33,7 +33,7 @@
diff --git a/src/main/webapp/resources/biz/common/css/etc.css b/src/main/webapp/resources/biz/common/css/etc.css index 05d95821..d61f5ef7 100644 --- a/src/main/webapp/resources/biz/common/css/etc.css +++ b/src/main/webapp/resources/biz/common/css/etc.css @@ -195,4 +195,24 @@ font-size: 25px; font-weight: bold; color: #333; - text-align: left; } \ No newline at end of file + text-align: left; } + +/*버튼*/ +.btn img { + display: inline-block; + margin-right: 7px; + width: 14px; +} + + +/* 버튼 */ +button .ico { + display: inline-block; + margin-top: -2px; + vertical-align: middle; } +button .ico::before { + font-size: 15px; } +button .ico.fa-file-excel { + color: green; } +button .ico.fa-file-pdf { + color: red; } \ No newline at end of file diff --git a/src/main/webapp/resources/biz/common/css/index.css b/src/main/webapp/resources/biz/common/css/index.css index abfb8bea..0edc576c 100644 --- a/src/main/webapp/resources/biz/common/css/index.css +++ b/src/main/webapp/resources/biz/common/css/index.css @@ -86,17 +86,6 @@ input[data-fmt-type=time], input[data-fmt-type=day] { } -/* 버튼 */ -button .ico { - display: inline-block; - margin-top: -2px; - vertical-align: middle; } - button .ico::before { - font-size: 15px; } - button .ico.fa-file-excel { - color: green; } - button .ico.fa-file-pdf { - color: red; } button.btnDark { border: 1px solid #564a44; @@ -111,12 +100,7 @@ button.btnDark { button.btnDark .ico.fa-file-pdf { font-weight: bold; } -/*버튼*/ -.btn img { - display: inline-block; - margin-right: 7px; - width: 14px; -} + img.ui-datepicker-trigger { diff --git a/src/main/webapp/resources/framework/css/common/xit-core-extend.css b/src/main/webapp/resources/framework/css/common/xit-core-extend.css index 32cc60ea..f6179584 100644 --- a/src/main/webapp/resources/framework/css/common/xit-core-extend.css +++ b/src/main/webapp/resources/framework/css/common/xit-core-extend.css @@ -41,21 +41,19 @@ height: 100%; } -#ifrTabs .nav-tabs{ +.nav-tabs.nav-tabs-ifr{ --bs-nav-tabs-padding-top : .3em; --bs-nav-tabs-padding-left : .3em; --bs-nav-tabs-border-radius: 0.1875rem; --bs-nav-tabs-bg-image: linear-gradient(#8AB9DB,whitesmoke); -} -#ifrTabs .nav-tabs .nav-link.active { - --bs-nav-tabs-link-active-color: #e17009; - --bs-nav-tabs-link-active-bg : #fff; -} -#ifrTabs .nav-tabs .nav-link:not(.active) { + --bs-nav-link-color: #2e6e9e; --bs-nav-link-bg-image: linear-gradient(#dfeffc,white); + --bs-nav-tabs-link-active-color: #e17009; + --bs-nav-tabs-link-active-bg : #fff; } + /* 버튼 */ .btn-red { --bs-btn-color: #fff; diff --git a/src/main/webapp/resources/framework/css/common/xit-core.css b/src/main/webapp/resources/framework/css/common/xit-core.css index 9579ca64..c7f01590 100644 --- a/src/main/webapp/resources/framework/css/common/xit-core.css +++ b/src/main/webapp/resources/framework/css/common/xit-core.css @@ -3200,6 +3200,8 @@ textarea.form-control-lg { --bs-nav-link-disabled-color: #c7cdd4; --bs-nav-link-bg : #eceef1; --bs-nav-link-bg-image : none; + --bs-nav-link-active-bg : #fff; + --bs-nav-link-active-bg-image : none; display: flex; flex-wrap: wrap; @@ -3277,7 +3279,7 @@ ul.nav-tabs > li.nav-item{ .nav-tabs .nav-item.show .nav-link { color: var(--bs-nav-tabs-link-active-color); background-color: var(--bs-nav-tabs-link-active-bg); - background-image: var(--bs-nav-link-bg-image); + background-image: var(--bs-nav-link-active-bg-image); border-color: var(--bs-nav-tabs-link-active-border-color); } .nav-tabs .dropdown-menu { @@ -8016,13 +8018,11 @@ button:focus-visible { } .nav-tabs .nav-item .nav-link { - --bs-nav-tabs-link-active-color : #566a7f; color: var(--bs-nav-tabs-link-active-color); border: 0; border-radius: 0; } .nav-tabs .nav-item .nav-link:hover, .nav-tabs .nav-item .nav-link:focus { - --bs-nav-tabs-link-active-color: #566a7f; color: var(--bs-nav-tabs-link-active-color); } .nav-tabs .nav-item .nav-link:not(.active) {