lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master

Browse Source
This commit is contained in:
James Brooks
2014-12-04 23:05:52 +00:00
parent 5c9ca420c1 93289f2922
commit 5070e00d50
4 changed files with 151 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/sass/partials/_sidebar.scss
View File

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

144
public/build/css/all-b076f8da.css Normal file
View File

File diff suppressed because one or more lines are too long

1
public/build/css/all.css
View File

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

5
public/build/rev-manifest.json
View File

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