Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Lu Xu
erp5
Commits
e965727e
Commit
e965727e
authored
Dec 19, 2017
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] CSS: add support for the required class
parent
c7b59693
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
14 deletions
+18
-14
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css
...emplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css
+6
-6
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
...emplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
+2
-2
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
...teItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
+10
-6
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css
View file @
e965727e
...
@@ -1066,18 +1066,18 @@ div[data-gadget-scope='header'] .ui-header ul {
...
@@ -1066,18 +1066,18 @@ div[data-gadget-scope='header'] .ui-header ul {
.gadget-content
.ui-field-contain
>
label
{
.gadget-content
.ui-field-contain
>
label
{
color
:
#777777
;
color
:
#777777
;
}
}
.gadget-content
.ui-field-contain
>
label
.required
{
font-weight
:
bold
;
}
.gadget-content
.ui-field-contain
>
label
.invisible
{
display
:
none
;
}
@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
;
/* Disclaimer: Class .invisible is here only for backward-compatibility!
Don't rely on this class because it will be removed.
It was used to hide the label of a FormBox. */
}
.gadget-content
.ui-field-contain
>
label
.invisible
{
display
:
none
;
}
}
.gadget-content
.ui-field-contain
>
label
+
div
{
.gadget-content
.ui-field-contain
>
label
+
div
{
flex
:
3
;
flex
:
3
;
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
View file @
e965727e
...
@@ -242,7 +242,7 @@
...
@@ -242,7 +242,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
964.15
434.53071.55364
</string>
</value>
<value>
<string>
964.15
700.34446.43025
</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>
15136
79339.57
</float>
<float>
15136
94877.1
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
View file @
e965727e
...
@@ -1242,6 +1242,16 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -1242,6 +1242,16 @@ div[data-gadget-scope='header'] .ui-header {
.ui-field-contain {
.ui-field-contain {
& > label {
& > label {
color: @grey;
color: @grey;
// backward-compatibility: support for ERP5 field class defined in formulator configuration
&.required {
// inform user that the field is needed by contraint, but do not prevent him to save the value
font-weight: bold;
}
&.invisible {
// used to hide the label of a formbox
display: none;
}
}
}
}
}
...
@@ -1250,12 +1260,6 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -1250,12 +1260,6 @@ div[data-gadget-scope='header'] .ui-header {
display: flex;
display: flex;
& > label {
& > label {
flex: 1;
flex: 1;
/* Disclaimer: Class .invisible is here only for backward-compatibility!
Don't rely on this class because it will be removed.
It was used to hide the label of a FormBox. */
&.invisible {
display: none;
}
}
}
& > label + div {
& > label + div {
flex: 3;
flex: 3;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment