Commit 1ba11b1c2e2a302802b41acb1e494a46c0298c2b

Authored by yiming
1 parent c89f4a96

深色UI调整

src/main/resources/static/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient_dark.min.css
@@ -1098,7 +1098,7 @@ iframe { @@ -1098,7 +1098,7 @@ iframe {
1098 padding: 15px; 1098 padding: 15px;
1099 background: #fafafa; 1099 background: #fafafa;
1100 color: #444; 1100 color: #444;
1101 - border: 1px solid #242738; 1101 + border: 1px solid #292e43;
1102 border-radius: 4px 1102 border-radius: 4px
1103 } 1103 }
1104 1104
@@ -1654,12 +1654,12 @@ html:not(.uk-touch) .uk-nav-offcanvas ul a:hover { @@ -1654,12 +1654,12 @@ html:not(.uk-touch) .uk-nav-offcanvas ul a:hover {
1654 .uk-navbar { 1654 .uk-navbar {
1655 background: #f7f7f7; 1655 background: #f7f7f7;
1656 color: #444; 1656 color: #444;
1657 - border: 1px solid rgba(0,0,0,.1); 1657 +/* border: 1px solid rgba(0,0,0,.1);*/
1658 border-bottom-color: rgba(0,0,0,.3); 1658 border-bottom-color: rgba(0,0,0,.3);
1659 border-radius: 4px; 1659 border-radius: 4px;
1660 background-origin: border-box; 1660 background-origin: border-box;
1661 background-image: -webkit-linear-gradient(top,#fff,#eee); 1661 background-image: -webkit-linear-gradient(top,#fff,#eee);
1662 - background-image: linear-gradient(to bottom,#3D4258,#3D4258) 1662 + background-image: linear-gradient(to bottom,#31364e,#31364e)
1663 } 1663 }
1664 1664
1665 .uk-navbar:after,.uk-navbar:before { 1665 .uk-navbar:after,.uk-navbar:before {
@@ -1710,15 +1710,15 @@ html:not(.uk-touch) .uk-nav-offcanvas ul a:hover { @@ -1710,15 +1710,15 @@ html:not(.uk-touch) .uk-nav-offcanvas ul a:hover {
1710 outline: 0; 1710 outline: 0;
1711 position: relative; 1711 position: relative;
1712 z-index: 1; 1712 z-index: 1;
1713 - border-left-color: rgba(0,0,0,.1); 1713 +/* border-left-color: rgba(0,0,0,.1);
1714 border-right-color: rgba(0,0,0,.1); 1714 border-right-color: rgba(0,0,0,.1);
1715 border-top-color: rgba(0,0,0,.1); 1715 border-top-color: rgba(0,0,0,.1);
1716 - box-shadow: inset 0 2px 4px rgba(0,0,0,.1) 1716 + box-shadow: inset 0 2px 4px rgba(0,0,0,.1)*/
1717 } 1717 }
1718 1718
1719 .uk-navbar-nav>li>a:active { 1719 .uk-navbar-nav>li>a:active {
1720 - background-color: #f5f5f5;  
1721 - color: #444; 1720 + background-color: #3D4258;
  1721 + color: #ffffff;
1722 border-left-color: rgba(0,0,0,.1); 1722 border-left-color: rgba(0,0,0,.1);
1723 border-right-color: rgba(0,0,0,.1); 1723 border-right-color: rgba(0,0,0,.1);
1724 border-top-color: rgba(0,0,0,.2); 1724 border-top-color: rgba(0,0,0,.2);
@@ -2062,6 +2062,10 @@ html:not(.uk-touch) .uk-nav-offcanvas ul a:hover { @@ -2062,6 +2062,10 @@ html:not(.uk-touch) .uk-nav-offcanvas ul a:hover {
2062 } 2062 }
2063 2063
2064 .uk-tab { 2064 .uk-tab {
  2065 + display: inline-block;
  2066 + border-radius:30px;
  2067 + height: 50px;
  2068 + background: #3D4258;
2065 margin: 0; 2069 margin: 0;
2066 padding: 0; 2070 padding: 0;
2067 list-style: none; 2071 list-style: none;
src/main/resources/static/real_control_v2/css/line_schedule_dark.css
@@ -12,13 +12,13 @@ @@ -12,13 +12,13 @@
12 } 12 }
13 13
14 .line_schedule div.uk-width-1-6, .line_schedule div.uk-width-1-2 { 14 .line_schedule div.uk-width-1-6, .line_schedule div.uk-width-1-2 {
15 - padding: 0 2px 2px 2px; 15 + padding: 0 10px 0px 0px;
16 height: 100%; 16 height: 100%;
17 } 17 }
18 18
19 .line_schedule .footer-chart { 19 .line_schedule .footer-chart {
20 height: 233px; 20 height: 233px;
21 - margin-top: 5px; 21 +/* margin-top: 5px;*/
22 } 22 }
23 23
24 .line_schedule .uk-grid.top-container { 24 .line_schedule .uk-grid.top-container {
@@ -29,10 +29,10 @@ @@ -29,10 +29,10 @@
29 29
30 .line_schedule .card-panel { 30 .line_schedule .card-panel {
31 padding: 0; 31 padding: 0;
32 - height: 100%;  
33 - border: 1px solid #242738; 32 + height: 94%;
  33 + border: 10px solid #3D4258;
34 background: #3D4258; 34 background: #3D4258;
35 - border-radius: 4px; 35 + border-radius: 15px;
36 moz-user-select: -moz-none; 36 moz-user-select: -moz-none;
37 -moz-user-select: none; 37 -moz-user-select: none;
38 -o-user-select: none; 38 -o-user-select: none;
src/main/resources/static/real_control_v2/css/main_dark.css
@@ -140,6 +140,7 @@ svg.line-chart { @@ -140,6 +140,7 @@ svg.line-chart {
140 height: 100%; 140 height: 100%;
141 position: absolute; 141 position: absolute;
142 left: 0; 142 left: 0;
  143 + margin-top: -15px;
143 } 144 }
144 145
145 svg.line-chart circle.station_circle { 146 svg.line-chart circle.station_circle {
@@ -2258,14 +2259,14 @@ g.gps-wrap rect.twinkle[updown="1"] { @@ -2258,14 +2259,14 @@ g.gps-wrap rect.twinkle[updown="1"] {
2258 box-sizing: border-box; 2259 box-sizing: border-box;
2259 min-height: 60px; 2260 min-height: 60px;
2260 cursor: pointer; 2261 cursor: pointer;
2261 - border-radius: 5px; 2262 +/* border-radius: 5px;*/
2262 color: white; 2263 color: white;
2263 padding: 10px; 2264 padding: 10px;
2264 box-shadow: 0 0.125rem 0.8rem rgba(0, 0, 0, 0.1) !important; 2265 box-shadow: 0 0.125rem 0.8rem rgba(0, 0, 0, 0.1) !important;
2265 } 2266 }
2266 .warning-color { 2267 .warning-color {
2267 - border: 1px solid #e79a00;  
2268 - background-color: #0b3b5e; 2268 + border: 1px solid #454D68;
  2269 + background-color: #454D68;
2269 font-size: 18px; 2270 font-size: 18px;
2270 } 2271 }
2271 2272
@@ -2313,7 +2314,7 @@ g.gps-wrap rect.twinkle[updown="1"] { @@ -2313,7 +2314,7 @@ g.gps-wrap rect.twinkle[updown="1"] {
2313 } 2314 }
2314 2315
2315 .multi_plat_config .timer{ 2316 .multi_plat_config .timer{
2316 - background-color: #115281; 2317 + background-color: #7b7d81;
2317 font-size: 15px; 2318 font-size: 15px;
2318 color: white; 2319 color: white;
2319 text-align: center; 2320 text-align: center;
src/main/resources/static/real_control_v2/css/north_dark.css
@@ -67,10 +67,12 @@ @@ -67,10 +67,12 @@
67 } 67 }
68 68
69 .north .north-tabs { 69 .north .north-tabs {
70 - width: 100%; 70 + background: #292e43;
  71 + padding-top: 12px;
  72 + width: calc(100% + 30px);
71 bottom: 1px; 73 bottom: 1px;
72 margin-left: -14px; 74 margin-left: -14px;
73 - margin-top: 35px; 75 + margin-top: 20px;
74 } 76 }
75 77
76 .north .north-tabs .uk-tab { 78 .north .north-tabs .uk-tab {
@@ -78,12 +80,14 @@ @@ -78,12 +80,14 @@
78 } 80 }
79 81
80 .north .north-tabs .uk-tab > li > a { 82 .north .north-tabs .uk-tab > li > a {
  83 + border-radius: 30px;
  84 + margin: 7px;
81 color: #BCBCBC; 85 color: #BCBCBC;
82 text-shadow: none; 86 text-shadow: none;
83 } 87 }
84 88
85 .north .north-tabs .uk-tab > li.tab-line > a { 89 .north .north-tabs .uk-tab > li.tab-line > a {
86 - padding: 8px 0px 8px 17px; 90 + padding: 8px 17px 8px 17px;
87 } 91 }
88 92
89 .north .north-tabs .uk-tab > li > a:hover, 93 .north .north-tabs .uk-tab > li > a:hover,
src/main/resources/static/real_control_v2/fragments/line_schedule/layout.html
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 </div> 12 </div>
13 </div> 13 </div>
14 <div class="uk-width-1-10" style="height: calc(100% - 1px);position: relative;"> 14 <div class="uk-width-1-10" style="height: calc(100% - 1px);position: relative;">
15 - <div class="card-panel sys-mailbox" style="overflow: auto;"> 15 + <div class="card-panel sys-mailbox" style="border-left-width: 2px;border-right-width: 2px;overflow: auto;">
16 </div> 16 </div>
17 <div class="mileage_elec_panel"> 17 <div class="mileage_elec_panel">
18 </div> 18 </div>
src/main/resources/static/real_control_v2/fragments/north/toolbar.html
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 </a> 60 </a>
61 <div class="uk-navbar-content uk-navbar-flip uk-hidden-small" style="padding-left: 0;"> 61 <div class="uk-navbar-content uk-navbar-flip uk-hidden-small" style="padding-left: 0;">
62 <div class="uk-button-group"> 62 <div class="uk-button-group">
63 - <button class="uk-button uk-button-danger exit-system">退出线调</button> 63 + <button class="uk-button uk-button-danger exit-system" style="border-radius:30px;">退出线调</button>
64 </div> 64 </div>
65 </div> 65 </div>
66 </nav> 66 </nav>