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

Merge pull request #2394 from tmdvs/2.4

Browse Source 
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
parent e9c32af672 c1bca36a95
commit c229fd1757
12 changed files with 27740 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/build/dist/css/app-7289b01c7e.css
Vendored
+11373
View File
File diff suppressed because it is too large Load Diff
public/build/dist/css/app-8dd25fc03d.css
Vendored
-11
View File
File diff suppressed because one or more lines are too long
public/build/dist/css/app.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/build/dist/css/dashboard-0bc8df1d37.css
Vendored
+14266
View File
File diff suppressed because one or more lines are too long
public/build/dist/css/dashboard-601c507890.css
Vendored
-15
View File
File diff suppressed because one or more lines are too long
public/build/dist/css/dashboard.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/build/dist/js/all-01a74f0a66.js
Vendored
-22
View File
File diff suppressed because one or more lines are too long
public/build/dist/js/all-82aa10ad4b.js
Vendored
+2093
View File
File diff suppressed because one or more lines are too long
public/build/dist/js/all.js.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/build/rev-manifest.json
+3 -3
View File
@@ -1,5 +1,5 @@
{ {
"dist/css/app.css": "dist/css/app-8dd25fc03d.css", "dist/css/app.css": "dist/css/app-7289b01c7e.css",
"dist/css/dashboard.css": "dist/css/dashboard-601c507890.css", "dist/css/dashboard.css": "dist/css/dashboard-0bc8df1d37.css",
"dist/js/all.js": "dist/js/all-01a74f0a66.js" "dist/js/all.js": "dist/js/all-82aa10ad4b.js"
} }
resources/assets/sass/dashboard/partials/_sidebar.scss
Vendored
+1 -1
View File
@@ -132,7 +132,7 @@ body.dashboard {
@extend .hidden-sm; @extend .hidden-sm;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
width: 230px; width: 237px;
z-index: 999; z-index: 999;
ul > li { ul > li {
float: left; float: left;
resources/assets/sass/modules/_variables.scss
Vendored
+1 -1
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-size: 0.9em;
$sidebar-text-color: #ffffff; $sidebar-text-color: #ffffff;
$sidebar-text-active-color: #ffffff; $sidebar-text-active-color: #ffffff;
$sidebar-normal-width: 230px; $sidebar-normal-width: 235px;
$sidebar-phone-width: 75%; $sidebar-phone-width: 75%;
$sidebar-active-color: #00695C; $sidebar-active-color: #00695C;