Merge master

This commit is contained in:
James Brooks
2014-12-04 23:05:52 +00:00
4 changed files with 151 additions and 0 deletions

View File

@@ -2,6 +2,7 @@ body.dashboard {
.sidebar {
height: 100%;
position: fixed;
z-index: 998;
width: $sidebar-normal-width;
background: $sidebar-background-color;
transition: margin $sidebar-transition-speed;

File diff suppressed because one or more lines are too long

View File

@@ -85,6 +85,7 @@ body.dashboard .navbar {
body.dashboard .sidebar {
height: 100%;
position: fixed;
z-index: 998;
width: 250px;
background: #37474f;
-webkit-transition: margin 0.2s;

View File

@@ -1,4 +1,9 @@
{
<<<<<<< HEAD
"css/all.css": "css/all-a955efc4.css",
"js/all.js": "js/all-c84ab03b.js"
=======
"css/all.css": "css/all-b076f8da.css",
"js/all.js": "js/all-86e91591.js"
>>>>>>> 93289f2922b2eba558b0562dde18e4a008267df3
}