From 7b4b71ee33c7a42383d3e6a69885d521fd7b6688 Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 수, 08 12월 2021 17:25:23 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/webapp/assets/styles/main.css | 108 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 88 insertions(+), 20 deletions(-) diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css index 30df0e3..ad1020d 100644 --- a/src/main/webapp/assets/styles/main.css +++ b/src/main/webapp/assets/styles/main.css @@ -897,6 +897,9 @@ .offset-detail-2 { margin-left: 4%; } +.offset-detail-3 { + margin-left: 9.2%; +} .offset-1 { margin-left: 8.3333333333%; @@ -10781,6 +10784,10 @@ border-radius: 40px; } +.btn.btn-roundRel { + border-radius: 100%; +} + .btn.btn-upper, .all-wrapper .btn-upper.fc-button { text-transform: uppercase; letter-spacing: 1px; @@ -12740,13 +12747,15 @@ .menu-w .logo-w .logo-element, .top-bar .logo-w .logo-element { content: ""; - width: 60px; - height: 30px; - background-image: url(../images/logo-owl.png); + width: 110px; + height: 40px; + background-image: url(../images/logo-kisa-en.png); + background-size: cover; position: relative; display: inline-block; vertical-align: middle; - margin-right: 20px; + margin-right: 0px; + right: 10px; -webkit-transition: all 0.2s ease; transition: all 0.2s ease; } @@ -12754,11 +12763,13 @@ .menu-w .logo-w .logo-element:after, .top-bar .logo-w .logo-element:after { content: ""; - width: 105px; - height: 31px; - background-image: url(../images/logo-owltxt.png); + width: 120px; + height: 30px; + background-image: url(../images/logo-kisa-txt.png); + background-size: cover; right: -20px; - left: 70px; + left: 110px; + top: 10px; position: absolute; -webkit-transition: all 0.2s ease; transition: all 0.2s ease; @@ -12766,14 +12777,14 @@ .menu-w .logo-w .logo:hover .logo-element, .top-bar .logo-w .logo:hover .logo-element { - -webkit-transform: translateX(5px); - transform: translateX(5px); + -webkit-transform: translateX(2px); + transform: translateX(2px); } .menu-w .logo-w .logo:hover .logo-element:after, .top-bar .logo-w .logo:hover .logo-element:after { - -webkit-transform: translateX(-10px); - transform: translateX(-10px); + -webkit-transform: translateX(-3px); + transform: translateX(-3px); } .menu-w .logo-w .logo:hover .logo-label:after, @@ -13013,7 +13024,7 @@ .menu-w .logo-w { text-align: center; - padding: 14px 1rem 14px 1.7rem; + padding: 10px 1rem 12px 1.1rem; } .menu-w .logo-w a { @@ -14260,7 +14271,7 @@ } .menu-position-side.menu-w.color-scheme-dark .logo-w { - background-color: #000035; + background-color:#f2f4f8; } .menu-position-side.menu-w.color-scheme-dark .element-search:before { @@ -16655,11 +16666,17 @@ line-height: 20px; text-align: center; } - -.auth-box-w .auth-header img { +/* 湲곗〈 濡쒓퀬 �쐞移� 諛� �겕湲� */ +/*.auth-box-w .auth-header img { width: 70px; -} +}*/ +/* �씤�꽣�꽬 吏꾪씎�썝 濡쒓퀬 �쐞移� 諛� �겕湲� 議곗젙*/ +.auth-box-w .auth-header img { + width: 120px; + position: relative; + bottom: 6px; +} .auth-box-w form { padding: 20px 50px; padding-bottom: 20px; @@ -28472,6 +28489,14 @@ margin-top: 30px !important; } +.mt-40 { + margin-top: 40px; !important; +} + +.mt-50 { + margin-top: 50px; !important; +} + .ml-10 { margin-left: 10px !important; } @@ -28681,6 +28706,27 @@ transition: .4s; } +.slider-disabled { + position: absolute; + cursor: pointer; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: #2196F3; +} + +.slider-disabled:before { + position: absolute; + content: ""; + height: 18px; + width: 18px; + left: 30px; + bottom: 4px; + background-color: white; +} + + input:checked + .slider { background-color: #2196F3; } @@ -28700,6 +28746,14 @@ } .slider.round:before { + border-radius: 50%; +} + +.slider-disabled.round { + border-radius: 34px; +} + +.slider-disabled.round:before { border-radius: 50%; } @@ -30379,6 +30433,20 @@ font-weight: 600; } +.email_font { + color: #494848; + font-size: 0.75rem; + line-height: 1.5; + font-weight: 600; +} + +.info_detail_font { + color: #000; + font-size: 1rem; + line-height: 1.5; + font-weight: 600; +} + .email_color { color:#0066ff; } @@ -30390,10 +30458,12 @@ .TemplateIMG { height: 50px; width: 50px; + margin: 20px; } .TemplateIMG-selected { border: 2px solid #0066ff; + } .TemplateIMG:active { @@ -30402,6 +30472,7 @@ .TemplateIMG:visited { border: 2px solid #0066ff; + } .Template-area { @@ -30419,7 +30490,4 @@ margin: 0 auto; } -.Email-Template-detail { - -} /* 媛꾪듃李⑦듃 end */ -- Gitblit v1.8.0