Add margin when main content is not expanded

diff --git a/client/src/app/account/account-settings/account-settings.component.html b/client/src/app/account/account-settings/account-settings.component.html
index 9e9f688d222cabae3bf8bd4138bf368459d0650f..c0a74cc4764d58d6252585f0227f0a31ad2ee137 100644 (file)
--- a/client/src/app/account/account-settings/account-settings.component.html
+++ b/client/src/app/account/account-settings/account-settings.component.html
@@ -3,7 +3,7 @@
 
   <div class="user-info">
     <div class="user-info-username">{{ user.username }}</div>
-    <div class="user-info-followers">{{ user.account.followersCount }} subscribers</div>
+    <div class="user-info-followers">{{ user.account?.followersCount }} subscribers</div>
   </div>
 </div>
 

diff --git a/client/src/sass/_variables.scss b/client/src/sass/_variables.scss
index d05452367754be9228503a089a14319e99ce6556..0d655e85c17c18fbcf67c6328c2fc1cd19022eb3 100644 (file)
--- a/client/src/sass/_variables.scss
+++ b/client/src/sass/_variables.scss
@@ -9,6 +9,7 @@ $black-background: #000;
 $grey-background: #f6f2f2;
 
 $expanded-horizontal-margins: 150px;
+$not-expanded-horizontal-margins: 30px;
 
 $button-height: 30px;
 

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index db63db5f5070ec194cbfab8dd98f475f2875de5f..5e401f93b204fe1af3860b4b73f1425c6e561487 100644 (file)
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -52,8 +52,8 @@ input.readonly {
   }
 
   .margin-content {
-    margin-left: 10px;
-    margin-right: 10px;
+    margin-left: $not-expanded-horizontal-margins;
+    margin-right: $not-expanded-horizontal-margins;
   }
 
   .sub-menu {
@@ -63,6 +63,7 @@ input.readonly {
     margin-bottom: 30px;
     display: flex;
     align-items: center;
+    padding-left: $not-expanded-horizontal-margins;
   }
 
   // Override some properties if the main content is expanded (no menu on the left)