diff --git a/src/@core/components/widgets/stats/ChartOptions.js b/src/@core/components/widgets/stats/ChartOptions.js index 60e0d5c..38303a1 100644 --- a/src/@core/components/widgets/stats/ChartOptions.js +++ b/src/@core/components/widgets/stats/ChartOptions.js @@ -11,7 +11,7 @@ export const areaChartOptions = { grid: { show: false }, - colors: ['#7367F0'], + colors: ['#8a1c05'], dataLabels: { enabled: false }, @@ -66,7 +66,7 @@ export const lineChartOptions = { grid: { show: false }, - colors: ['#7367F0'], + colors: ['#8a1c05'], dataLabels: { enabled: false }, diff --git a/src/@core/scss/base/pages/app-email.scss b/src/@core/scss/base/pages/app-email.scss index fc53084..d37ed66 100644 --- a/src/@core/scss/base/pages/app-email.scss +++ b/src/@core/scss/base/pages/app-email.scss @@ -58,7 +58,7 @@ $email_details_header_height: 5rem; color: $primary; } &.active { - border-color: #7367f0; + border-color: #8a1c05; } } } diff --git a/src/@core/scss/base/pages/app-todo.scss b/src/@core/scss/base/pages/app-todo.scss index ade2e5e..47970d8 100644 --- a/src/@core/scss/base/pages/app-todo.scss +++ b/src/@core/scss/base/pages/app-todo.scss @@ -49,7 +49,7 @@ color: $primary; } &.active { - border-color: #7367f0; + border-color: #8a1c05; } } } diff --git a/src/@core/scss/base/plugins/forms/form-file-uploader.scss b/src/@core/scss/base/plugins/forms/form-file-uploader.scss index 9957e6a..d1c8706 100644 --- a/src/@core/scss/base/plugins/forms/form-file-uploader.scss +++ b/src/@core/scss/base/plugins/forms/form-file-uploader.scss @@ -14,7 +14,7 @@ left: 0; width: 100%; height: 100%; - color: #7367f0; + color: #8a1c05; display: flex; justify-content: center; align-items: center; diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css index be00a39..256058c 100644 --- a/src/assets/css/custom.css +++ b/src/assets/css/custom.css @@ -76,10 +76,10 @@ button{border:0;background:transparent;} /*레이아웃*/ .pal-container{background:#ddd;height:100vh;position:relative;} .map{width:calc(100% - 80px);position:absolute;right:0;} -.left-layer{width:350px;height:100vh;background:#ddd;position:absolute;left:80px;color:#fff;z-index: 999;padding:14px;overflow: auto;} -.right-layer{width:350px;height:100vh;background:#ddd;position:absolute;right:-350px;color:#fff;z-index: 999;padding:14px;transition: 0.5s ease;-webkit-transition: 0.5s ease;overflow:auto;} +.left-layer{width:350px;height:100vh;background:#fff;position:absolute;left:80px;color:#fff;z-index: 999;padding:14px;overflow: auto;} +.right-layer{width:350px;height:100vh;background:#fff;position:absolute;right:-350px;color:#fff;z-index: 999;padding:14px;transition: 0.5s ease;-webkit-transition: 0.5s ease;overflow:auto;} .right-layer.active{right:0px;transition: 0.5s ease;-webkit-transition: 0.5s ease;} -.right-layer-btn{width:40px;height:40px;position:absolute;right:0px;top:50%;transform: translateY(-50%);border:0;background:#7367f0;border-top-left-radius:5px;border-bottom-left-radius:5px;transition: 0.5s ease;-webkit-transition: 0.5s ease;} +.right-layer-btn{width:40px;height:40px;position:absolute;right:0px;top:50%;transform: translateY(-50%);border:0;background:#8a1c05;border-top-left-radius:5px;border-bottom-left-radius:5px;transition: 0.5s ease;-webkit-transition: 0.5s ease;} .right-layer-btn svg{color:#fff;} .right-menu.active .right-layer-btn{right:350px;transition: 0.5s ease;-webkit-transition: 0.5s ease;} .layer-content + .layer-content{margin-top:14px;} @@ -98,13 +98,19 @@ button{border:0;background:transparent;} .layer-ti .badge{font-weight:500;font-size:13px;} /*레이어 상세정보-검색*/ -.layer-search .input-group .form-control{height:35px;font-size: 0.875rem;color:#b5b5b7;background:#283046;border:1px solid #404656;border-right:0;} -.layer-search .input-group .form-control:focus{border-color:#7367f0;border-right:1px solid #7367f0;border-right:0px;} -.layer-search .input-group .form-control::placeholder{color:#777;} -.layer-search .btn{height:35px;border-top-left-radius:0;border-bottom-left-radius:0;position:relative;background:#283046;border-color:#404656;} -.layer-search .btn:active{background:#7367f0;border:1px solid #7367f0;} +.layer-search .input-group .form-control{height:35px;font-size: 0.875rem;color:#b5b5b7;border-right:0;} +.layer-search .input-group .form-control:focus{border-color:#8a1c05;border-right:1px solid #8a1c05;border-right:0px;} +.layer-search .input-group .form-control::placeholder{color:#555;} +.layer-search .btn{height:35px;border-top-left-radius:0;border-bottom-left-radius:0;position:relative;} +.layer-search .btn:active{background:#8a1c05;border:1px solid #8a1c05;} .layer-search .btn svg{position:absolute;left:50%;top:50%;transform: translate(-50%,-50%);} +.dark-layout .layer-search .input-group .form-control{color:#b5b5b7;background:#283046;border:1px solid #404656;border-right:0;} +.dark-layout .layer-search .input-group .form-control:focus{border-color:#8a1c05;border-right:1px solid #8a1c05;} +.dark-layout .layer-search .input-group .form-control::placeholder{color:#777;} +.dark-layout .layer-search .btn{background:#283046;border-color:#404656;} + + /*레이어 상세정보-필터*/ .layer-filter{background:#283046;border:1px solid #404656;border-radius: 5px;} .layer-filter-ti{display:flex;align-items: center;} @@ -122,7 +128,7 @@ button{border:0;background:transparent;} .square_check > div{text-align:center;border-top:1px solid #404656;} .square_check .btn{border:1px solid #404656;border-left:0px;border-radius:0px;font-size: 13px;color:#bbb;font-weight:300;} .square_check .btn:first-child{border-left:1px solid #404656;} -.square_check .btn.btn-checked{background:#7367f0;color:#fff;font-weight:400;} +.square_check .btn.btn-checked{background:#8a1c05;color:#fff;font-weight:400;} .square_check .btn-group, .btn-group-vertical{display:flex;flex-wrap: wrap;} .square_check .btn-group.box_3n .btn{width:33.333%;padding: 14px 0;} .box_3n label:nth-child(n+1):nth-child(-n+99999){border-top:0px;} @@ -143,8 +149,9 @@ button{border:0;background:transparent;} } /*레이어 상세정보-리스트*/ .drone-list .layer-content-list{cursor: pointer;} -.layer-content-list{background:#283046;border-radius: 5px;padding:10px;color:#bbb;border: 1px solid #404656;} -.layer-content-list.on{border:2px solid #7367f0;} +.layer-content-list{background:#fff;border-radius: 5px;padding:10px;color:#555;border: 1px solid #ddd;} +.dark-layout .layer-content-list{background:#283046;color:#bbb;border: 1px solid #404656;} +.layer-content-list.on{border:2px solid #8a1c05;} .layer-content-list + .layer-content-list{margin-top:14px;} .layer-content-list dl dt{display:flex;} .layer-content-list dl dt + dt{margin-top:14px;} @@ -162,9 +169,9 @@ button{border:0;background:transparent;} .layer-content-box dl dt{display:flex;} .layer-content-box dl dt + dt{margin-top:14px;} .layer-content-box dl dt div{flex:auto;font-size: 0.875rem;} -.layer-content-box dl dt .list-left-txt{text-align: left;font-weight:500;min-width: 70px;} +.layer-content-box dl dt .list-left-txt{text-align: left;font-weight:500;min-width: 70px;color: #777;} .layer-content-box dl dt .list-right-txt{text-align: right;} - +.dark-layout .layer-content-box dl dt .list-left-txt{color:#bbb} /* 스크롤바 설정*/ *::-webkit-scrollbar{width: 6px;height:6px;} @@ -192,7 +199,7 @@ button{border:0;background:transparent;} /*tab-menu*/ .tab-menu ul{display:flex;} .tab-menu ul li{flex:1;text-align: center;padding:10px 0;font-weight:500;cursor: pointer;} -.tab-menu ul li.active{border-bottom:2px solid #7367f0;} +.tab-menu ul li.active{border-bottom:2px solid #8a1c05;} .tab-content{display:none;} .tab-content.active{display:block;} @@ -219,22 +226,24 @@ button{border:0;background:transparent;} .layer-switch-list .dot-icon.color-skyblue{background:#009cad;} .layer-switch-list svg{margin-right:8px;} .layer-switch-list .custom-switch .custom-control-label:after{top:2px;} +.map-btn{border:1px solid #ddd;border-radius:0.358rem} .map-btn .btn-group, .btn-group-vertical{width:100%;} .map-btn button:hover{box-shadow:none!important;} -.map-btn button{color:#555!important;background:#fff!important;border-color:#ddd!important;} -.map-btn button:focus{color:#7367f0;background:#7367f0!important;color:#fff!important;border-color:rgba(34, 41, 47, 0.08) !important} +.map-btn button{color:#555!important;background:#fff!important;} +.map-btn button:focus{color:#8a1c05;background:#8a1c05!important;color:#fff!important;border-color:rgba(34, 41, 47, 0.08) !important} .dark-layout .map-btn button{color:#bbb!important;background:#283046!important;border-color:rgba(34, 41, 47, 0.08) !important;} -.dark-layout .map-btn button:focus{color:#7367f0;background:#7367f0!important;color:#fff!important;border-color:rgba(34, 41, 47, 0.08) !important} -.map-btn .btn-primary{background:#7367f0!important;color:#fff!important;} +.dark-layout .map-btn button:focus{color:#8a1c05;background:#8a1c05!important;color:#fff!important;border-color:rgba(34, 41, 47, 0.08) !important} +.map-btn .btn-primary{background:#8a1c05!important;color:#fff!important;} /* .map-btn .btn-group > .btn:not([class*='btn-outline-']):not([class*='btn-flat-']):not([class*='btn-gradient-']):not([class*='btn-relief-']):first-child, .map-btn .btn-group > .btn:not([class*='btn-outline-']):not([class*='btn-flat-']):not([class*='btn-gradient-']):not([class*='btn-relief-']):first-of-type{border-left-color:transparent!important;} .map-btn .btn-group [class*='btn-']:not([class*='btn-outline-']):not([class*='btn-flat-']):not([class*='btn-gradient-']):not([class*='btn-relief-']){border-left-color:#9489ff!important;} */ /*left메뉴*/ h1.logo{width:50px;height:50px;margin:0px auto 60px auto;text-align:center;} h1.logo img{width:100%;} -h1.logo span{display:block;color:#f4f4f4;font-weight:bold;letter-spacing:2px;font-size:0.9375rem;} -.left-menu{width:80px;height:100vh;background:#ddd;padding-top:20px;position:fixed;} -.dark-layout .left-menu{background:#283046;} +h1.logo span{display:block;color:#8a1c05;font-weight:bold;letter-spacing:2px;font-size:0.9375rem;} +.dark-layout h1.logo span{color:#f4f4f4;} +.left-menu{width:80px;height:100vh;background:#fff;padding-top:20px;position:fixed;border-right:1px solid #ddd;} +.dark-layout .left-menu{background:#283046;border-right:0;} .left-menu-nav, .left-menu-footer{color:#bbb;} .left-menu-nav li, .left-menu-footer li{margin-top:20px;text-align:center;} .left-menu-footer{position:absolute;bottom:20px;left:50%;transform: translateX(-50%);} @@ -244,14 +253,17 @@ h1.logo span{display:block;color:#f4f4f4;font-weight:bold;letter-spacing:2px;fon .socket_off{display:block;width:32px;height:32px;border-radius:100%;background:#ed1125;position: relative;} .socket_off svg{color:#fff;margin-top:4px;} .socket_off::after{content:'';display:block;width:10px;height:10px;border:2px solid #ddd;border-radius:100%;background:#ed1125;position: absolute;right:0;bottom:0px;} -.logout-btn{cursor: pointer;color:#f4f4f4;} +.logout-btn{cursor: pointer;color:#555;} .socket_on svg{animation: rotate-icon 5s linear infinite;transform-origin: 50% 50%;} @keyframes rotate-icon{100% {transform: rotate(360deg);}} .left-menu-nav li{margin-top:40px;} -.left-menu-nav li button{color:#f4f4f4;} -.left-menu-nav li button svg{color:#f4f4f4;} -.left-menu-nav li button svg path{fill:#f4f4f4;} - +.left-menu-nav li button{color:#8a1c05;} +.left-menu-nav li button svg{color:#8a1c05;} +.left-menu-nav li button svg path{fill:#8a1c05;} +.dark-layout .left-menu-nav li button{color:#f4f4f4;} +.dark-layout .left-menu-nav li button svg{color:#f4f4f4;} +.dark-layout .left-menu-nav li button svg path{fill:#f4f4f4;} +.dark-layou .logout-btn{color:#f4f4f4;} /* fligth path draw */ .left-menu-nav li .check{background-color: #283046; font-size:0.9rem; color: white; width:70px; border: 0px;} .left-menu-nav.test{position: relative; z-index: 1; cursor: pointer; float: left; display: block; margin: 0px; padding: 0px; width: 28px; height: 28px; list-style: none; box-sizing: content-box !important; background: rgb(255, 255, 255);} @@ -288,7 +300,7 @@ h1.logo span{display:block;color:#f4f4f4;font-weight:bold;letter-spacing:2px;fon .login-form{width:100%;flex-direction: column;} .login-form form{width:100%;max-width:480px;} .login-form .form-control{background:#fff} -.login-form .form-control:focus{border-color:#7367f0;border-right:1px solid #7367f0;} +.login-form .form-control:focus{border-color:#8a1c05;border-right:1px solid #8a1c05;} /* .login-form .form-label-group > label{color:#bbb;} .login-form .form-control-position svg{color:#bbb;} .login-form .form-control::placeholder{color:#bbb;} @@ -305,7 +317,7 @@ h1.logo span{display:block;color:#f4f4f4;font-weight:bold;letter-spacing:2px;fon .dark-layout .login-form{background:#283046;} .dark-layout .login-form form{width:100%;padding:0 120px;} .dark-layout .login-form .form-control{background:transparent;border:1px solid #404656;} -.dark-layout .login-form .form-control:focus{border-color:#7367f0;border-right:1px solid #7367f0;} +.dark-layout .login-form .form-control:focus{border-color:#8a1c05;border-right:1px solid #8a1c05;} .dark-layout .login-form .form-label-group > label{color:#bbb;} .dark-layout .login-form .form-control-position svg{color:#bbb;} .dark-layout .login-form .form-control::placeholder{color:#bbb;} @@ -394,12 +406,12 @@ h1.logo span{display:block;color:#f4f4f4;font-weight:bold;letter-spacing:2px;fon .search-list{display:flex;align-items: center;padding:0 20px;width:100%;} .search-list .calendar-flat{border-radius: 0.357rem;height: 2.142rem;padding: 0 20px;} .search-list .calendar-flat input{padding:0px;text-align:center;} -.search-list .calendar-flat:hover{border:1px solid #7367f0;} +.search-list .calendar-flat:hover{border:1px solid #8a1c05;} .dark-layout .search-list .calendar-flat{border:1px solid #404656;} .search-list-cont{width:100%;} .search-list-cont-btn .btn{border-radius:0px;border-color: #404656!important;color:#bbb;} -/* .search-list-cont-btn .btn:focus{background-color: #7367f0!important;color:#fff!important;} */ -.search-list-cont-btn .btn.active{background-color: #7367f0!important;color:#fff!important;} +/* .search-list-cont-btn .btn:focus{background-color: #8a1c05!important;color:#fff!important;} */ +.search-list-cont-btn .btn.active{background-color: #8a1c05!important;color:#fff!important;} .search-list-cont .custom-control-label{color:#555;font-size: 0.875rem;} .dark-layout .search-list-cont .custom-control-label{color:#bbb;} .cont-ti{padding-bottom:10px!important;} @@ -539,7 +551,7 @@ input:-internal-autofill-selected { .search-info .final span{font-weight:500;font-size: 0.875rem;} .mb-10p{margin-bottom:10px;} /*서브 레프트메뉴*/ -.pal-main-menu-content .pal-navigation-main > li:first-child a{cursor: default;padding-left:8px;/*border-bottom:2px solid #7367f0;*/} +.pal-main-menu-content .pal-navigation-main > li:first-child a{cursor: default;padding-left:8px;/*border-bottom:2px solid #8a1c05;*/} .pal-navigation-main > li:first-child a > span{font-size:1.125rem;font-weight:500;} .pal-navigation-main li:first-child a > *{transition: none!important;} .pal-navigation-main li:first-child a:hover > *{transition: none!important;transform: none!important;} @@ -586,7 +598,7 @@ input:-internal-autofill-selected { .react-dataTable.pal-dateTable .rdt_TableBody .rdt_TableRow .rdt_TableCell{font-size: 0.875rem;} .react-dataTable.pal-dateTable .rdt_TableBody .rdt_TableRow .rdt_TableCell .badge.btn{font-size:85%!important;} .pal-dateTable a{color:#bbb;text-decoration: underline;} -.react-dataTable.pal-dateTable .rdt_TableBody .rdt_TableRow.primary{background: #7367f0 !important;color:#fff;} +.react-dataTable.pal-dateTable .rdt_TableBody .rdt_TableRow.primary{background: #8a1c05 !important;color:#fff;} .react-dataTable.pal-dateTable .rdt_TableBody .rdt_TableRow.secondary{background: #82868b !important;} .react-dataTable.pal-dateTable .rdt_TableBody .rdt_TableRow.success{background: #28c76f !important;} .react-dataTable.pal-dateTable .rdt_TableBody .rdt_TableRow.danger{background: #ea5455 !important;} @@ -604,14 +616,14 @@ input:-internal-autofill-selected { .react-dataTable.pal-dateTable .rdt_TableBody .rdt_TableRow.dark .rdt_TableCell, .rdt_TableRow.dark .rdt_TableCell a{color:#fff;} .react-dataTable.pal-dateTable .rdt_TableBody .rdt_TableRow.yellow .rdt_TableCell, .rdt_TableRow.yellow .rdt_TableCell a{color:#000;} -.rdt_TableRow.primary .rdt_TableCell a:hover{color:#7367f0;} -.rdt_TableRow.secondary .rdt_TableCell a:hover{color:#7367f0;} -.rdt_TableRow.success .rdt_TableCell a:hover{color:#7367f0;} -.rdt_TableRow.danger .rdt_TableCell a:hover{color:#7367f0;} -.rdt_TableRow.warning .rdt_TableCell a:hover{color:#7367f0;} -.rdt_TableRow.info .rdt_TableCell a:hover{color:#7367f0;} -.rdt_TableRow.dark .rdt_TableCell a:hover{color:#7367f0;} -.rdt_TableRow.yellow .rdt_TableCell a:hover{color:#7367f0;} +.rdt_TableRow.primary .rdt_TableCell a:hover{color:#8a1c05;} +.rdt_TableRow.secondary .rdt_TableCell a:hover{color:#8a1c05;} +.rdt_TableRow.success .rdt_TableCell a:hover{color:#8a1c05;} +.rdt_TableRow.danger .rdt_TableCell a:hover{color:#8a1c05;} +.rdt_TableRow.warning .rdt_TableCell a:hover{color:#8a1c05;} +.rdt_TableRow.info .rdt_TableCell a:hover{color:#8a1c05;} +.rdt_TableRow.dark .rdt_TableCell a:hover{color:#8a1c05;} +.rdt_TableRow.yellow .rdt_TableCell a:hover{color:#8a1c05;} @media only screen and (min-width: 768px) and (max-width: 1024px){ @@ -703,7 +715,7 @@ background-size: 75% auto; /*데이터피커 (달력) 기본 css*/ .calendar-flat{border:1px solid #ddd;;border-radius: 0.357rem;height: 2.142rem;padding: 0 20px;} .calendar-flat input{padding:0px;font-size: 0.875rem;} -.calendar-flat:hover{border:1px solid #7367f0;} +.calendar-flat:hover{border:1px solid #8a1c05;} .dark-layout .calendar-flat{border:1px solid #404656;background: #283046} /*시뮬레이터*/ @@ -713,7 +725,7 @@ background-size: 75% auto; .simulation-wrap.full{width:calc(100% - 80px);transition: 0.5s ease;-webkit-transition: 0.5s ease;} .simulation-cont{display:flex;width:100%;justify-content:space-between;align-items: center;} .simulation-slider{width:100%;} -.simulation-ti{display:flex;background: #7367f0;color: #fff; padding: 10px 20px;} +.simulation-ti{display:flex;background: #8a1c05;color: #fff; padding: 10px 20px;} .simulation-ti div{font-size:1rem;font-weight:500;} .simulation-ti-btn{padding:0;background-color: transparent!important;border:none;margin-right:1rem;} .simulation-ti-btn:focus{background-color: transparent!important;border:none;} @@ -738,7 +750,7 @@ background-size: 75% auto; .simulation-cont-box .drone-location{justify-content: space-between;align-items: center;text-align:center;} .drone-location{ flex: 1;text-align: center;} .drone-location .border-primary{flex: 1;border-radius:6px;} -.drone-location .border-primary .ti{padding:4px 10px;font-size: 0.875rem;background:#7367f0;color:#fff;} +.drone-location .border-primary .ti{padding:4px 10px;font-size: 0.875rem;background:#8a1c05;color:#fff;} .drone-location .border-primary .txt{padding:4px 10px;} .drone-location .border-secondary{flex: 1;border-radius:6px;} .drone-location .border-secondary .ti{padding:4px 10px;font-size: 0.875rem;background:#82868b;color:#fff;} @@ -762,7 +774,7 @@ background-size: 75% auto; .simulation-cont-box-img .badge{min-width:180px;display:flex;justify-content:space-between;} .simulation-cont-box-img .badge + .badge{margin-top:10px;} .simulation-icon svg{fill:#5d6373} -.date-num-focus{background:#7367f0;border-radius: 6px;color:#fff;} +.date-num-focus{background:#8a1c05;border-radius: 6px;color:#fff;} .simulation-date-num.date-num-focus div:first-child{background: #ff9f43;color:#fff;} .scroll-container {padding-bottom:10px;} @@ -792,18 +804,18 @@ background-size: 75% auto; .datepicker-custom .react-datepicker__month-read-view--down-arrow, .datepicker-custom .react-datepicker__month-year-read-view--down-arrow, .datepicker-custom .react-datepicker__navigation-icon::before{border-width: 1px 1px 0 0;top: 12px;} -.datepicker-custom .react-datepicker__navigation:hover *::before {border-color: #7367f0;} +.datepicker-custom .react-datepicker__navigation:hover *::before {border-color: #8a1c05;} .datepicker-custom .react-datepicker__day--keyboard-selected, .datepicker-custom .react-datepicker__month-text--keyboard-selected, .datepicker-custom .react-datepicker__quarter-text--keyboard-selected, -.datepicker-custom .react-datepicker__year-text--keyboard-selected{background:#7367f0;} +.datepicker-custom .react-datepicker__year-text--keyboard-selected{background:#8a1c05;} .datepicker-custom .react-datepicker__month-text.react-datepicker__month--selected:hover, .datepicker-custom .react-datepicker__month-text.react-datepicker__month--in-range:hover, .datepicker-custom .react-datepicker__month-text.react-datepicker__quarter--selected:hover, .datepicker-custom .react-datepicker__month-text.react-datepicker__quarter--in-range:hover, .datepicker-custom .react-datepicker__quarter-text.react-datepicker__month--in-range:hover, .datepicker-custom .react-datepicker__quarter-text.react-datepicker__quarter--selected:hover, -.datepicker-custom .react-datepicker__quarter-text.react-datepicker__quarter--in-range:hover {background-color:#7367f0;color:#b4b7bd;} +.datepicker-custom .react-datepicker__quarter-text.react-datepicker__quarter--in-range:hover {background-color:#8a1c05;color:#b4b7bd;} .datepicker-custom .react-datepicker__month-text:hover, .datepicker-custom .react-datepicker__quarter-text:hover {background-color: rgba(57,57,57,0.3);} .datepicker-custom .react-datepicker__month .react-datepicker__month-text, @@ -876,7 +888,7 @@ background-size: 75% auto; .data-box-header{display:flex;;align-items:center;justify-content: space-between;} .data-box-header svg{color:#fff;} .data-list-box{display:flex;margin:10px 0 4px 0;} -.data-list{background: #7367f0;border-radius: 5px;border: 1px solid #7367f0;display:flex;align-items: center;padding:0.4rem;} +.data-list{background: #8a1c05;border-radius: 5px;border: 1px solid #8a1c05;display:flex;align-items: center;padding:0.4rem;} .data-list + .data-list{margin-left:10px;} .data-list span{font-size:0.8rem;color: #ddd;font-weight:400;} .data-list span + span{margin-left:4px;} diff --git a/src/assets/images/airplan_pp.svg b/src/assets/images/airplan_pp.svg index 9ef3875..c1559a4 100644 --- a/src/assets/images/airplan_pp.svg +++ b/src/assets/images/airplan_pp.svg @@ -2,7 +2,7 @@ + y="0px" width="20px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve" style="fill: #8a1c05; transform: rotate(-45deg)"> - + - + @@ -79,7 +79,7 @@ - + @@ -105,13 +105,13 @@ - + - - + + @@ -128,7 +128,7 @@ - + diff --git a/src/assets/images/new_drone_icon_pp.svg b/src/assets/images/new_drone_icon_pp.svg index c045db6..810ea65 100644 --- a/src/assets/images/new_drone_icon_pp.svg +++ b/src/assets/images/new_drone_icon_pp.svg @@ -2,7 +2,7 @@ + y="0px" width="50px" height="30px" viewBox="0 0 30 15" enable-background="new 0 0 30 15" xml:space="preserve" style="fill: #8a1c05;"> - - + + @@ -12,7 +12,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -117,7 +117,7 @@ - + diff --git a/src/assets/images/pages/coming-soon.svg b/src/assets/images/pages/coming-soon.svg index ee51553..fb0dd77 100644 --- a/src/assets/images/pages/coming-soon.svg +++ b/src/assets/images/pages/coming-soon.svg @@ -62,8 +62,8 @@ - - + + @@ -72,7 +72,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -181,7 +181,7 @@ - + diff --git a/src/assets/images/pages/error-dark.svg b/src/assets/images/pages/error-dark.svg index 2d591ce..26d0a70 100644 --- a/src/assets/images/pages/error-dark.svg +++ b/src/assets/images/pages/error-dark.svg @@ -2,10 +2,10 @@ - + - + @@ -168,7 +168,7 @@ - + diff --git a/src/assets/images/pages/error.svg b/src/assets/images/pages/error.svg index 4370f5e..3a59f67 100644 --- a/src/assets/images/pages/error.svg +++ b/src/assets/images/pages/error.svg @@ -83,9 +83,9 @@ - + - + @@ -257,7 +257,7 @@ - + diff --git a/src/assets/images/pages/forgot-password-v2-dark.svg b/src/assets/images/pages/forgot-password-v2-dark.svg index 5df188c..83fc64f 100644 --- a/src/assets/images/pages/forgot-password-v2-dark.svg +++ b/src/assets/images/pages/forgot-password-v2-dark.svg @@ -1,14 +1,14 @@ - + - + - + @@ -20,7 +20,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -79,14 +79,14 @@ - - + + - + diff --git a/src/assets/images/pages/forgot-password-v2.svg b/src/assets/images/pages/forgot-password-v2.svg index 10dd1c8..4114a40 100644 --- a/src/assets/images/pages/forgot-password-v2.svg +++ b/src/assets/images/pages/forgot-password-v2.svg @@ -71,11 +71,11 @@ - + - + - + @@ -85,7 +85,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -140,14 +140,14 @@ - - + + - + diff --git a/src/assets/images/pages/login-v2-dark.svg b/src/assets/images/pages/login-v2-dark.svg index ac8c90d..d49c021 100644 --- a/src/assets/images/pages/login-v2-dark.svg +++ b/src/assets/images/pages/login-v2-dark.svg @@ -2,8 +2,8 @@ - - + + @@ -126,7 +126,7 @@ - + @@ -174,7 +174,7 @@ - + diff --git a/src/assets/images/pages/login-v2.svg b/src/assets/images/pages/login-v2.svg index cc1cb9d..f633364 100644 --- a/src/assets/images/pages/login-v2.svg +++ b/src/assets/images/pages/login-v2.svg @@ -151,8 +151,8 @@ - - + + @@ -277,7 +277,7 @@ - + @@ -325,7 +325,7 @@ - + diff --git a/src/assets/images/pages/not-authorized-dark.svg b/src/assets/images/pages/not-authorized-dark.svg index a17e5a4..dc48586 100644 --- a/src/assets/images/pages/not-authorized-dark.svg +++ b/src/assets/images/pages/not-authorized-dark.svg @@ -1,14 +1,14 @@ - + - + - + @@ -20,7 +20,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -79,14 +79,14 @@ - - + + - + diff --git a/src/assets/images/pages/not-authorized.svg b/src/assets/images/pages/not-authorized.svg index a2f19d6..bfee123 100644 --- a/src/assets/images/pages/not-authorized.svg +++ b/src/assets/images/pages/not-authorized.svg @@ -71,11 +71,11 @@ - + - + - + @@ -85,7 +85,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -140,14 +140,14 @@ - - + + - + diff --git a/src/assets/images/pages/register-v2-dark.svg b/src/assets/images/pages/register-v2-dark.svg index c795fa1..fcf2675 100644 --- a/src/assets/images/pages/register-v2-dark.svg +++ b/src/assets/images/pages/register-v2-dark.svg @@ -3,10 +3,10 @@ - + - - + + @@ -161,8 +161,8 @@ - - + + @@ -182,7 +182,7 @@ - + @@ -215,7 +215,7 @@ - + @@ -233,12 +233,12 @@ - + - + diff --git a/src/assets/images/pages/register-v2.svg b/src/assets/images/pages/register-v2.svg index 48b7e97..323d646 100644 --- a/src/assets/images/pages/register-v2.svg +++ b/src/assets/images/pages/register-v2.svg @@ -108,9 +108,9 @@ - - - + + + @@ -264,8 +264,8 @@ - - + + @@ -285,7 +285,7 @@ - + @@ -318,7 +318,7 @@ - + @@ -336,12 +336,12 @@ - + - + diff --git a/src/assets/images/pages/reset-password-v2-dark.svg b/src/assets/images/pages/reset-password-v2-dark.svg index a7b406a..e60d8e6 100644 --- a/src/assets/images/pages/reset-password-v2-dark.svg +++ b/src/assets/images/pages/reset-password-v2-dark.svg @@ -2,10 +2,10 @@ - + - + @@ -168,7 +168,7 @@ - + diff --git a/src/assets/images/pages/reset-password-v2.svg b/src/assets/images/pages/reset-password-v2.svg index 62f9976..b648469 100644 --- a/src/assets/images/pages/reset-password-v2.svg +++ b/src/assets/images/pages/reset-password-v2.svg @@ -83,9 +83,9 @@ - + - + @@ -257,7 +257,7 @@ - + diff --git a/src/assets/images/pages/under-maintenance-dark.svg b/src/assets/images/pages/under-maintenance-dark.svg index 430adea..d22877d 100644 --- a/src/assets/images/pages/under-maintenance-dark.svg +++ b/src/assets/images/pages/under-maintenance-dark.svg @@ -49,11 +49,11 @@ - + - + - + diff --git a/src/assets/images/pages/under-maintenance.svg b/src/assets/images/pages/under-maintenance.svg index 8861fdc..f2b6999 100644 --- a/src/assets/images/pages/under-maintenance.svg +++ b/src/assets/images/pages/under-maintenance.svg @@ -107,11 +107,11 @@ - + - + - + diff --git a/src/components/analysis/simulation/AnalysisSimulationMenu.js b/src/components/analysis/simulation/AnalysisSimulationMenu.js index 5ffcde5..c054351 100644 --- a/src/components/analysis/simulation/AnalysisSimulationMenu.js +++ b/src/components/analysis/simulation/AnalysisSimulationMenu.js @@ -2,7 +2,7 @@ import { AiOutlinePoweroff } from 'react-icons/ai'; import { ReactComponent as DroneMenuIcon } from '../../../assets/images/drone_menu_icon.svg'; import { useDispatch, useSelector } from 'react-redux'; import { Sun, Map, Bell } from 'react-feather'; -import logo from '../../../assets/images/pal_logo.png'; +import logo from '../../../assets/images/logo/kac_logo_ icon.svg'; export const AnalysisSimulationMenu = props => { return ( diff --git a/src/components/basis/flight/plan/FlightPlanAreaMapBox.js b/src/components/basis/flight/plan/FlightPlanAreaMapBox.js index 3fc1972..fca87dc 100644 --- a/src/components/basis/flight/plan/FlightPlanAreaMapBox.js +++ b/src/components/basis/flight/plan/FlightPlanAreaMapBox.js @@ -234,7 +234,7 @@ export const FlightPlanAreaMapBox = props => { source: 'geojson', layout: {}, paint: { - 'fill-color': '#7367F0', + 'fill-color': '#8a1c05', 'fill-opacity': 0.5, 'fill-outline-color': '#000000' }, diff --git a/src/components/map/mapbox/MapBoxMap.js b/src/components/map/mapbox/MapBoxMap.js index a6283a9..b57a323 100644 --- a/src/components/map/mapbox/MapBoxMap.js +++ b/src/components/map/mapbox/MapBoxMap.js @@ -572,7 +572,7 @@ export default function MapBoxMap() { const circle = new naver.maps.Circle({ strokeColor: '#283046', strokeOpacity: 1, - fillColor: '#7367F0', + fillColor: '#8a1c05', fillOpacity: 0.1, center: position, // map: mapObject, diff --git a/src/components/map/naver/NaverMap.js b/src/components/map/naver/NaverMap.js index 8553a6c..7ca91fc 100644 --- a/src/components/map/naver/NaverMap.js +++ b/src/components/map/naver/NaverMap.js @@ -481,7 +481,7 @@ export const NaverCustomMap = () => { const polygon = new naver.maps.Polygon({ strokeColor: '#283046', strokeOpacity: 0.5, - // fillColor: '#7367F0', + // fillColor: '#8a1c05', fillOpacity: 0.1, paths: square, map: mapObject diff --git a/src/components/map/naver/draw/FlightPlanDraw.js b/src/components/map/naver/draw/FlightPlanDraw.js index ca835bc..47c8def 100644 --- a/src/components/map/naver/draw/FlightPlanDraw.js +++ b/src/components/map/naver/draw/FlightPlanDraw.js @@ -300,7 +300,7 @@ export const FlightPlanDraw_init = props => { polygon = new naver.maps.Polygon({ strokeColor: '#283046', strokeOpacity: 1, - fillColor: '#7367F0', + fillColor: '#8a1c05', fillOpacity: 0.1, paths: [coord], map: map @@ -369,7 +369,7 @@ export const FlightPlanDraw_init = props => { circle = new naver.maps.Circle({ strokeColor: '#283046', strokeOpacity: 1, - fillColor: '#7367F0', + fillColor: '#8a1c05', fillOpacity: 0.1, center: coord, radius: 100, @@ -704,7 +704,7 @@ export const FlightPlanDraw_init = props => { polygon = new naver.maps.Polygon({ strokeColor: '#283046', strokeOpacity: 1, - fillColor: '#7367F0', + fillColor: '#8a1c05', fillOpacity: 0.1, paths: paths, map: map @@ -815,7 +815,7 @@ export const FlightPlanDraw_init = props => { circle = new naver.maps.Circle({ strokeColor: '#283046', strokeOpacity: 1, - fillColor: '#7367F0', + fillColor: '#8a1c05', fillOpacity: 0.1, center: paths[0], radius: areas.bufferZone, diff --git a/src/components/map/naver/draw/FlightPlanDraw_Test.js b/src/components/map/naver/draw/FlightPlanDraw_Test.js index 330b759..579ffea 100644 --- a/src/components/map/naver/draw/FlightPlanDraw_Test.js +++ b/src/components/map/naver/draw/FlightPlanDraw_Test.js @@ -306,7 +306,7 @@ export const FlightPlanDraw = props => { polygon = new naver.maps.Polygon({ strokeColor: '#283046', strokeOpacity: 1, - fillColor: '#7367F0', + fillColor: '#8a1c05', fillOpacity: 0.1, paths: [coord], map: map @@ -375,7 +375,7 @@ export const FlightPlanDraw = props => { circle = new naver.maps.Circle({ strokeColor: '#283046', strokeOpacity: 1, - fillColor: '#7367F0', + fillColor: '#8a1c05', fillOpacity: 0.1, center: coord, radius: 100, @@ -734,7 +734,7 @@ export const FlightPlanDraw = props => { polygon = new naver.maps.Polygon({ strokeColor: '#283046', strokeOpacity: 1, - fillColor: '#7367F0', + fillColor: '#8a1c05', fillOpacity: 0.1, paths: paths, map: map @@ -863,7 +863,7 @@ export const FlightPlanDraw = props => { strokeColor: '#283046', strokeOpacity: 1, // fillColor: '#ff0000', - fillColor: '#7367F0', + fillColor: '#8a1c05', fillOpacity: 0.1, center: paths[0], radius: areas.bufferZone, diff --git a/src/components/map/naver/dron/DronPlan.js b/src/components/map/naver/dron/DronPlan.js index c669b16..f6aead5 100644 --- a/src/components/map/naver/dron/DronPlan.js +++ b/src/components/map/naver/dron/DronPlan.js @@ -132,7 +132,7 @@ const DronPlan = ({ naver, map }) => { const lineBuffer = new naver.maps.Polygon({ strokeColor: '#283046', strokeOpacity: 1, - fillColor: '#7367F0', + fillColor: '#8a1c05', fillOpacity: 0.1, paths: paths, map: map @@ -148,7 +148,7 @@ const DronPlan = ({ naver, map }) => { const poly = new naver.maps.Polygon({ strokeColor: '#283046', strokeOpacity: 1, - fillColor: '#7367F0', + fillColor: '#8a1c05', fillOpacity: 0.1, paths: paths, map: map @@ -165,7 +165,7 @@ const DronPlan = ({ naver, map }) => { const circle = new naver.maps.Circle({ strokeColor: '#283046', strokeOpacity: 1, - fillColor: '#7367F0', + fillColor: '#8a1c05', fillOpacity: 0.1, center: paths[0], radius: bufferZone, diff --git a/src/components/map/naver/dron/NewDronPlan.js b/src/components/map/naver/dron/NewDronPlan.js index 97dc98a..f6f15c4 100644 --- a/src/components/map/naver/dron/NewDronPlan.js +++ b/src/components/map/naver/dron/NewDronPlan.js @@ -89,7 +89,7 @@ const NewDronPlan = ({ naver, map }) => { const lineBuffer = new naver.maps.Polygon({ strokeColor: '#283046', strokeOpacity: 1, - fillColor: '#7367F0', + fillColor: '#8a1c05', fillOpacity: 0.1, paths: paths, map: map diff --git a/src/utility/Utils.js b/src/utility/Utils.js index ffc4e75..d6ed366 100644 --- a/src/utility/Utils.js +++ b/src/utility/Utils.js @@ -70,9 +70,9 @@ export const selectThemeColors = theme => ({ ...theme, colors: { ...theme.colors, - primary25: '#7367f01a', // for option hover bg-color - primary: '#7367f0', // for selected option bg-color - neutral10: '#7367f0', // for tags bg-color + primary25: '#8a1c051a', // for option hover bg-color + primary: '#8a1c05', // for selected option bg-color + neutral10: '#8a1c05', // for tags bg-color neutral20: '#ededed', // for input border-color neutral30: '#ededed' // for input hover border-color } diff --git a/src/views/charts/apex/ApexHeatmapChart.js b/src/views/charts/apex/ApexHeatmapChart.js index 225fe2b..932ac52 100644 --- a/src/views/charts/apex/ApexHeatmapChart.js +++ b/src/views/charts/apex/ApexHeatmapChart.js @@ -66,7 +66,7 @@ const ApexHeatmapChart = () => { from: 51, to: 60, name: '50-60', - color: '#7367f0' + color: '#8a1c05' } ] } diff --git a/src/views/control/main/ControlMain.js b/src/views/control/main/ControlMain.js index f220d99..660a440 100644 --- a/src/views/control/main/ControlMain.js +++ b/src/views/control/main/ControlMain.js @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import { useHistory } from 'react-router-dom'; import '../../../assets/css/custom.css'; -import logo from '../../../assets/images/pal_logo.png'; +import logo from '../../../assets/images/logo/kac_logo_ icon.svg'; import tp_logo from '../../../assets/images/tplogo_wh.png'; import kac_logo from '../../../assets/images/kac_logo_wh.png'; @@ -173,7 +173,7 @@ const ControlMain = () => {

- PAL + UTM