Commit 273a659f authored by Romain Courteaud's avatar Romain Courteaud

[erp5_web_renderjs_ui] Integrate all main page CSS into .gadget-content

parent c8b7a598
...@@ -798,6 +798,8 @@ div[data-gadget-scope='header'] .ui-header ul { ...@@ -798,6 +798,8 @@ div[data-gadget-scope='header'] .ui-header ul {
padding-top: 7em; padding-top: 7em;
} }
*/ */
/* middle screen */
/* form validation (assuming label>span is used) */
} }
@media only screen and (min-width: 62em) { @media only screen and (min-width: 62em) {
.gadget-content { .gadget-content {
...@@ -868,48 +870,50 @@ div[data-gadget-scope='header'] .ui-header ul { ...@@ -868,48 +870,50 @@ div[data-gadget-scope='header'] .ui-header ul {
border-bottom-right-radius: 0.325em; border-bottom-right-radius: 0.325em;
border-bottom-style: solid; border-bottom-style: solid;
} }
@media (min-width: 62em) { @media only screen and (min-width: 62em) {
.left, .gadget-content .left,
.right, .gadget-content .right,
.center, .gadget-content .center,
.bottom { .gadget-content .bottom {
padding: 0 2%; padding: 0 2%;
} }
.left, .gadget-content .left,
.right { .gadget-content .right {
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
width: 45%; width: 45%;
} }
} }
/* middle screen */ @media only screen and (min-width: 28em) and (max-width: 62em) {
@media (max-width: 62em) { .gadget-content {
/* reset min/max width and shrink labels ... */ /* reset min/max width and shrink labels ... */
label, }
legend { .gadget-content label,
.gadget-content legend {
font-size: 80%; font-size: 80%;
} }
} }
@media (min-width: 28em) { @media only screen and (min-width: 28em) and (max-width: 62em), only screen and (min-width: 62em) {
.ui-field-contain { .gadget-content .ui-field-contain {
display: flex; display: flex;
} }
.ui-field-contain label { .gadget-content .ui-field-contain label {
flex: 1; flex: 1;
} }
.ui-field-contain label + div { .gadget-content .ui-field-contain label + div {
flex: 3; flex: 3;
} }
} }
@media (max-width: 28em) { @media only screen and (max-width: 28em) {
/* make sure there is a bottom border */ .gadget-content {
.ui-field-contain { /* make sure there is a bottom border */
}
.gadget-content .ui-field-contain {
padding: 0.8em 0; padding: 0.8em 0;
border-bottom: 1px solid rgba(0, 0, 0, 0.15); border-bottom: 1px solid rgba(0, 0, 0, 0.15);
} }
} }
/* form validation (assuming label>span is used) */ .gadget-content form label span {
form label span {
color: red; color: red;
} }
/********************************************** /**********************************************
......
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>952.12715.63499.47547</string> </value> <value> <string>952.12740.62273.29252</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1467193792.99</float> <float>1467271547.98</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -1001,65 +1001,52 @@ div[data-gadget-scope='header'] .ui-header { ...@@ -1001,65 +1001,52 @@ div[data-gadget-scope='header'] .ui-header {
} }
} }
} @media @desktop {
.left, .right, .center, .bottom {
padding: 0 2%;
}
@media (min-width: 62em) { .left, .right {
vertical-align: top;
.left, display: inline-block;
.right, width: 45%;
.center, }
.bottom {
padding: 0 2%;
}
.left,
.right {
vertical-align: top;
display: inline-block;
width: 45%;
}
}
/* middle screen */
@media (max-width: 62em) {
/* reset min/max width and shrink labels ... */
label, legend {
font-size: 80%;
} }
}
@media (min-width: 28em) { /* middle screen */
// Label @media @tablet {
/* reset min/max width and shrink labels ... */
.ui-field-contain { label, legend {
display: flex; font-size: 80%;
label {
flex: 1;
}
label + div {
flex: 3;
} }
} }
}
@media (max-width: 28em) { @media @tablet, @desktop {
// Label
.ui-field-contain {
display: flex;
label {
flex: 1;
}
label + div {
flex: 3;
}
}
}
/* make sure there is a bottom border */ @media @smartphone {
.ui-field-contain { /* make sure there is a bottom border */
padding: 0.8em 0; .ui-field-contain {
border-bottom: 1px solid rgba(0, 0, 0, 0.15); padding: 0.8em 0;
border-bottom: 1px solid rgba(0, 0, 0, 0.15);
}
} }
} /* form validation (assuming label>span is used) */
form label span {
color: red;
}
/* form validation (assuming label>span is used) */
form label span {
color: red;
} }
/********************************************** /**********************************************
......
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