Merge master
This commit is contained in:
144
public/build/css/all-b076f8da.css
Normal file
144
public/build/css/all-b076f8da.css
Normal file
File diff suppressed because one or more lines are too long
@@ -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;
|
||||
|
||||
@@ -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
|
||||
}
|
||||
Reference in New Issue
Block a user