zhangweicheng %!s(int64=6) %!d(string=hai) anos
pai
achega
a6d2a7f91f
Modificáronse 1 ficheiros con 32 adicións e 5 borrados
  1. 32 5
      web/building_saas/css/custom.css

+ 32 - 5
web/building_saas/css/custom.css

@@ -73,8 +73,8 @@ legend.legend{
 
 #gljPriceTenderCoe::-webkit-outer-spin-button,
 #gljPriceTenderCoe::-webkit-inner-spin-button {
-         -webkit-appearance: none;
-     }
+    -webkit-appearance: none;
+}
 #gljPriceTenderCoe {
     -moz-appearance: textfield;
 }
@@ -326,7 +326,6 @@ input.text-right{
 .occupied {
     background: #f1f1f1;
 }
-<<<<<<< HEAD
 .material-ration-left{
     float:left;
     width: 90%;
@@ -334,7 +333,36 @@ input.text-right{
 .material-ass{
     width: 10%;
     background:#f7f7f9
-=======
+}
+/*书签批注*/
+.annotate-color-1::before{
+    color: #E2F2C5 !important;
+    -webkit-text-stroke:.5px #ced4da;
+}
+.annotate-color-2::before{
+    color: #F9E2CF !important;
+    -webkit-text-stroke:.5px #ced4da;
+}
+.annotate-color-3::before{
+    color:#F2EFD9 !important;
+    -webkit-text-stroke:.5px #ced4da;
+}
+.annotate-color-4::before{
+    color:#F5D1DA !important;
+    -webkit-text-stroke:.5px #ced4da;
+}
+.annotate-color-5::before{
+    color:#E3E3E3 !important;
+    -webkit-text-stroke:.5px #ced4da;
+}
+.annotate-color-6::before{
+    color:#B6F3F2 !important;
+    -webkit-text-stroke:.5px #ced4da;
+}
+.annotate-color-7::before{
+    color:#ECE0F5 !important;
+    -webkit-text-stroke:.5px #ced4da;
+}
 /*书签批注*/
 .annotate-color-1::before{
     color: #E2F2C5 !important;
@@ -363,5 +391,4 @@ input.text-right{
 .annotate-color-7::before{
     color:#ECE0F5 !important;
     -webkit-text-stroke:.5px #ced4da;
->>>>>>> 870a1904d6d548a3bbaf4bc0f0a266587825d2e9
 }