Skip to content

Commit 9c8e062

Browse files
committed
updated background for edit pages
2 parents 357eb42 + 29caf7e commit 9c8e062

File tree

1 file changed

+37
-4
lines changed

1 file changed

+37
-4
lines changed

web/css/main.css

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ label:active {
136136
font-weight: bold;
137137
text-decoration: none;
138138
line-height: 22px;
139-
padding: 0 4px 2px 4px;
140-
margin: 0 14px 2px 0;
139+
padding: 0px 19px 4px 17px;
140+
margin: 0px 0px 2px 0px;
141141
}
142142

143143
.top-logout:hover {
@@ -272,7 +272,11 @@ label:active {
272272
font-size: 9pt;
273273
font-family: Arial, Helvetica, sans-serif;
274274
// color: #333;
275+
<<<<<<< HEAD
275276
color: #666;
277+
=======
278+
color: #7E7D7F;
279+
>>>>>>> 29caf7e3b5ca98e665b4b3c7c6be94ade368c484
276280
decoration: none;
277281
overflow: hidden;
278282
}
@@ -597,6 +601,9 @@ label:active {
597601
background-color: #eceff1;
598602
border-bottom: 1px solid #e9e9e9;
599603
}
604+
.data.mode-add {
605+
border-top: 5px solid #F79B44;
606+
}
600607

601608
.mode-add .data-add {
602609
background-color: #f7f6ed;
@@ -793,7 +800,11 @@ label:active {
793800
vertical-align: top;
794801
line-height: 1.2em;
795802
font-size: 10pt;
803+
<<<<<<< HEAD
796804
color: #666;
805+
=======
806+
color: #626163; /* #7E7D7F;*/
807+
>>>>>>> 29caf7e3b5ca98e665b4b3c7c6be94ade368c484
797808
padding: 2px 4px 1px 0;
798809
white-space: nowrap;
799810
}
@@ -803,14 +814,22 @@ label:active {
803814
line-height: 0.8em;
804815
font-size: 8pt;
805816
padding: 4px 0 0 0;
817+
<<<<<<< HEAD
806818
color: #666;
819+
=======
820+
color: #7E7D7F;
821+
>>>>>>> 29caf7e3b5ca98e665b4b3c7c6be94ade368c484
807822
}
808823

809824
.counter-value {
810825
vertical-align: top;
811826
line-height: 1.2em;
812827
font-size: 10pt;
828+
<<<<<<< HEAD
813829
color: #555;
830+
=======
831+
color: #545355; /*#626163;*/
832+
>>>>>>> 29caf7e3b5ca98e665b4b3c7c6be94ade368c484
814833
padding: 2px 0 1px 2px;
815834
}
816835

@@ -905,6 +924,11 @@ label:active {
905924
border: 1px solid #909090;
906925
}
907926

927+
.vst-input:disabled:hover {
928+
border: 1px solid #C0C0C0;
929+
}
930+
931+
908932
.vst-input:focus {
909933
border: 1px solid #f79b44;
910934
background-color: #fffcd2;
@@ -927,12 +951,21 @@ label:active {
927951
min-width: 138px;
928952
margin: 2px 6px 0 0;
929953
padding: 8px 1px 6px 10px;
954+
<<<<<<< HEAD
955+
}
956+
957+
.vst-list option {
958+
padding: 6px 1px 6px 15px;
959+
}
960+
961+
=======
930962
}
931963

932964
.vst-list option {
933965
padding: 6px 1px 6px 15px;
934966
}
935967

968+
>>>>>>> 29caf7e3b5ca98e665b4b3c7c6be94ade368c484
936969
/*
937970
@-moz-document url-prefix() {
938971
.vst-list {
@@ -995,8 +1028,8 @@ label:active {
9951028
}
9961029

9971030
.login-button:hover {
998-
border: 1px solid #adaeae;
999-
background-color: #adaeae;
1031+
border: 1px solid #6DB8D3;
1032+
background-color: #6DB8D3;
10001033
}
10011034

10021035
.login-button:active {

0 commit comments

Comments
 (0)