diff --git a/Front/skydivelogs-app/src/app/app.component.html b/Front/skydivelogs-app/src/app/app.component.html index 4747538..8f9c281 100644 --- a/Front/skydivelogs-app/src/app/app.component.html +++ b/Front/skydivelogs-app/src/app/app.component.html @@ -44,7 +44,7 @@ logout - Logout + Logout diff --git a/Front/skydivelogs-app/src/app/default/default.component.html b/Front/skydivelogs-app/src/app/default/default.component.html index 7e325ef..11c39da 100644 --- a/Front/skydivelogs-app/src/app/default/default.component.html +++ b/Front/skydivelogs-app/src/app/default/default.component.html @@ -6,7 +6,7 @@

- Add new jumps + Add new jumps

diff --git a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.css b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.css index ff391a1..7513415 100644 --- a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.css +++ b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.css @@ -19,4 +19,4 @@ table { flex-direction: column; align-items: initial; padding-top: 25px; -} +} \ No newline at end of file diff --git a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html index e428d39..86e3b94 100644 --- a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html +++ b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html @@ -17,14 +17,14 @@ (click)="setToFavorite(element)" style="cursor: pointer;">favorite_border - link + link - map + map - mail_outline + mail_outline diff --git a/Front/skydivelogs-app/src/app/user-profile/user-profile.component.css b/Front/skydivelogs-app/src/app/user-profile/user-profile.component.css index d9e1d94..af83daf 100644 --- a/Front/skydivelogs-app/src/app/user-profile/user-profile.component.css +++ b/Front/skydivelogs-app/src/app/user-profile/user-profile.component.css @@ -1,8 +1,14 @@ .content { min-height: 90vh; - display: flex; justify-content: left; - flex-direction: column; align-items: initial; padding-top: 25px; } + +.containerFlex { + display: flex; + flex-wrap: wrap; +} +.contentFlex { + flex: 45%; +} \ No newline at end of file diff --git a/Front/skydivelogs-app/src/app/user-profile/user-profile.component.html b/Front/skydivelogs-app/src/app/user-profile/user-profile.component.html index 4cc4014..731d1ea 100644 --- a/Front/skydivelogs-app/src/app/user-profile/user-profile.component.html +++ b/Front/skydivelogs-app/src/app/user-profile/user-profile.component.html @@ -1,6 +1,6 @@ -
+
-
+
Profile

@@ -45,7 +45,7 @@

-
+
Images
diff --git a/Front/skydivelogs-app/src/assets/css/styles-app-loading.scss b/Front/skydivelogs-app/src/assets/css/styles-app-loading.scss index c4ad3fb..551bdbe 100644 --- a/Front/skydivelogs-app/src/assets/css/styles-app-loading.scss +++ b/Front/skydivelogs-app/src/assets/css/styles-app-loading.scss @@ -11,9 +11,7 @@ .logo { width: 100px; height: 100px; - - // this way asset gets processed by webpack - background: url(/assets/img/logo.png) center center no-repeat; + background: url(/assets/img/logo_white.png) center center no-repeat; background-size: 100px 100px; } } diff --git a/Front/skydivelogs-app/src/assets/img/addJump_white.png b/Front/skydivelogs-app/src/assets/img/addJump_white.png new file mode 100644 index 0000000..2a685e8 Binary files /dev/null and b/Front/skydivelogs-app/src/assets/img/addJump_white.png differ diff --git a/Front/skydivelogs-app/src/assets/img/logo_white.png b/Front/skydivelogs-app/src/assets/img/logo_white.png new file mode 100644 index 0000000..c396f3d Binary files /dev/null and b/Front/skydivelogs-app/src/assets/img/logo_white.png differ