Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-12 01:03:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit '3f4cd0c' into reapply-design-updates-pre-split

Browse source
This commit is contained in:
Dave Cranwell 2014-02-05 11:53:27 +00:00
parent c73d5c6ecc
commit 4c46779974
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
wagtail/wagtailadmin/static/wagtailadmin/css/core.less
View file

@ -390,7 +390,8 @@ header{
float:left;
margin-right:1em;
width:50%;
&:first-child{
.hasform &:first-child{
padding-bottom:0.5em;
float:none;
}
@ -748,7 +749,15 @@ footer, .logo{
padding-bottom:0;
float:left;
}
}
.col3{
.col3();
}
.col6{
.col6();
}
.col9{
.col9();
}
}
footer{

4
wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
View file

@ -1,6 +1,6 @@
<header class="nice-padding {% if merged %}merged{% endif %} {% if tabbed %}tab-merged{% endif %}">
<header class="nice-padding {% if merged %}merged{% endif %} {% if tabbed %}tab-merged{% endif %} {% if form %}hasform{% endif %}">
<div class="row row-flush">
<div class="left col6">
<div class="left col{% if form %}6{% else %}9{% endif %}">
<h1>{{ title }} <span>{{ subtitle }}</span></h1>
</div>
{% if form %}