entrouvert
/
gadjo
15
0
Fork 0
Code Issues Pull Requests 3 Releases Activity

general: move #header out of #main (#22441)

This commit is contained in:
Frédéric Péters 2018-03-10 14:55:52 +01:00
parent 835f225ecc
commit e125109332
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gadjo/static/css/gadjo.scss
View File

@ -684,23 +684,28 @@ input[type=submit]:hover {
background: #23282d url(texture.png);
}
body[data-has-sidebar] #header,
body[data-has-sidebar] #main {
margin-left: 36px;
}
body #main.sidepage-expanded {
body.sidepage-expanded #header,
body.sidepage-expanded #main {
margin-left: 30ex;
}
#main.enable-transitions,
#main.enable-transitions div#header h1,
#sidepage.enable-transitions ul#sidepage-menu,
#sidepage.enable-transitions span#applabel,
#sidepage.enable-transitions {
@include vendor-prefix('transition-duration', '400ms');
body.enable-transitions {
#header,
#main,
#main div#header h1,
#sidepage ul#sidepage-menu,
#sidepage span#applabel,
#sidepage {
@include vendor-prefix('transition-duration', '400ms');
}
}
#sidepage.sidepage-expanded {
body.sidepage-expanded #sidepage {
height: 100%;
overflow: initial;
width: 30ex;
@ -710,6 +715,7 @@ body #main.sidepage-expanded {
transform: scale(1);
}
#header,
#main {
@include vendor-prefix('transition', 'margin-left 0ms ease-in');
position: relative;
@ -743,11 +749,11 @@ body #main.sidepage-expanded {
padding-right: 12px;
}
#sidepage.sidepage-expanded span#applabel::before {
body.sidepage-expanded #sidepage span#applabel::before {
content: "\f190"; /* fa-arrow-circle-o-left */
}
#sidepage.sidepage-expanded span#applabel {
body.sidepage-expanded #sidepage span#applabel {
overflow: hidden;
max-width: 100%;
}
@ -838,11 +844,8 @@ ul#sidepage-menu li a {
width: 1em;
display: inline-block;
}
&.enable-transitions {
@include vendor-prefix('transition-duration', '100ms');
}
}
#sidepage.sidepage-expanded {
body.sidepage-expanded #sidepage {
height: 100%;
width: 100%;
span#applabel::before {
@ -850,7 +853,7 @@ ul#sidepage-menu li a {
}
}
body[data-has-sidebar] #main,
body #main.sidepage-expanded {
body.sidepage-expanded #main {
margin-left: 0;
}
#sidepage ul#sidepage-menu li {
@ -909,7 +912,7 @@ $appicons: add, announces, book, calendar, categories, clock, counter, facturier
#sidepage-menu {
display: none;
}
body #main.sidepage-expanded { margin: 0; }
body.sidepage-expanded #main { margin: 0; }
div#header h1 {
text-shadow: none;

8
gadjo/static/js/gadjo.js
View File

@ -309,9 +309,9 @@ var gadjo_js = gadjo_js || {};
if ($('#sidepage').length) {
var sidepage_button = $('#sidepage #applabel');
sidepage_button.on('click', function() {
$('#sidepage, #main').addClass('enable-transitions');
$('#sidepage, #main').toggleClass('sidepage-expanded');
if ($('#sidepage').hasClass('sidepage-expanded')) {
$('body').addClass('enable-transitions');
$('body').toggleClass('sidepage-expanded');
if ($('body').hasClass('sidepage-expanded')) {
set_sidepage_status('expanded');
} else {
set_sidepage_status('collasped');
@ -319,7 +319,7 @@ var gadjo_js = gadjo_js || {};
});
if ($(window).width() > 760) {
if (get_sidepage_status() == 'expanded') {
$('#sidepage, #main').toggleClass('sidepage-expanded');
$('body').toggleClass('sidepage-expanded');
}
}
}

2
gadjo/templates/gadjo/root.html
View File

@ -35,13 +35,13 @@
</ul>
{% endblock %}
</div>
<div id="main">
<div id="header">
{% block site-header %}
<h1>{% block site-title %}{% endblock %}</h1>
{% block subheader %}{% endblock %}
{% endblock %}
</div>
<div id="main">
{% block old-ie-warning %}
<!--[if lt IE 9]>