Merge branch 'master' into ben-design-change

This commit is contained in:
Dave Cranwell 2014-03-18 17:06:06 +00:00
commit 29a86ec3df

View file

@ -17,7 +17,7 @@ nav{
float:right;
/* moving menu only for browser that can support hover and transitions */
/*.no-touch.csstransitions & {
.no-touch.csstransitions & {
ul{
height:0;
}
@ -33,7 +33,7 @@ nav{
left:0;
}
}
}*/
}
}
.home{