Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
acca3b99 by 任超
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

2 parents 4a5f8e20 bf8559de
Inline Side-by-side
Showing 3 changed files with 28 additions and 15 deletions
...@@ -139,7 +139,7 @@ input[type="number"] { ...@@ -139,7 +139,7 @@ input[type="number"] {
139 } 139 }
140 140
141 ::-webkit-scrollbar-thumb { 141 ::-webkit-scrollbar-thumb {
142 background: rgba(69, 138, 207, .3); 142 background: rgba(69, 138, 207, .6);
143 background-clip: padding-box; 143 background-clip: padding-box;
144 min-height: 28px; 144 min-height: 28px;
145 -webkit-border-radius: 6px; 145 -webkit-border-radius: 6px;
...@@ -148,14 +148,11 @@ input[type="number"] { ...@@ -148,14 +148,11 @@ input[type="number"] {
148 } 148 }
149 149
150 ::-webkit-scrollbar-thumb:hover { 150 ::-webkit-scrollbar-thumb:hover {
151 background: rgba(69, 138, 207, .3); 151 background: rgba(69, 138, 207, .6);
152 } 152 }
153 153
154 // 滚动条位置 154 // 滚动条位置
155 .el-scrollbar__wrap { 155
156 // margin-bottom: 0px!important;
157 margin-right: 0px !important;
158 }
159 156
160 // element 样式补丁 157 // element 样式补丁
161 .el-menu--horizontal { 158 .el-menu--horizontal {
......
...@@ -351,7 +351,7 @@ aside { ...@@ -351,7 +351,7 @@ aside {
351 color: #02D9FD; 351 color: #02D9FD;
352 width: 64px; 352 width: 64px;
353 height: 28px; 353 height: 28px;
354 background: rgba(255, 255, 255, 0.1); 354 background: rgba(255, 255, 255, 0.2);
355 border-radius: 16px; 355 border-radius: 16px;
356 } 356 }
357 357
...@@ -362,6 +362,13 @@ aside { ...@@ -362,6 +362,13 @@ aside {
362 border-radius: 16px; 362 border-radius: 16px;
363 color: #0097FF; 363 color: #0097FF;
364 } 364 }
365 .successColor:hover {
366 width: 64px;
367 height: 28px;
368 background: rgba(255, 255, 255, 0.2);
369 border-radius: 16px;
370 color: #0097FF;
371 }
365 .configurationbtnColor { 372 .configurationbtnColor {
366 width: 64px; 373 width: 64px;
367 height: 28px; 374 height: 28px;
...@@ -369,6 +376,13 @@ aside { ...@@ -369,6 +376,13 @@ aside {
369 border-radius: 16px; 376 border-radius: 16px;
370 color: #b0e4dd; 377 color: #b0e4dd;
371 } 378 }
379 .configurationbtnColor:hover {
380 width: 64px;
381 height: 28px;
382 background: rgba(255, 255, 255, 0.2);
383 border-radius: 16px;
384 color: #b0e4dd;
385 }
372 .resetbtnColor { 386 .resetbtnColor {
373 width: 64px; 387 width: 64px;
374 height: 28px; 388 height: 28px;
...@@ -376,20 +390,25 @@ aside { ...@@ -376,20 +390,25 @@ aside {
376 border-radius: 16px; 390 border-radius: 16px;
377 color: #A5CBDA; 391 color: #A5CBDA;
378 } 392 }
379 .movebtnColor { 393 .resetbtnColor:hover {
380 width: 64px; 394 width: 64px;
381 height: 28px; 395 height: 28px;
382 background: rgba(255, 255, 255, 0.1); 396 background: rgba(255, 255, 255, 0.2);
383 border-radius: 16px; 397 border-radius: 16px;
384 color: #0097FF; 398 color: #A5CBDA;
385 } 399 }
386 .successColor:hover { 400 .movebtnColor {
387 width: 64px; 401 width: 64px;
388 height: 28px; 402 height: 28px;
389 background: rgba(255, 255, 255, 0.1); 403 background: rgba(255, 255, 255, 0.1);
390 border-radius: 16px; 404 border-radius: 16px;
391 color: #0097FF; 405 color: #0097FF;
392 } 406 }
407 .movebtnColor:hover {
408 background: rgba(255, 255, 255, 0.2);
409 border-radius: 16px;
410 color: #0097FF;
411 }
393 412
394 .delColor { 413 .delColor {
395 width: 64px; 414 width: 64px;
...@@ -402,7 +421,7 @@ aside { ...@@ -402,7 +421,7 @@ aside {
402 .delColor:hover { 421 .delColor:hover {
403 width: 64px; 422 width: 64px;
404 height: 28px; 423 height: 28px;
405 background: rgba(255, 255, 255, 0.1); 424 background: rgba(255, 255, 255, 0.2);
406 border-radius: 16px; 425 border-radius: 16px;
407 color: #B06974; 426 color: #B06974;
408 } 427 }
......
...@@ -178,7 +178,6 @@ ...@@ -178,7 +178,6 @@
178 type="text" 178 type="text"
179 size="mini" 179 size="mini"
180 class="configurationbtnColor" 180 class="configurationbtnColor"
181 icon="el-icon-video-pause"
182 onClick={() => { 181 onClick={() => {
183 this.getList(scope.row); 182 this.getList(scope.row);
184 }} 183 }}
...@@ -200,7 +199,6 @@ ...@@ -200,7 +199,6 @@
200 type="text" 199 type="text"
201 size="mini" 200 size="mini"
202 class='successColor' 201 class='successColor'
203 icon="el-icon-edit"
204 onClick={() => { 202 onClick={() => {
205 this.handleAddEdit(scope.row); 203 this.handleAddEdit(scope.row);
206 }} 204 }}
...@@ -222,7 +220,6 @@ ...@@ -222,7 +220,6 @@
222 disabled={scope.row.category === 1} 220 disabled={scope.row.category === 1}
223 size="mini" 221 size="mini"
224 class='delColor' 222 class='delColor'
225 icon="el-icon-delete"
226 // style="color:#F56C6C" 223 // style="color:#F56C6C"
227 onClick={() => { 224 onClick={() => {
228 this.handleDelete(scope.row.id, scope.row.name); 225 this.handleDelete(scope.row.id, scope.row.name);
......