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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Laurent S
erp5
Commits
eaf307c5
Commit
eaf307c5
authored
Apr 16, 2018
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Improve relation field warning rendering
parent
5cacbd7c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
15 deletions
+31
-15
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
+15
-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
+14
-7
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css
View file @
eaf307c5
...
@@ -823,6 +823,10 @@ div[data-gadget-scope='header'] .ui-header > .ui-btn-left a {
...
@@ -823,6 +823,10 @@ div[data-gadget-scope='header'] .ui-header > .ui-btn-left a {
min-width
:
5em
;
min-width
:
5em
;
}
}
}
}
div
[
data-gadget-scope
=
'header'
]
.ui-header
>
.ui-btn-right
button
.ui-icon-warning
,
div
[
data-gadget-scope
=
'header'
]
.ui-header
>
.ui-btn-right
a
.ui-icon-warning
{
background-color
:
#FF6600
;
}
div
[
data-gadget-scope
=
'header'
]
.ui-header
h1
{
div
[
data-gadget-scope
=
'header'
]
.ui-header
h1
{
text-align
:
left
;
text-align
:
left
;
line-height
:
30pt
;
line-height
:
30pt
;
...
@@ -1274,6 +1278,10 @@ div[data-gadget-scope='header'] .ui-header ul {
...
@@ -1274,6 +1278,10 @@ div[data-gadget-scope='header'] .ui-header ul {
.relation-input
ul
li
:active
{
.relation-input
ul
li
:active
{
background-color
:
#1F1F1F
;
background-color
:
#1F1F1F
;
}
}
.relation-input
.ui-icon-warning
{
color
:
#FF6600
;
opacity
:
1
;
}
/**********************************************
/**********************************************
* Gadget: datetime field
* Gadget: datetime field
**********************************************/
**********************************************/
...
@@ -1655,6 +1663,10 @@ div[data-gadget-scope='notification'] button.error {
...
@@ -1655,6 +1663,10 @@ div[data-gadget-scope='notification'] button.error {
background-color
:
#085078
;
background-color
:
#085078
;
width
:
8em
;
width
:
8em
;
}
}
.desktop-panel-hidden
div
[
data-gadget-scope
=
"header"
]
.ui-header
.ui-controlgroup-controls
button
.ui-icon-warning
,
.desktop-panel-hidden
div
[
data-gadget-scope
=
"header"
]
.ui-header
.ui-controlgroup-controls
a
.ui-icon-warning
{
background-color
:
#FF6600
;
}
.desktop-panel-hidden
div
[
data-gadget-scope
=
"header"
]
.ui-header
.ui-subheader
{
.desktop-panel-hidden
div
[
data-gadget-scope
=
"header"
]
.ui-header
.ui-subheader
{
flex
:
1
100%
;
flex
:
1
100%
;
text-align
:
center
;
text-align
:
center
;
...
@@ -1728,12 +1740,6 @@ div[data-gadget-scope='maximize'] button:active {
...
@@ -1728,12 +1740,6 @@ div[data-gadget-scope='maximize'] button:active {
display
:
inline-block
;
display
:
inline-block
;
content
:
""
;
content
:
""
;
}
}
.ui-icon-warning
{
background-color
:
#FF6600
!important
;
}
.ui-icon-warning
::before
{
content
:
"\f071"
;
}
.ui-icon-spinner
{
.ui-icon-spinner
{
opacity
:
1
;
opacity
:
1
;
}
}
...
@@ -2073,6 +2079,9 @@ div[data-gadget-scope='maximize'] button:active {
...
@@ -2073,6 +2079,9 @@ div[data-gadget-scope='maximize'] button:active {
.ui-icon-eye-slash
::before
{
.ui-icon-eye-slash
::before
{
content
:
"\f070"
;
content
:
"\f070"
;
}
}
.ui-icon-warning
::before
{
content
:
"\f071"
;
}
.ui-icon-low-vision
::before
{
.ui-icon-low-vision
::before
{
content
:
"\f2a8"
;
content
:
"\f2a8"
;
}
}
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
View file @
eaf307c5
...
@@ -242,7 +242,7 @@
...
@@ -242,7 +242,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
5.42456.41629.30583
</string>
</value>
<value>
<string>
96
6.58726.49878.9454
</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>
15
19232300.75
</float>
<float>
15
23881593.56
</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 @
eaf307c5
...
@@ -997,6 +997,9 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -997,6 +997,9 @@ div[data-gadget-scope='header'] .ui-header {
@media @desktop {
@media @desktop {
.renderDesktopSubLink();
.renderDesktopSubLink();
}
}
&.ui-icon-warning {
background-color: @coloraccent;
}
}
}
}
}
...
@@ -1489,6 +1492,11 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -1489,6 +1492,11 @@ div[data-gadget-scope='header'] .ui-header {
}
}
}
}
.ui-icon-warning {
color: @coloraccent;
// Link is disabled in this case
opacity: 1;
}
}
}
/**********************************************
/**********************************************
...
@@ -1896,6 +1904,9 @@ div[data-gadget-scope='notification'] {
...
@@ -1896,6 +1904,9 @@ div[data-gadget-scope='notification'] {
.ui-controlgroup-controls {
.ui-controlgroup-controls {
button, a {
button, a {
.renderTabletHeaderButton();
.renderTabletHeaderButton();
&.ui-icon-warning {
background-color: @coloraccent;
}
}
}
}
}
...
@@ -1953,13 +1964,6 @@ div[data-gadget-scope='maximize'] button {
...
@@ -1953,13 +1964,6 @@ div[data-gadget-scope='maximize'] button {
}
}
}
}
.ui-icon-warning {
background-color: @coloraccent !important;
&::before {
content: "\f071";
}
}
.ui-icon-spinner {
.ui-icon-spinner {
// Don't fade spinner
// Don't fade spinner
opacity: 1;
opacity: 1;
...
@@ -2302,6 +2306,9 @@ div[data-gadget-scope='maximize'] button {
...
@@ -2302,6 +2306,9 @@ div[data-gadget-scope='maximize'] button {
.ui-icon-eye-slash::before {
.ui-icon-eye-slash::before {
content: "\f070";
content: "\f070";
}
}
.ui-icon-warning::before {
content: "\f071";
}
.ui-icon-low-vision::before {
.ui-icon-low-vision::before {
content: "\f2a8";
content: "\f2a8";
}
}
...
...
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