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
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
75c86bab
Commit
75c86bab
authored
Jul 22, 2016
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Bypass flexbox bug on firefox
parent
f1012ed7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
11 deletions
+19
-11
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_css.css
.../PathTemplateItem/web_page_module/rjs_gadget_erp5_css.css
+8
-3
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_css.xml
.../PathTemplateItem/web_page_module/rjs_gadget_erp5_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
+9
-6
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_css.css
View file @
75c86bab
...
@@ -612,13 +612,18 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -612,13 +612,18 @@ div[data-gadget-scope='header'] .ui-header {
position
:
fixed
;
position
:
fixed
;
z-index
:
1000
;
z-index
:
1000
;
text-align
:
center
;
text-align
:
center
;
display
:
flex
;
width
:
100%
;
width
:
100%
;
flex-flow
:
row
wrap
;
color
:
#FFFFFF
;
color
:
#FFFFFF
;
}
}
@media
only
screen
and
(
min-width
:
28em
)
and
(
max-width
:
62em
),
only
screen
and
(
max-width
:
28em
)
{
div
[
data-gadget-scope
=
'header'
]
.ui-header
{
display
:
flex
;
flex-flow
:
row
wrap
;
}
}
@media
only
screen
and
(
min-width
:
62em
)
{
@media
only
screen
and
(
min-width
:
62em
)
{
div
[
data-gadget-scope
=
'header'
]
.ui-header
{
div
[
data-gadget-scope
=
'header'
]
.ui-header
{
display
:
table
;
margin-left
:
17em
;
margin-left
:
17em
;
}
}
}
}
...
@@ -682,7 +687,7 @@ div[data-gadget-scope='header'] .ui-header > .ui-btn-right a {
...
@@ -682,7 +687,7 @@ div[data-gadget-scope='header'] .ui-header > .ui-btn-right a {
}
}
@media
only
screen
and
(
min-width
:
62em
)
{
@media
only
screen
and
(
min-width
:
62em
)
{
div
[
data-gadget-scope
=
'header'
]
.ui-header
>
.ui-btn-right
{
div
[
data-gadget-scope
=
'header'
]
.ui-header
>
.ui-btn-right
{
order
:
99
;
display
:
table-footer-group
;
}
}
div
[
data-gadget-scope
=
'header'
]
.ui-header
>
.ui-btn-right
button
,
div
[
data-gadget-scope
=
'header'
]
.ui-header
>
.ui-btn-right
button
,
div
[
data-gadget-scope
=
'header'
]
.ui-header
>
.ui-btn-right
a
{
div
[
data-gadget-scope
=
'header'
]
.ui-header
>
.ui-btn-right
a
{
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_css.xml
View file @
75c86bab
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
952.4
6193.43042.64221
</string>
</value>
<value>
<string>
952.4
7272.27712.13038
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14691
16036.02
</float>
<float>
14691
80891.44
</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 @
75c86bab
...
@@ -688,15 +688,18 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -688,15 +688,18 @@ div[data-gadget-scope='header'] .ui-header {
z-index: 1000;
z-index: 1000;
text-align: center;
text-align: center;
display: flex;
@media @tablet, @smartphone {
// Prevent the header to have a width higher than the screen
display: flex;
width: 100%;
flex-flow: row wrap;
flex-flow: row wrap;
}
@media @desktop {
@media @desktop {
display: table;
margin-left: @panelwidth;
margin-left: @panelwidth;
}
}
// Prevent the header to have a width higher than the screen
width: 100%;
color: @white;
color: @white;
button, a {
button, a {
...
@@ -755,7 +758,7 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -755,7 +758,7 @@ div[data-gadget-scope='header'] .ui-header {
}
}
}
}
@media @desktop {
@media @desktop {
order: 99
;
display: table-footer-group
;
button, a {
button, a {
margin: 0.5em;
margin: 0.5em;
// XXX TODO: same than main page padding
// XXX TODO: same than main page padding
...
...
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