diff --git a/web/package-lock.json b/web/package-lock.json index 05ec382c..f390605a 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -8846,6 +8846,14 @@ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "dev": true }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -8857,14 +8865,6 @@ "strip-ansi": "3.0.1" } }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "requires": { - "safe-buffer": "5.1.1" - } - }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", @@ -9363,8 +9363,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "dev": true, - "optional": true + "dev": true }, "uglifyjs-webpack-plugin": { "version": "1.0.0", diff --git a/web/src/app/app.component.html b/web/src/app/app.component.html index da75cf50..45e95938 100644 --- a/web/src/app/app.component.html +++ b/web/src/app/app.component.html @@ -1,4 +1,4 @@ - + diff --git a/web/src/app/app.component.scss b/web/src/app/app.component.scss index 710976af..0e4c3e4f 100644 --- a/web/src/app/app.component.scss +++ b/web/src/app/app.component.scss @@ -10,16 +10,19 @@ min-width: 86%; margin: 10px auto; overflow-x: hidden; + margin-top:4rem; } .sidebar { width: 14%; position: fixed; - margin-top: 64px; + margin-top: 4rem; } .navbar { position: fixed; + width: 100%; + z-index: 2; } .dashboard-highlight { diff --git a/web/src/app/pages/dashboard/dashboard.component.html b/web/src/app/pages/dashboard/dashboard.component.html index 3d986445..92996ea5 100644 --- a/web/src/app/pages/dashboard/dashboard.component.html +++ b/web/src/app/pages/dashboard/dashboard.component.html @@ -1,16 +1,16 @@ - + Shiba Inu Dog Breed - + HI - + - + @@ -23,10 +23,9 @@ HI - + - - lkasdjf; la + @@ -35,29 +34,27 @@ Shiba Inu Dog Breed - + HI - + + - + - Shiba Inu + 4 Inu Dog Breed - + HI - + - + - - - - \ No newline at end of file + \ No newline at end of file diff --git a/web/src/app/pages/dashboard/dashboard.component.scss b/web/src/app/pages/dashboard/dashboard.component.scss index 221bc7d4..852afb6f 100644 --- a/web/src/app/pages/dashboard/dashboard.component.scss +++ b/web/src/app/pages/dashboard/dashboard.component.scss @@ -6,4 +6,9 @@ ::ng-deep mat-grid-tile.mat-grid-tile .mat-figure { align-items: initial; /*vertical alignment*/ +} + +.mat-card-footer { + position: absolute; + bottom: 24px; } \ No newline at end of file