From 0bbd4df64e62a7d79d10940d13a1597842ce6cac Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 목, 02 12월 2021 10:30:32 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js | 2 src/main/webapp/views/issue/issueDetail.html | 19 + src/main/webapp/assets/styles/main.css | 130 ++++++++++++ src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.css | 395 ++++++++++++++++++++++++++++++++++++--- 4 files changed, 499 insertions(+), 47 deletions(-) diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css index fd21901..56fdb77 100644 --- a/src/main/webapp/assets/styles/main.css +++ b/src/main/webapp/assets/styles/main.css @@ -890,6 +890,14 @@ order: 12; } +.offset-detail-1 { + margin-left: 5.8%; +} + +.offset-detail-2 { + margin-left: 4%; +} + .offset-1 { margin-left: 8.3333333333%; } @@ -11335,6 +11343,7 @@ font-family: "Avenir Next W01", "Proxima Nova W01", "Rubik", -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; border: none; padding: 15px; + z-index: 3000; } @@ -11343,12 +11352,19 @@ min-width: 300px; } +} + +@media screen and (max-width: 767px) { body .daterangepicker-single { } } - body .daterangepicker::after { + display: block; + clear: both; + content: ""; +} +body .daterangepicker-single::after { display: block; clear: both; content: ""; @@ -11360,11 +11376,26 @@ margin: 10px; } +body .daterangepicker-single .calendar { + float: left; + max-width: 300px; + margin: 10px; +} + body .daterangepicker .calendar td { cursor: pointer; } +body .daterangepicker-single .calendar td { + cursor: pointer; +} + body .daterangepicker .calendar td:hover { + background-color: #1a88fb; + color: #fff; +} + +body .daterangepicker-single .calendar td:hover { background-color: #1a88fb; color: #fff; } @@ -11375,7 +11406,18 @@ border-color: #fff; } +body .daterangepicker-single .calendar td.in-range { + background-color: #1a88fb; + color: #fff; + border-color: #fff; +} body .daterangepicker .calendar td.active, body .daterangepicker .calendar td.active:hover { + background-color: #046fdf; + color: #fff; + border-color: #fff; +} + +body .daterangepicker-single .calendar td.active, body .daterangepicker-single .calendar td.active:hover { background-color: #046fdf; color: #fff; border-color: #fff; @@ -11386,7 +11428,20 @@ padding: 5px 10px; } +body .daterangepicker-single .ranges { + clear: left; + padding: 5px 10px; +} + body .daterangepicker .ranges .btn, body .daterangepicker .ranges .all-wrapper .fc-button, .all-wrapper body .daterangepicker .ranges .fc-button { + padding: 5px 10px; + line-height: 1; + vertical-align: middle; + text-transform: none; + font-size: 0.81rem; +} + +body .daterangepicker-single .ranges .btn, body .daterangepicker-single .ranges .all-wrapper .fc-button, .all-wrapper body .daterangepicker-single .ranges .fc-button { padding: 5px 10px; line-height: 1; vertical-align: middle; @@ -11401,12 +11456,30 @@ font-size: 0.72rem; } + +body .daterangepicker-single th { + font-weight: 500; + text-align: center; + padding: 5px 0px; + font-size: 0.72rem; +} + body .daterangepicker th.prev { text-align: left; cursor: pointer; } +body .daterangepicker-single th.prev { + text-align: left; + cursor: pointer; +} + body .daterangepicker th.next { + text-align: right; + cursor: pointer; +} + +body .daterangepicker-single th.next { text-align: right; cursor: pointer; } @@ -11424,11 +11497,29 @@ border: 1px solid #eee; } +body .daterangepicker-single .calendar td { + font-weight: 300; + font-size: 0.81rem; + text-align: right; + font-size: 0.81rem; + padding: 5px 8px; + border: 1px solid #eee; +} + body .daterangepicker .calendar th.month { color: #047bf8; } +body .daterangepicker-single .calendar th.month { + color: #047bf8; +} + + body .daterangepicker .calendar-table { + padding-top: 10px; +} + +body .daterangepicker-single .calendar-table { padding-top: 10px; } @@ -11437,7 +11528,17 @@ padding-bottom: 5px; } + +body .daterangepicker-single thead tr:first-child th { + border-bottom: 1px solid rgba(0, 0, 0, 0.05); + padding-bottom: 5px; +} + body .daterangepicker thead tr:first-child + tr th { + padding-top: 10px; +} + +body .daterangepicker-single thead tr:first-child + tr th { padding-top: 10px; } @@ -11445,7 +11546,18 @@ position: relative; } +body .daterangepicker-single .daterangepicker_input { + position: relative; +} + + body .daterangepicker .daterangepicker_input input { + width: 100%; + display: block; + padding-left: 35px; +} + +body .daterangepicker-single .daterangepicker_input input { width: 100%; display: block; padding-left: 35px; @@ -11474,6 +11586,8 @@ -moz-osx-font-smoothing: grayscale; content: "\e926"; } + +daterangepicker_single body .daterangepicker .fa.fa-chevron-left.glyphicon.glyphicon-chevron-left:before { @@ -29861,10 +29975,20 @@ .icon-reverse::after { transform: rotate(180deg); } +/* �썝蹂� �룿�듃 �궗�씠利� 二쇱꽍 泥섎━*/ +/*.issue-detail-label {*/ +/* font-size: 0.71rem;*/ +/* color: #777*/ +/*}*/ +.issue-detail-tab { + font-size: 0.9rem; + font-weight: 800; +} .issue-detail-label { - font-size: 0.71rem; - color: #777 + font-size: 0.9rem; + color: #777; + font-weight: 800; } input[type="number"]::-webkit-outer-spin-button, diff --git a/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.css b/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.css index 0a6fe82..42c9991 100644 --- a/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.css +++ b/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.css @@ -8,79 +8,203 @@ margin-top: 1px; top: 100px; left: 20px; - /* Calendars */ } +} + +.daterangepicker_single { + position: absolute; + color: inherit; + background-color: #fff; + border-radius: 4px; + width: 278px; + padding: 4px; + margin-top: 1px; + top: 100px; + left: 20px; +} + /* Calendars */ .daterangepicker:before, .daterangepicker:after { position: absolute; display: inline-block; border-bottom-color: rgba(0, 0, 0, 0.2); content: ''; } + + .daterangepicker_single:before, .daterangepicker_single:after { + position: absolute; + display: inline-block; + border-bottom-color: rgba(0, 0, 0, 0.2); + content: ''; } + .daterangepicker:before { top: -7px; border-right: 7px solid transparent; border-left: 7px solid transparent; border-bottom: 7px solid #ccc; } + + .daterangepicker_single:before { + top: -7px; + border-right: 7px solid transparent; + border-left: 7px solid transparent; + border-bottom: 7px solid #ccc; } + .daterangepicker:after { top: -6px; border-right: 6px solid transparent; border-bottom: 6px solid #fff; border-left: 6px solid transparent; } + + .daterangepicker_single:after { + top: -6px; + border-right: 6px solid transparent; + border-bottom: 6px solid #fff; + border-left: 6px solid transparent; } + .daterangepicker.opensleft:before { right: 9px; } + + .daterangepicker_single .opensleft:before { + right: 9px; } + .daterangepicker.opensleft:after { right: 10px; } + + .daterangepicker_single .opensleft:after { + right: 10px; } + .daterangepicker.openscenter:before { left: 0; right: 0; width: 0; margin-left: auto; margin-right: auto; } + + .daterangepicker_single .openscenter:before { + left: 0; + right: 0; + width: 0; + margin-left: auto; + margin-right: auto; } + .daterangepicker.openscenter:after { left: 0; right: 0; width: 0; margin-left: auto; margin-right: auto; } + + .daterangepicker_single .openscenter:after { + left: 0; + right: 0; + width: 0; + margin-left: auto; + margin-right: auto; } + .daterangepicker.opensright:before { left: 9px; } + .daterangepicker.opensright:after { left: 10px; } + + .daterangepicker_single .opensright:before { + left: 9px; } + + .daterangepicker_single .opensright:after { + left: 10px; } + .daterangepicker.dropup { margin-top: -5px; } - .daterangepicker.dropup:before { - top: initial; - bottom: -7px; - border-bottom: initial; - border-top: 7px solid #ccc; } - .daterangepicker.dropup:after { - top: initial; - bottom: -6px; - border-bottom: initial; - border-top: 6px solid #fff; } + + .daterangepicker_single .dropup { + margin-top: -5px; } + + .daterangepicker.dropup:before { + top: initial; + bottom: -7px; + border-bottom: initial; + border-top: 7px solid #ccc; } + .daterangepicker.dropup:after { + top: initial; + bottom: -6px; + border-bottom: initial; + border-top: 6px solid #fff; } + + .daterangepicker_single .dropup:before { + top: initial; + bottom: -7px; + border-bottom: initial; + border-top: 7px solid #ccc; } + .daterangepicker_single .dropup:after { + top: initial; + bottom: -6px; + border-bottom: initial; + border-top: 6px solid #fff; } + .daterangepicker.dropdown-menu { max-width: none; z-index: 3001; } + + .daterangepicker_single .dropdown-menu { + max-width: none; + z-index: 3001; } + .daterangepicker.single .ranges, .daterangepicker.single .calendar { float: none; } + + .daterangepicker_single .single .ranges, .daterangepicker_single.single .calendar { + float: none; } + .daterangepicker.show-calendar .calendar { display: block; } + + .daterangepicker_single .show-calendar .calendar { + display: block; } + .daterangepicker .calendar { display: none; max-width: 270px; margin: 4px; } - .daterangepicker .calendar.single .calendar-table { - border: none; } - .daterangepicker .calendar th, .daterangepicker .calendar td { - white-space: nowrap; - text-align: center; - min-width: 32px; } + + .daterangepicker_single .calendar { + display: none; + max-width: 270px; + margin: 4px; } + + + .daterangepicker .calendar.single .calendar-table { + border: none; } + + .daterangepicker_single .calendar.single .calendar-table { + border: none; } + + .daterangepicker .calendar th, .daterangepicker .calendar td { + white-space: nowrap; + text-align: center; + min-width: 32px; } + + .daterangepicker_single .calendar th, .daterangepicker_single .calendar td { + white-space: nowrap; + text-align: center; + min-width: 32px; } + .daterangepicker .calendar-table { border: 1px solid #fff; padding: 4px; border-radius: 4px; background-color: #fff; } + + .daterangepicker_single .calendar-table { + border: 1px solid #fff; + padding: 4px; + border-radius: 4px; + background-color: #fff; } + .daterangepicker table { width: 100%; margin: 0; } + + .daterangepicker_single table { + width: 100%; + margin: 0; } + .daterangepicker td, .daterangepicker th { text-align: center; width: 20px; @@ -89,52 +213,136 @@ border: 1px solid transparent; white-space: nowrap; cursor: pointer; } - .daterangepicker td.available:hover, .daterangepicker th.available:hover { - background-color: #eee; - border-color: transparent; - color: inherit; } - .daterangepicker td.week, .daterangepicker th.week { - font-size: 80%; - color: #ccc; } + + .daterangepicker_single td, .daterangepicker_single th { + text-align: center; + width: 20px; + height: 20px; + border-radius: 4px; + border: 1px solid transparent; + white-space: nowrap; + cursor: pointer; } + + .daterangepicker td.available:hover, .daterangepicker th.available:hover { + background-color: #eee; + border-color: transparent; + color: inherit; } + + .daterangepicker_single td.available:hover, .daterangepicker_single th.available:hover { + background-color: #eee; + border-color: transparent; + color: inherit; } + + .daterangepicker td.week, .daterangepicker th.week { + font-size: 80%; + color: #ccc; } + + .daterangepicker_single td.week, .daterangepicker_single th.week { + font-size: 80%; + color: #ccc; } + .daterangepicker td.off, .daterangepicker td.off.in-range, .daterangepicker td.off.start-date, .daterangepicker td.off.end-date { background-color: #fff; border-color: transparent; color: #999; } + + .daterangepicker_single td.off, .daterangepicker_single td.off.in-range, .daterangepicker_single td.off.start-date, .daterangepicker_single td.off.end-date { + background-color: #fff; + border-color: transparent; + color: #999; } + .daterangepicker td.in-range { background-color: #ebf4f8; border-color: transparent; color: #000; border-radius: 0; } + + .daterangepicker_single td.in-range { + background-color: #ebf4f8; + border-color: transparent; + color: #000; + border-radius: 0; } + .daterangepicker td.start-date { border-radius: 4px 0 0 4px; } + .daterangepicker td.end-date { border-radius: 0 4px 4px 0; } + .daterangepicker td.start-date.end-date { border-radius: 4px; } + + .daterangepicker_single td.start-date { + border-radius: 4px 0 0 4px; } + + .daterangepicker_single td.end-date { + border-radius: 0 4px 4px 0; } + + .daterangepicker_single td.start-date.end-date { + border-radius: 4px; } + .daterangepicker td.active, .daterangepicker td.active:hover { background-color: #357ebd; border-color: transparent; color: #fff; } + + .daterangepicker_single td.active, .daterangepicker_single td.active:hover { + background-color: #357ebd; + border-color: transparent; + color: #fff; } + .daterangepicker th.month { width: auto; } + + .daterangepicker_single th.month { + width: auto; } + .daterangepicker td.disabled, .daterangepicker option.disabled { + color: #999; + cursor: not-allowed; + text-decoration: line-through; } + + .daterangepicker_single td.disabled, .daterangepicker_single option.disabled { color: #999; cursor: not-allowed; text-decoration: line-through; } + .daterangepicker select.monthselect, .daterangepicker select.yearselect { font-size: 12px; padding: 1px; height: auto; margin: 0; cursor: default; } + + .daterangepicker_single select.monthselect, .daterangepicker_single select.yearselect { + font-size: 12px; + padding: 1px; + height: auto; + margin: 0; + cursor: default; } + .daterangepicker select.monthselect { margin-right: 2%; width: 56%; } + .daterangepicker select.yearselect { width: 40%; } + .daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect { width: 50px; margin-bottom: 0; } + + .daterangepicker_single select.monthselect { + margin-right: 2%; + width: 56%; } + + .daterangepicker_single select.yearselect { + width: 40%; } + + .daterangepicker_single select.hourselect, .daterangepicker_single select.minuteselect, .daterangepicker_single select.secondselect, .daterangepicker_single select.ampmselect { + width: 50px; + margin-bottom: 0; } + .daterangepicker .input-mini { border: 1px solid #ccc; border-radius: 4px; @@ -146,30 +354,80 @@ margin: 0 0 5px 0; padding: 0 6px 0 28px; width: 100%; } - .daterangepicker .input-mini.active { - border: 1px solid #08c; - border-radius: 4px; } + + .daterangepicker_single .input-mini { + border: 1px solid #ccc; + border-radius: 4px; + color: #555; + height: 30px; + line-height: 30px; + display: block; + vertical-align: middle; + margin: 0 0 5px 0; + padding: 0 6px 0 28px; + width: 100%; } + + .daterangepicker .input-mini.active { + border: 1px solid #08c; + border-radius: 4px; } + .daterangepicker .daterangepicker_input { position: relative; } - .daterangepicker .daterangepicker_input i { - position: absolute; - left: 8px; - top: 8px; } + + .daterangepicker .daterangepicker_input i { + position: absolute; + left: 8px; + top: 8px; } + .daterangepicker.rtl .input-mini { padding-right: 28px; padding-left: 6px; } + .daterangepicker.rtl .daterangepicker_input i { left: auto; right: 8px; } + .daterangepicker .calendar-time { text-align: center; margin: 5px auto; line-height: 30px; position: relative; padding-left: 28px; } - .daterangepicker .calendar-time select.disabled { - color: #ccc; - cursor: not-allowed; } + + .daterangepicker .calendar-time select.disabled { + color: #ccc; + cursor: not-allowed; } + + .daterangepicker_single .input-mini.active { + border: 1px solid #08c; + border-radius: 4px; } + + .daterangepicker_single .daterangepicker_input { + position: relative; } + + .daterangepicker_single .daterangepicker_input i { + position: absolute; + left: 8px; + top: 8px; } + + .daterangepicker_single .rtl .input-mini { + padding-right: 28px; + padding-left: 6px; } + + .daterangepicker_single .rtl .daterangepicker_input i { + left: auto; + right: 8px; } + + .daterangepicker_single .calendar-time { + text-align: center; + margin: 5px auto; + line-height: 30px; + position: relative; + padding-left: 28px; } + + .daterangepicker_single .calendar-time select.disabled { + color: #ccc; + cursor: not-allowed; } .ranges { font-size: 11px; @@ -266,4 +524,73 @@ .daterangepicker.rtl .ranges { float: right; } .daterangepicker .calendar.left { + clear: none !important; } } + +/* single add */ +@media (min-width: 564px) { + .daterangepicker-single { + width: auto; } + .daterangepicker-single .ranges ul { + width: 160px; } + .daterangepicker-single .single .ranges ul { + width: 100%; } + .daterangepicker-single .single .calendar.left { + clear: none; } + .daterangepicker-single .single .ltr .ranges, .daterangepicker-single .single.ltr .calendar { + float: left; } + .daterangepicker_single .rtl .ranges, .daterangepicker-single .single.rtl .calendar { + float: right; } + .daterangepicker-single .ltr { + direction: ltr; + text-align: left; } + .daterangepicker-single .ltr .calendar.left { + clear: left; + margin-right: 0; } + .daterangepicker-single .ltr .calendar.left .calendar-table { + border-right: none; + border-top-right-radius: 0; + border-bottom-right-radius: 0; } + .daterangepicker-single .ltr .calendar.right { + margin-left: 0; } + .daterangepicker-single .ltr .calendar.right .calendar-table { + border-left: none; + border-top-left-radius: 0; + border-bottom-left-radius: 0; } + .daterangepicker-single .ltr .left .daterangepicker_input { + padding-right: 12px; } + .daterangepicker-single .ltr .calendar.left .calendar-table { + padding-right: 12px; } + .daterangepicker-single .ltr .ranges, .daterangepicker-single .ltr .calendar { + float: left; } + .daterangepicker-single .rtl { + direction: rtl; + text-align: right; } + .daterangepicker-single .rtl .calendar.left { + clear: right; + margin-left: 0; } + .daterangepicker-single .rtl .calendar.left .calendar-table { + border-left: none; + border-top-left-radius: 0; + border-bottom-left-radius: 0; } + .daterangepicker-single .rtl .calendar.right { + margin-right: 0; } + .daterangepicker-single .rtl .calendar.right .calendar-table { + border-right: none; + border-top-right-radius: 0; + border-bottom-right-radius: 0; } + .daterangepicker-single .rtl .left .daterangepicker_input { + padding-left: 12px; } + .daterangepicker-single .rtl .calendar.left .calendar-table { + padding-left: 12px; } + .daterangepicker-single .rtl .ranges, .daterangepicker-single .rtl .calendar { + text-align: right; + float: right; } } +@media (min-width: 730px) { + .daterangepicker-single .ranges { + width: auto; } + .daterangepicker-single .ltr .ranges { + float: left; } + .daterangepicker-single .rtl .ranges { + float: right; } + .daterangepicker-single .calendar.left { clear: none !important; } } \ No newline at end of file diff --git a/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js b/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js index 70477aa..8f6fbdb 100644 --- a/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js +++ b/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js @@ -101,7 +101,7 @@ } if (typeof options.template !== 'string' && !(options.template instanceof $)) - options.template = '<div class="daterangepicker' + single + ' dropdown-menu">' + + options.template = '<div class="daterangepicker' + single + ' ' + 'dropdown-menu">' + '<div class="calendar left">' + '<div class="daterangepicker_input">' + '<input class="input-mini form-control" type="text" name="daterangepicker_start" value="" />' + diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html index 11d91da..e640537 100644 --- a/src/main/webapp/views/issue/issueDetail.html +++ b/src/main/webapp/views/issue/issueDetail.html @@ -86,7 +86,7 @@ <!-- �긽�꽭 �솕硫� --> <div class="support-ticket-content-w" ng-controller="issueDetailController"> <div class="support-ticket-content"> - <span ng-if="vm.viewer.parentIssueVo != null" class="badge" ng-style="{'background-color' : vm.viewer.issueStatusVo.color, 'border-color' : vm.viewer.issueStatusVo.color, 'color' : '#FFFFFF' }"> + <span ng-if="vm.viewer.parentIssueVo != null" class="badge" ng-style="{'background-color' : '#353535', 'border-color' : vm.viewer.issueStatusVo.color, 'color' : '#FFFFFF' }"> <span>�긽�쐞 �씠�뒋:{{vm.viewer.parentIssueVo.title}}</span> </span> @@ -165,8 +165,8 @@ <div class="col-md-4"> <div class="form-group"> <label class="issue-detail-label"><span translate="common.importance">以묒슂�룄</span></label> - <label class="issue-detail-label offset-1"><span translate="common.priority">�슦�꽑 �닚�쐞</span></label> - <label class="issue-detail-label offset-1"><span translate="issue.issueStatus">�씠�뒋 �긽�깭</span></label> + <label class="issue-detail-label offset-detail-1"><span translate="common.priority">�슦�꽑 �닚�쐞</span></label> + <label class="issue-detail-label offset-detail-2"><span translate="issue.issueStatus">�씠�뒋 �긽�깭</span></label> <div class=""> <span class="badge" ng-style="{'background-color' : vm.viewer.severityVo.color, 'border-color' : vm.viewer.severityVo.color, 'color' : '#FFFFFF' }" translate="{{vm.viewer.severityVo.name}}"></span> @@ -274,7 +274,7 @@ </div>--> <hr> <!-- <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} / {{vm.viewer.projectVo.name}}</span>--> - + <div class="issue-detail-label"> <div ng-show="fn.containsPartner('�뾽泥�')" class="row"> <div class="col-sm-2"> <div class="form-group"> @@ -327,7 +327,8 @@ </div> </div> </div> - + </div> + <div class="issue-detail-label"> <div ng-show="fn.containsPartner('ISP');" class="row"> <div class="col-sm-2"> <div class="form-group"> @@ -387,7 +388,8 @@ </div> </div> </div> - + </div> + <div class="issue-detail-label"> <div ng-show="fn.containsPartner('�샇�뒪�똿');" class="row"> <div class="col-sm-2"> <div class="form-group"> @@ -448,8 +450,7 @@ </div> </div> </div> - - + </div> <div class="row mt-30"> <div class="col-md-10"> @@ -537,7 +538,7 @@ <h6 class="todo-content-subheader mt-30" translate="common.content">�궡�슜</h6> <div class="box mt-10 issue-detail-word-break width-100" > - <div ng-bind-html="$root.$sce.trustAsHtml(vm.viewer.description)"></div> + <div class="issue-detail-tab" ng-bind-html="$root.$sce.trustAsHtml(vm.viewer.description)"></div> <span class="fc-grey" ng-if="!$root.isDefined(vm.viewer.description)" translate="common.noContent"> �궡�슜�씠 �뾾�뒿�땲�떎. </span> -- Gitblit v1.8.0