gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhangwei
2018-12-29 18:12:50 +06:00
parent d1158ada80 34f024f8a6
commit 8e13a793f4
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
View File

@@ -69,7 +69,7 @@ body {
<div class="data_info"> <div class="data_info">
<div class="info_1 fl_fc"> <div class="info_1 fl_fc">
<div class="text_1"> <div class="text_1">
<div class="fr_fc" style="width:60%"> <div class="fr_fc" style="width:53%">
<div class="fl_visual"> <div class="fl_visual">
<a href="${ctx}/dashboard/traffic/bandwidthList"><i class="fa fa-cloud-download"></i></a> <a href="${ctx}/dashboard/traffic/bandwidthList"><i class="fa fa-cloud-download"></i></a>
</div> </div>
@@ -83,7 +83,7 @@ body {
<span class="numberRun4">0</span > <span class="numberRun4-unit">bps</span></a> <span class="numberRun4">0</span > <span class="numberRun4-unit">bps</span></a>
</div> </div>
</div> </div>
<div class="fr_fc" style="width:40%"> <div class="fr_fc" style="width:47%">
<div class="fl_visual"> <div class="fl_visual">
<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_reject"><i class="fa fa-ban"></i></a> <a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_reject"><i class="fa fa-ban"></i></a>
</div> </div>

17
src/main/webapp/static/pages/css/data_text.css
View File

@@ -27,7 +27,7 @@ p{
display: inline-block; display: inline-block;
} }
.data_content .data_info .info_2{ .data_content .data_info .info_2{
width: 75%; width: 76%;
height: 110px; height: 110px;
} }
@@ -47,9 +47,9 @@ p{
.data_content .data_info .fr_fc .fl_visual{ .data_content .data_info .fr_fc .fl_visual{
margin-left: 2px; margin-left: 2px;
float: left; float: left;
height: 50px; /* height: 50px; */
width: 28%; width: 28%;
font-size: 25px; font-size: 30px;
/* color: #d9ffff !important; */ /* color: #d9ffff !important; */
/* color: linear-gradient(to right, #ffcc99, #77b5dc); */ /* color: linear-gradient(to right, #ffcc99, #77b5dc); */
/* position: relative; */ /* position: relative; */
@@ -103,7 +103,7 @@ p{
} }
.data_content .data_info .info_1{ .data_content .data_info .info_1{
width: 25%; width: 24%;
height: 110px; height: 110px;
} }
.data_content .data_info .info_2 .fr_fc:first-child{ .data_content .data_info .info_2 .fr_fc:first-child{
@@ -142,17 +142,17 @@ p{
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
margin-left: 33px; margin-left: 42px;
} }
.data_content .data_info .info_1 label:nth-child(1){ .data_content .data_info .info_1 label:nth-child(1){
width:77%; width:74%;
color:#fff; color:#fff;
font-size: 16px; font-size: 16px;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
margin: -2px; margin: -2px;
margin-left: 30px; margin-left: 39px;
} }
.data_content .data_info>div.info_1 p:nth-child(2){ .data_content .data_info>div.info_1 p:nth-child(2){
width:100%; width:100%;
@@ -257,7 +257,8 @@ p{
color:#ffffff !important; color:#ffffff !important;
margin-top: -3px; margin-top: -3px;
text-align: center; text-align: center;
margin-left: 1.3px; margin-left: 6.3px;
width: 100%
} }
/* .data_info{ /* .data_info{
float: right; float: right;