luoye / littleApp_child

Download as
Browse Code ยป

Commit 03cb8f76bc5aa0aff79064fc1e37f579e761aa4b

Authored by luoye
2 parents 38f17941d5 34ebdf99bd
Exists in master and in 2 other branches dev-wrh, dev_wjl

Merge branch 'master' of https://git.healthbaby.com.cn/luoye/littleapp_child 

* 'master' of https://git.healthbaby.com.cn/luoye/littleapp_child:
  no message

Showing 2 changed files

littleApp_child/pages/home/css/login.wxss View file @ 03cb8f7
... ... @@ -57,15 +57,14 @@
57 57 font: medium;
58 58 font-size: 20px;
59 59 color: white;
60   - width: 200px;
  60 + margin-left: 10px;
  61 + margin-right: 10px;
61 62 height: 45px;
62 63 line-height: 45px;
63 64 border-radius: 22.5px;
64 65 background-color: #48c17b;
65   - position: absolute;
66   - bottom: 100px;
67   - left: 50%;
68   - transform: translateX(-50%);
  66 + width: calc(100%-20px);
  67 + margin-top: 200px;
69 68 text-align: center;
70 69 }
71 70  
72 71  
73 72  
74 73  
... ... @@ -77,22 +76,23 @@
77 76 height: 42px;
78 77 border: solid 1px;
79 78 border-radius: 5px;
80   - width: 60%;
  79 + width: 70%;
81 80 }
82 81  
83 82 .record-time-text {
84 83 font: lighter;
85 84 margin-left: 10px;
86   - width: 80px;
  85 + width: 30%;
87 86 text-align: center;
88 87 font-size: 15px;
89 88 color: #666;
90   - height: 30px;
91   - line-height: 30px;
92   - margin-top: 20px;
93   - background: #f5f5f5;
94   - border: 1px solid #d3d3d3;
  89 + height: 42px;
  90 + line-height: 42px;
  91 + margin-top: 15px;
95 92 border-radius: 4px;
  93 + float: right;
  94 + background: #f6f6f6;
  95 + border: 1px solid #d3d3d3;
96 96 /*background-color: rgba(1, 1, 1, 1);*/
97 97 }
98 98  
littleApp_child/pages/system_notifacations/system_notifacations.wxss View file @ 03cb8f7
... ... @@ -59,6 +59,8 @@
59 59 margin-right: 10px;
60 60 margin-top: 10px;
61 61 background: #fff;
  62 + min-height: 138px;
  63 + border-radius: 4px;
62 64 }
63 65  
64 66 .high_risk_title {
65 67  
... ... @@ -76,8 +78,10 @@
76 78 .high_rish_content1 {
77 79 padding-left: 10px;
78 80 padding-right: 10px;
79   - margin-top: 5px;
80 81 display: flex;
  82 + height:28px;
  83 +min-height:28px;
  84 +
81 85 }
82 86  
83 87 .high_rish_content_before {
84 88  
85 89  
86 90  
87 91  
... ... @@ -128,21 +132,23 @@
128 132 margin-right: 10px;
129 133 margin-top: 10px;
130 134 background: #fff;
  135 +
  136 + min-height: 128px;
131 137 }
132 138 .red_line {
133 139 width: 100%;
134 140 background: #f67272;
135   - height: 2px;
  141 + height: 1px;
136 142 }
137 143 .green_line {
138 144 width: 100%;
139 145 background: #48C17B;
140   - height: 2px;
  146 + height: 1px;
141 147 }
142 148 .other_three_title{
143   - height: 38px;
  149 + height: 40px;
144 150 width: 100%;
145   - line-height: 38px;
  151 + line-height: 40px;
146 152 text-align: center;
147 153 font-size: 14px;
148 154 font-weight: bold;
... ... @@ -157,6 +163,7 @@
157 163 text-align: left;
158 164 margin-left: 10px;
159 165 margin-right: 10px;
  166 + min-height: 54px;
160 167 display: flex;
161 168 word-break: break-all;
162 169 }