aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-12-04 10:40:02 +0100
committerChocobozzz <florian.bigard@gmail.com>2017-12-04 10:40:02 +0100
commitd178b5c1f8eabb0face854d48e708f0ac72e7d2e (patch)
treedc3bae0f9cc5eae059b6c8bfaa513de3ef2917ef
parent2295ce6c4e7ba805cc100ff961527bebc2cd89e5 (diff)
downloadPeerTube-d178b5c1f8eabb0face854d48e708f0ac72e7d2e.tar.gz
PeerTube-d178b5c1f8eabb0face854d48e708f0ac72e7d2e.tar.zst
PeerTube-d178b5c1f8eabb0face854d48e708f0ac72e7d2e.zip
Add margin when main content is not expanded
-rw-r--r--client/src/app/account/account-settings/account-settings.component.html2
-rw-r--r--client/src/sass/_variables.scss1
-rw-r--r--client/src/sass/application.scss5
3 files changed, 5 insertions, 3 deletions
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 9e9f688d2..c0a74cc47 100644
--- 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 @@
3 3
4 <div class="user-info"> 4 <div class="user-info">
5 <div class="user-info-username">{{ user.username }}</div> 5 <div class="user-info-username">{{ user.username }}</div>
6 <div class="user-info-followers">{{ user.account.followersCount }} subscribers</div> 6 <div class="user-info-followers">{{ user.account?.followersCount }} subscribers</div>
7 </div> 7 </div>
8</div> 8</div>
9 9
diff --git a/client/src/sass/_variables.scss b/client/src/sass/_variables.scss
index d05452367..0d655e85c 100644
--- a/client/src/sass/_variables.scss
+++ b/client/src/sass/_variables.scss
@@ -9,6 +9,7 @@ $black-background: #000;
9$grey-background: #f6f2f2; 9$grey-background: #f6f2f2;
10 10
11$expanded-horizontal-margins: 150px; 11$expanded-horizontal-margins: 150px;
12$not-expanded-horizontal-margins: 30px;
12 13
13$button-height: 30px; 14$button-height: 30px;
14 15
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index db63db5f5..5e401f93b 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -52,8 +52,8 @@ input.readonly {
52 } 52 }
53 53
54 .margin-content { 54 .margin-content {
55 margin-left: 10px; 55 margin-left: $not-expanded-horizontal-margins;
56 margin-right: 10px; 56 margin-right: $not-expanded-horizontal-margins;
57 } 57 }
58 58
59 .sub-menu { 59 .sub-menu {
@@ -63,6 +63,7 @@ input.readonly {
63 margin-bottom: 30px; 63 margin-bottom: 30px;
64 display: flex; 64 display: flex;
65 align-items: center; 65 align-items: center;
66 padding-left: $not-expanded-horizontal-margins;
66 } 67 }
67 68
68 // Override some properties if the main content is expanded (no menu on the left) 69 // Override some properties if the main content is expanded (no menu on the left)