Commit 1df1d97dce0eb6fda4f14c5381fdb51ba2de7d7c

Authored by liuqimichale
2 parents 84109d86 db9d0707

Merge branch 'test' of http://gitlab.renniting.cn/web_developers/lzsandtable into test

src/components/VBerth.vue
@@ -71,11 +71,11 @@ export default { @@ -71,11 +71,11 @@ export default {
71 } 71 }
72 .free-berth{ 72 .free-berth{
73 @include fontStyle(24px); 73 @include fontStyle(24px);
74 - background-image: $fontBlue; 74 + color: $fontBlue;
75 } 75 }
76 .buss-berth{ 76 .buss-berth{
77 @include fontStyle(24px); 77 @include fontStyle(24px);
78 - background-image: $fontOrange; 78 + color: $fontOrange;
79 } 79 }
80 } 80 }
81 } 81 }
src/components/VEquipment.vue
@@ -118,11 +118,11 @@ export default { @@ -118,11 +118,11 @@ export default {
118 } 118 }
119 .text-blue{ 119 .text-blue{
120 @include fontStyle(24px); 120 @include fontStyle(24px);
121 - background-image: $fontBlue; 121 + color: $fontBlue;
122 } 122 }
123 .text-orange{ 123 .text-orange{
124 @include fontStyle(24px); 124 @include fontStyle(24px);
125 - background-image: $fontOrange; 125 + color: $fontOrange;
126 } 126 }
127 127
128 } 128 }
src/components/VParking.vue
@@ -72,7 +72,7 @@ export default { @@ -72,7 +72,7 @@ export default {
72 p{ 72 p{
73 &:first-child{ 73 &:first-child{
74 @include fontStyle(24px); 74 @include fontStyle(24px);
75 - background-image: $fontBlue; 75 + color: $fontBlue;
76 } 76 }
77 &:last-child{ 77 &:last-child{
78 font-size: 14px; 78 font-size: 14px;
@@ -83,7 +83,7 @@ export default { @@ -83,7 +83,7 @@ export default {
83 p{ 83 p{
84 &:first-child{ 84 &:first-child{
85 @include fontStyle(24px); 85 @include fontStyle(24px);
86 - background-image: $fontOrange; 86 + color: $fontOrange;
87 } 87 }
88 &:last-child{ 88 &:last-child{
89 font-size: 14px; 89 font-size: 14px;
src/components/VToll.vue
@@ -60,7 +60,7 @@ export default { @@ -60,7 +60,7 @@ export default {
60 p{ 60 p{
61 &:first-child{ 61 &:first-child{
62 @include fontStyle(24px); 62 @include fontStyle(24px);
63 - background-image: $fontBlue; 63 + color: $fontBlue;
64 } 64 }
65 &:last-child{ 65 &:last-child{
66 font-size: 14px; 66 font-size: 14px;
@@ -71,7 +71,7 @@ export default { @@ -71,7 +71,7 @@ export default {
71 p{ 71 p{
72 &:first-child{ 72 &:first-child{
73 @include fontStyle(24px); 73 @include fontStyle(24px);
74 - background-image: $fontOrange; 74 + color: $fontOrange;
75 } 75 }
76 &:last-child{ 76 &:last-child{
77 font-size: 14px; 77 font-size: 14px;
src/style/mixin.scss
1 @mixin fontStyle($size){ 1 @mixin fontStyle($size){
2 font-size: $size; 2 font-size: $size;
3 font-weight:bold; 3 font-weight:bold;
4 - -webkit-background-clip: text;  
5 - -webkit-text-fill-color: transparent; 4 + //-webkit-background-clip: text;
  5 + //-webkit-text-fill-color: transparent;
6 } 6 }
7 7
8 -$fontBlue: -webkit-gradient(linear, 0 0, 0 bottom, from(rgba(0,202,254, 1)), to(rgba(39,114,244, 1)));  
9 -$fontOrange: -webkit-gradient(linear, 0 0, 0 bottom, from(rgba(255,186,0, 1)), to(rgba(255,129,0, 1))); 8 +$fontBlue: #50a9f9;
  9 +$fontOrange: #f0c05c;