aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/menu
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-12-01 17:38:26 +0100
committerChocobozzz <florian.bigard@gmail.com>2017-12-01 17:38:26 +0100
commitc30745f342480b59fb0856a059c8c2fbffbcfc6a (patch)
tree06209d7831131120b097b538c0ed851f8e40a280 /client/src/app/menu
parent2bbb34127fccd187ed690949b6791e49fdd77194 (diff)
downloadPeerTube-c30745f342480b59fb0856a059c8c2fbffbcfc6a.tar.gz
PeerTube-c30745f342480b59fb0856a059c8c2fbffbcfc6a.tar.zst
PeerTube-c30745f342480b59fb0856a059c8c2fbffbcfc6a.zip
Add account settings new design
Diffstat (limited to 'client/src/app/menu')
-rw-r--r--client/src/app/menu/menu.component.html2
-rw-r--r--client/src/app/menu/menu.component.scss29
2 files changed, 18 insertions, 13 deletions
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index 21f8d8ba4..0ed8ec518 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -1,7 +1,7 @@
1<menu> 1<menu>
2 <div *ngIf="isLoggedIn" class="logged-in-block"> 2 <div *ngIf="isLoggedIn" class="logged-in-block">
3 <div class="logged-in-info"> 3 <div class="logged-in-info">
4 <div class="logged-in-username">{{ user.username }}</div> 4 <a routerLink="/account/settings" class="logged-in-username">{{ user.username }}</a>
5 <div class="logged-in-email">{{ user.email }}</div> 5 <div class="logged-in-email">{{ user.email }}</div>
6 </div> 6 </div>
7 7
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 2c2106733..9d67ca66c 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -28,6 +28,10 @@ menu {
28 .logged-in-username { 28 .logged-in-username {
29 font-size: 16px; 29 font-size: 16px;
30 font-weight: $font-semibold; 30 font-weight: $font-semibold;
31 color: $menu-color;
32 cursor: pointer;
33
34 @include disable-default-a-behaviour;
31 } 35 }
32 36
33 .logged-in-email { 37 .logged-in-email {
@@ -57,6 +61,12 @@ menu {
57 width: 190px; 61 width: 190px;
58 border-radius: 3px; 62 border-radius: 3px;
59 text-align: center; 63 text-align: center;
64 color: $menu-color;
65 display: block;
66 cursor: pointer;
67 margin-bottom: 15px;
68
69 @include disable-default-a-behaviour;
60 70
61 &.login-button { 71 &.login-button {
62 background-color: $orange-color; 72 background-color: $orange-color;
@@ -82,6 +92,13 @@ menu {
82 92
83 a { 93 a {
84 display: flex; 94 display: flex;
95 color: $menu-color;
96 cursor: pointer;
97 height: 22px;
98 line-height: 22px;
99 font-size: 16px;
100 margin-bottom: 15px;
101 @include disable-default-a-behaviour;
85 102
86 .icon { 103 .icon {
87 width: 22px; 104 width: 22px;
@@ -113,16 +130,4 @@ menu {
113 } 130 }
114 } 131 }
115 } 132 }
116
117 a {
118 color: $menu-color;
119 height: 22px;
120 line-height: 22px;
121 display: block;
122 font-size: 16px;
123 cursor: pointer;
124 margin-bottom: 15px;
125
126 @include disable-default-a-behaviour;
127 }
128} 133}