Commit 05fbed2d by 肖康

Merge branch 'master' of http://119.23.72.7/xiaokang/cloudSystem

# Conflicts:
#	src/ajax/index.js
parents d8f645ed ef219290
...@@ -190,12 +190,13 @@ ...@@ -190,12 +190,13 @@
padding-left: 10px; padding-left: 10px;
cursor: pointer; cursor: pointer;
transition: all 0.4s ease; transition: all 0.4s ease;
display: block;
} }
&:hover { &:hover {
.wrap{ .wrap {
transform: translateY(-8px); transform: translateY(-8px);
} }
.color1 { .color1 {
transform: translateY(0); transform: translateY(0);
...@@ -216,20 +217,22 @@ ...@@ -216,20 +217,22 @@
border: 1px solid #E5EBF6; border: 1px solid #E5EBF6;
padding: 10px 10px 12px 12px; padding: 10px 10px 12px 12px;
position: relative; position: relative;
&:hover{
&::after{ &:hover {
&::after {
content: ""; content: "";
position: absolute; position: absolute;
width:231px; width: 231px;
height:58px; height: 58px;
background: url(../../images/tips.png) no-repeat; background: url(../../images/tips.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
left:50%; left: 50%;
top:50%; top: 50%;
margin-top: -29px; margin-top: -29px;
margin-left: -115px; margin-left: -115px;
} }
} }
.top { .top {
.title { .title {
font-size: 16px; font-size: 16px;
...@@ -238,7 +241,6 @@ ...@@ -238,7 +241,6 @@
} }
.tab { .tab {
width: 160px;
height: 28px; height: 28px;
background: #F1F4FA; background: #F1F4FA;
border-radius: 2px; border-radius: 2px;
...@@ -246,6 +248,8 @@ ...@@ -246,6 +248,8 @@
text-align: center; text-align: center;
li { li {
width: 52px;
box-sizing: border-box;
font-size: 12px; font-size: 12px;
color: #646b78; color: #646b78;
text-align: center; text-align: center;
...@@ -310,20 +314,22 @@ ...@@ -310,20 +314,22 @@
.box { .box {
flex: 0 0 49.5%; flex: 0 0 49.5%;
position: relative; position: relative;
&:hover{
&::after{ &:hover {
&::after {
content: ""; content: "";
position: absolute; position: absolute;
width:231px; width: 231px;
height:58px; height: 58px;
background: url(../../images/tips.png) no-repeat; background: url(../../images/tips.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
left:50%; left: 50%;
top:50%; top: 50%;
margin-top: -29px; margin-top: -29px;
margin-left: -115px; margin-left: -115px;
} }
} }
.head { .head {
padding-right: 100px; padding-right: 100px;
...@@ -363,6 +369,7 @@ ...@@ -363,6 +369,7 @@
.list { .list {
width: 100%; width: 100%;
border: 1px solid #E5EBF6; border: 1px solid #E5EBF6;
tr { tr {
th { th {
height: 44px; height: 44px;
...@@ -378,7 +385,8 @@ ...@@ -378,7 +385,8 @@
background: #FFFFFF; background: #FFFFFF;
font-size: 12px; font-size: 12px;
color: #333333; color: #333333;
&.first{
&.first {
text-align: center; text-align: center;
} }
} }
...@@ -438,7 +446,6 @@ ...@@ -438,7 +446,6 @@
.params-wrap { .params-wrap {
.tabs { .tabs {
margin-right: 9px; margin-right: 9px;
width: 160px;
height: 28px; height: 28px;
background: #F1F4FA; background: #F1F4FA;
border-radius: 2px; border-radius: 2px;
...@@ -446,6 +453,8 @@ ...@@ -446,6 +453,8 @@
text-align: center; text-align: center;
li { li {
width: 40px;
box-sizing: border-box;
font-size: 12px; font-size: 12px;
color: #646b78; color: #646b78;
text-align: center; text-align: center;
...@@ -481,16 +490,17 @@ ...@@ -481,16 +490,17 @@
.box1 { .box1 {
width: 80%; width: 80%;
position: relative; position: relative;
&:hover{
&::after{ &:hover {
&::after {
content: ""; content: "";
position: absolute; position: absolute;
width:231px; width: 231px;
height:58px; height: 58px;
background: url(../../images/tips.png) no-repeat; background: url(../../images/tips.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
left:50%; left: 50%;
top:50%; top: 50%;
margin-top: -89px; margin-top: -89px;
margin-left: -115px; margin-left: -115px;
} }
...@@ -499,7 +509,7 @@ ...@@ -499,7 +509,7 @@
.box2 { .box2 {
width: 20%; width: 20%;
.t1 { .t1 {
font-size: 12px; font-size: 12px;
color: #646b78; color: #646b78;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment