From b2b9e785e10c8fd59c3fcee8c8fda2aeb86be8c3 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 월, 27 12월 2021 13:34:22 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/webapp/assets/styles/main.css | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css index e11c3e7..b16f97f 100644 --- a/src/main/webapp/assets/styles/main.css +++ b/src/main/webapp/assets/styles/main.css @@ -262,6 +262,8 @@ margin-top: 0; margin-bottom: 1rem; overflow: auto; + white-space: pre-line; + word-break : break-word; -ms-overflow-style: scrollbar; } @@ -4855,6 +4857,11 @@ background-color: #34bfa3; } +.badge-department { + color: #fff; + background-color: #8d2b9b; +} + /*.badge-success[href]:hover, .badge-success[href]:focus { color: #fff; text-decoration: none; @@ -5218,7 +5225,7 @@ }*/ .modal-open { - overflow: auto + overflow: hidden; } .modal { @@ -5339,6 +5346,9 @@ -ms-flex: 1 1 auto; flex: 1 1 auto; padding: 1rem; + overflow-y: auto; + overflow-x: hidden; + max-height: 800px; } .modal-footer { @@ -29714,7 +29724,7 @@ z-index: 2; overflow: hidden; margin-top: 80px; - } +} .footer-w .logo-element { text-align: center; @@ -30144,6 +30154,13 @@ font-weight: 800; } +.custom-detail-label { + color: #777; + font-weight: 600; + position: relative; + top: -6px; +} + input[type="number"]::-webkit-outer-spin-button, input[type="number"]::-webkit-inner-spin-button { -webkit-appearance: none; -- Gitblit v1.8.0