merging from ui update branch

This commit is contained in:
Dave Cranwell 2014-02-05 12:29:13 +00:00
parent 7e3894e124
commit 6fb3159074
4 changed files with 30 additions and 14 deletions

View file

@ -13,7 +13,7 @@
@import "components/formatters.less";
html{
background-color:@color-grey-5;
background:url(/static/verdantadmin/images/bg-body.svg);
height:100%;
}
@ -25,7 +25,6 @@ body{
color:@color-text-base;
overflow-x: hidden;
position: relative;
background:@color-grey-5;
&.reordering{
overflow:visible;
@ -433,7 +432,6 @@ header{
footer{
.row();
background: @color-grey-1;
background: rgba(0,0,0,0.7);
position:fixed;
bottom:0;
padding:0.5em;
@ -648,6 +646,7 @@ footer, .logo{
.content-wrapper{
-webkit-transform:none;
transform:none;
border-bottom-right-radius: 5px;
}
.nav-wrapper{
@ -801,11 +800,10 @@ footer, .logo{
}
}
@media screen and (min-width: @breakpoint-desktop-larger){
@media screen and (min-width: 90em){
.wrapper{
/*background-color:@color-grey-5;*/
max-width:@breakpoint-desktop-larger;
border-right:1px solid @color-grey-4;
}
.nav-wrapper{
.box-shadow(inset -6px 0px 4px 0px rgba(0, 0, 0, 0.2));

View file

@ -64,7 +64,7 @@
text-transform:uppercase;
padding:0.9em 0 0.9em 4em;
font-size:1em;
margin:0 0 0.2em 0;
margin:0 25px 0.2em 25px;
line-height:1.5em;
font-weight:normal;
position:absolute;
@ -93,11 +93,6 @@
}
}
&.empty > h2, &.empty.single-field label{
margin:0;
border-bottom:1px solid white;
}
&.single-field{
h2, .object-help{
display:none; /* The field label is used instead */
@ -199,7 +194,7 @@
border-bottom:1px solid white;
> h2, &.single-field label{
margin:0;
margin:0 25px;
border-bottom:1px solid white;
}
@ -209,7 +204,7 @@
position:relative;
z-index:2;
top:0px;
left:0px;
left:25px;
width:3.3em;
background-color:@color-teal;
padding:0;

View file

@ -6,7 +6,7 @@
left:50px;
z-index:5;
margin-top:3em;
margin-left:4px;
margin-left:50px;
}
.hallotoolbar.affixed{
position:fixed;

View file

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
<svg width="5" height="5" viewBox="0 0 5 5" xmlns="http://www.w3.org/2000/svg">
<defs>
<style type="text/css">
<![CDATA[
#background{
fill:#333
}
#foreground rect {
fill: #444;
}
]]>
</style>
</defs>
<rect id="background" x="0" y="0" width="100" height="100" />
<g id="foreground">
<rect x="0" y="4" width="1" height="1" />
<rect x="1" y="3" width="1" height="1" />
<rect x="2" y="2" width="1" height="1" />
<rect x="3" y="1" width="1" height="1" />
<rect x="4" y="0" width="1" height="1" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 705 B