diff --git a/ng-diogenes/angular.json b/ng-diogenes/angular.json index b46b007..a71411f 100644 --- a/ng-diogenes/angular.json +++ b/ng-diogenes/angular.json @@ -26,7 +26,7 @@ "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", "assets": [ - "src/favicon.ico", + "src/assets/logo/logo_transparent.png", "src/assets" ], "styles": [ diff --git a/ng-diogenes/src/app/pages/category-detail/category-detail.component.scss b/ng-diogenes/src/app/pages/category-detail/category-detail.component.scss index 807bf98..06e9c2a 100644 --- a/ng-diogenes/src/app/pages/category-detail/category-detail.component.scss +++ b/ng-diogenes/src/app/pages/category-detail/category-detail.component.scss @@ -1,6 +1,7 @@ .card { margin: 1rem; max-width: 70rem; + min-width: 35rem; } .center-card { diff --git a/ng-diogenes/src/app/pages/inventory/inventory.component.html b/ng-diogenes/src/app/pages/inventory/inventory.component.html index ccbe8c6..5777642 100644 --- a/ng-diogenes/src/app/pages/inventory/inventory.component.html +++ b/ng-diogenes/src/app/pages/inventory/inventory.component.html @@ -1,7 +1,10 @@
- xxxx + + + Diogenes +
diff --git a/ng-diogenes/src/app/pages/inventory/inventory.component.scss b/ng-diogenes/src/app/pages/inventory/inventory.component.scss index 4dfdcbc..8a4b0bb 100644 --- a/ng-diogenes/src/app/pages/inventory/inventory.component.scss +++ b/ng-diogenes/src/app/pages/inventory/inventory.component.scss @@ -5,7 +5,7 @@ justify-content: space-between; } -.extended-size-row{ +.extended-size-row { min-height: 80px; } @@ -14,4 +14,15 @@ bottom: 20px; right: 20px; z-index: 1; +} + +.logo { + width: 50px; + height: 50px; + margin-right: 0.5rem; +} + +.logo-container { + display: flex; + align-items: center; } \ No newline at end of file diff --git a/ng-diogenes/src/assets/logo/logo.jpg b/ng-diogenes/src/assets/logo/logo.jpg new file mode 100644 index 0000000..07d6d0b Binary files /dev/null and b/ng-diogenes/src/assets/logo/logo.jpg differ diff --git a/ng-diogenes/src/assets/logo/logo_transparent.png b/ng-diogenes/src/assets/logo/logo_transparent.png new file mode 100644 index 0000000..c560bc7 Binary files /dev/null and b/ng-diogenes/src/assets/logo/logo_transparent.png differ diff --git a/ng-diogenes/src/favicon.ico b/ng-diogenes/src/favicon.ico deleted file mode 100644 index 997406a..0000000 Binary files a/ng-diogenes/src/favicon.ico and /dev/null differ diff --git a/ng-diogenes/src/index.html b/ng-diogenes/src/index.html index c223c0c..1fc5fc4 100644 --- a/ng-diogenes/src/index.html +++ b/ng-diogenes/src/index.html @@ -5,7 +5,7 @@ Diogenes - +