Commit e368e2d5 authored by Noah Brackenbury's avatar Noah Brackenbury

Merge branch 'master' of https://lab.nexedi.com/nexedi/erp5 into business_bot

parents 79451196 440ec86a
...@@ -1046,13 +1046,15 @@ div[data-gadget-scope='header'] .ui-header ul { ...@@ -1046,13 +1046,15 @@ div[data-gadget-scope='header'] .ui-header ul {
padding-left: 24pt; padding-left: 24pt;
} }
} }
.gadget-content .ui-field-contain > label {
color: #777777;
}
@media only screen and (min-width: 45em) and (max-width: 85em), not screen and (max-width: 85em) { @media only screen and (min-width: 45em) and (max-width: 85em), not screen and (max-width: 85em) {
.gadget-content .ui-field-contain { .gadget-content .ui-field-contain {
display: flex; display: flex;
} }
.gadget-content .ui-field-contain > label { .gadget-content .ui-field-contain > label {
flex: 1; flex: 1;
color: #777777;
/* Disclaimer: It is here only for backward-compatibility! Don't rely on /* Disclaimer: It is here only for backward-compatibility! Don't rely on
this class because it will be removed. this class because it will be removed.
It was used to hide the label of a FormBox. */ It was used to hide the label of a FormBox. */
......
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.59557.4519.51251</string> </value> <value> <string>961.52328.26727.8140</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1504702928.19</float> <float>1504269035.79</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -1206,13 +1206,18 @@ div[data-gadget-scope='header'] .ui-header { ...@@ -1206,13 +1206,18 @@ div[data-gadget-scope='header'] .ui-header {
} }
} }
//Label
.ui-field-contain {
& > label {
color: @grey;
}
}
@media @tablet, @desktop { @media @tablet, @desktop {
// Label
.ui-field-contain { .ui-field-contain {
display: flex; display: flex;
& > label { & > label {
flex: 1; flex: 1;
color: @grey;
/* Disclaimer: It is here only for backward-compatibility! Don't rely on /* Disclaimer: It is here only for backward-compatibility! Don't rely on
this class because it will be removed. this class because it will be removed.
It was used to hide the label of a FormBox. */ It was used to hide the label of a FormBox. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment