Merge pull request #2394 from tmdvs/2.4

Fix API bug and address visual bug in dashboard.
This commit is contained in:
James Brooks 2017-03-04 10:45:12 +00:00 committed by GitHub
commit c229fd1757
12 changed files with 27740 additions and 56 deletions

11373
public/build/dist/css/app-7289b01c7e.css vendored Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2093
public/build/dist/js/all-82aa10ad4b.js vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,5 @@
{
"dist/css/app.css": "dist/css/app-8dd25fc03d.css",
"dist/css/dashboard.css": "dist/css/dashboard-601c507890.css",
"dist/js/all.js": "dist/js/all-01a74f0a66.js"
"dist/css/app.css": "dist/css/app-7289b01c7e.css",
"dist/css/dashboard.css": "dist/css/dashboard-0bc8df1d37.css",
"dist/js/all.js": "dist/js/all-82aa10ad4b.js"
}

View File

@ -132,7 +132,7 @@ body.dashboard {
@extend .hidden-sm;
position: fixed;
bottom: 0;
width: 230px;
width: 237px;
z-index: 999;
ul > li {
float: left;

View File

@ -34,6 +34,6 @@ $sidebar-border-shadow: inset 0px -2px 3px rgba(0,0,0,0.25);
$sidebar-text-size: 0.9em;
$sidebar-text-color: #ffffff;
$sidebar-text-active-color: #ffffff;
$sidebar-normal-width: 230px;
$sidebar-normal-width: 235px;
$sidebar-phone-width: 75%;
$sidebar-active-color: #00695C;