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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
erp5
Commits
744f3fde
Commit
744f3fde
authored
Jan 31, 2018
by
Tomáš Peterka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[renderjs_ui] Fix label rendering after moving css_class to field div
parent
4dc92494
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
13 deletions
+15
-13
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
+2
-2
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
+11
-9
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css
View file @
744f3fde
...
@@ -1128,10 +1128,10 @@ div[data-gadget-scope='header'] .ui-header ul {
...
@@ -1128,10 +1128,10 @@ 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
{
.gadget-content
.
required
>
.ui-field-contain
>
label
{
font-weight
:
bold
;
font-weight
:
bold
;
}
}
.gadget-content
.
ui-field-contain
>
label
.invisible
{
.gadget-content
.
invisible
>
.ui-field-contain
>
label
{
display
:
none
;
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
)
{
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
View file @
744f3fde
...
@@ -242,7 +242,7 @@
...
@@ -242,7 +242,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
965.1
1760.24459.2133
</string>
</value>
<value>
<string>
965.1
2209.2660.49049
</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>
1517
390712.66
</float>
<float>
1517
418109.55
</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 @
744f3fde
...
@@ -1307,17 +1307,19 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -1307,17 +1307,19 @@ div[data-gadget-scope='header'] .ui-header {
& > label {
& > label {
color: @grey;
color: @grey;
}
}
//Label styling in required and "invisible" field
.required > .ui-field-contain > label {
// backward-compatibility: support for ERP5 field class defined in formulator configuration
// 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
// inform user that the field is needed by contraint, but do not prevent him to save the value
font-weight: bold;
font-weight: bold;
}
}
&.invisible
{
.invisible > .ui-field-contain > label
{
// used to hide the label of a formbox
// used to hide the label of a formbox
display: none;
display: none;
}
}
}
}
@media @tablet, @desktop {
@media @tablet, @desktop {
.ui-field-contain {
.ui-field-contain {
...
...
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