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
d6a1458c
Commit
d6a1458c
authored
Jul 22, 2016
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Align header and content in desktop mode
parent
75c86bab
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
14 deletions
+37
-14
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_css.css
.../PathTemplateItem/web_page_module/rjs_gadget_erp5_css.css
+17
-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
+18
-9
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_css.css
View file @
d6a1458c
...
@@ -712,6 +712,11 @@ div[data-gadget-scope='header'] .ui-header h1 > span {
...
@@ -712,6 +712,11 @@ div[data-gadget-scope='header'] .ui-header h1 > span {
padding-left
:
2em
;
padding-left
:
2em
;
}
}
}
}
@media
only
screen
and
(
min-width
:
62em
)
{
div
[
data-gadget-scope
=
'header'
]
.ui-header
h1
>
span
{
padding-left
:
2em
;
}
}
div
[
data-gadget-scope
=
'header'
]
.ui-header
h1
a
{
div
[
data-gadget-scope
=
'header'
]
.ui-header
h1
a
{
display
:
block
;
display
:
block
;
white-space
:
nowrap
;
white-space
:
nowrap
;
...
@@ -720,9 +725,18 @@ div[data-gadget-scope='header'] .ui-header h1 a {
...
@@ -720,9 +725,18 @@ div[data-gadget-scope='header'] .ui-header h1 a {
}
}
div
[
data-gadget-scope
=
'header'
]
.ui-header
h1
a
::before
{
div
[
data-gadget-scope
=
'header'
]
.ui-header
h1
a
::before
{
display
:
inline-block
;
display
:
inline-block
;
text-align
:
center
;
width
:
4em
;
width
:
4em
;
}
}
@media
only
screen
and
(
min-width
:
28em
)
and
(
max-width
:
62em
),
only
screen
and
(
max-width
:
28em
)
{
div
[
data-gadget-scope
=
'header'
]
.ui-header
h1
a
::before
{
text-align
:
center
;
}
}
@media
only
screen
and
(
min-width
:
62em
)
{
div
[
data-gadget-scope
=
'header'
]
.ui-header
h1
a
::before
{
padding-left
:
2em
;
}
}
@media
only
screen
and
(
max-width
:
28em
)
{
@media
only
screen
and
(
max-width
:
28em
)
{
div
[
data-gadget-scope
=
'header'
]
.ui-header
h1
a
::before
{
div
[
data-gadget-scope
=
'header'
]
.ui-header
h1
a
::before
{
width
:
2em
;
width
:
2em
;
...
@@ -752,8 +766,8 @@ div[data-gadget-scope='header'] .ui-header ul a {
...
@@ -752,8 +766,8 @@ div[data-gadget-scope='header'] .ui-header ul a {
}
}
div
[
data-gadget-scope
=
'header'
]
.ui-header
ul
li
a
{
div
[
data-gadget-scope
=
'header'
]
.ui-header
ul
li
a
{
display
:
block
;
display
:
block
;
padding-left
:
0.8
em
;
padding-left
:
2
em
;
padding-right
:
0.8
em
;
padding-right
:
2
em
;
min-width
:
5em
;
min-width
:
5em
;
line-height
:
2.6em
;
line-height
:
2.6em
;
height
:
100%
;
height
:
100%
;
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_css.xml
View file @
d6a1458c
...
@@ -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.47
272.27712.13038
</string>
</value>
<value>
<string>
952.47
419.7858.59784
</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>
146918
0891.44
</float>
<float>
146918
9660.63
</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 @
d6a1458c
...
@@ -38,6 +38,8 @@
...
@@ -38,6 +38,8 @@
@headertitleleftlargemargin: 4em;
@headertitleleftlargemargin: 4em;
@headertitleleftsmallmargin: 2em;
@headertitleleftsmallmargin: 2em;
@mainpaddingdesktop: 2em;
// XXX desktop: 12em
// XXX desktop: 12em
@panelwidth: 17em;
@panelwidth: 17em;
...
@@ -548,7 +550,7 @@ div[data-gadget-scope='panel'] {
...
@@ -548,7 +550,7 @@ div[data-gadget-scope='panel'] {
white-space: nowrap;
white-space: nowrap;
&::before {
&::before {
width:
2em
;
width:
@mainpaddingdesktop
;
}
}
&:hover, &:active {
&:hover, &:active {
background-color: darken(@panelbackgroundcolor, 10%);
background-color: darken(@panelbackgroundcolor, 10%);
...
@@ -761,8 +763,7 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -761,8 +763,7 @@ div[data-gadget-scope='header'] .ui-header {
display: table-footer-group;
display: table-footer-group;
button, a {
button, a {
margin: 0.5em;
margin: 0.5em;
// XXX TODO: same than main page padding
margin-left: @mainpaddingdesktop;
margin-left: 2em;
}
}
}
}
}
}
...
@@ -787,7 +788,10 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -787,7 +788,10 @@ div[data-gadget-scope='header'] .ui-header {
& > span {
& > span {
padding-left: @headertitleleftlargemargin;
padding-left: @headertitleleftlargemargin;
@media @smartphone {
@media @smartphone {
padding-left: @headertitleleftsmallmargin
padding-left: @headertitleleftsmallmargin;
}
@media @desktop {
padding-left: @mainpaddingdesktop;
}
}
}
}
// Clickable title
// Clickable title
...
@@ -801,7 +805,12 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -801,7 +805,12 @@ div[data-gadget-scope='header'] .ui-header {
&::before {
&::before {
display: inline-block;
display: inline-block;
@media @tablet, @smartphone {
text-align: center;
text-align: center;
}
@media @desktop {
padding-left: @mainpaddingdesktop;
}
width: @headertitleleftlargemargin;
width: @headertitleleftlargemargin;
@media @smartphone {
@media @smartphone {
...
@@ -842,8 +851,8 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -842,8 +851,8 @@ div[data-gadget-scope='header'] .ui-header {
a {
a {
display: block;
display: block;
padding-left:
0.8em
;
padding-left:
@mainpaddingdesktop
;
padding-right:
0.8em
;
padding-right:
@mainpaddingdesktop
;
min-width: 5em;
min-width: 5em;
line-height: @headerheight;
line-height: @headerheight;
...
@@ -935,7 +944,7 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -935,7 +944,7 @@ div[data-gadget-scope='header'] .ui-header {
}
}
// Top padding
// Top padding
padding:
2em
;
padding:
@mainpaddingdesktop
;
padding-top: 9em;
padding-top: 9em;
@media @smartphone {
@media @smartphone {
padding: 0.5em;
padding: 0.5em;
...
@@ -1113,7 +1122,7 @@ div[data-gadget-scope='header'] .ui-header {
...
@@ -1113,7 +1122,7 @@ div[data-gadget-scope='header'] .ui-header {
white-space: nowrap;
white-space: nowrap;
&::before {
&::before {
width:
2em
;
width:
@mainpaddingdesktop
;
}
}
&:hover, &:active {
&:hover, &:active {
background-color: darken(@panelbackgroundcolor, 10%);
background-color: darken(@panelbackgroundcolor, 10%);
...
...
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