aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-04-21 16:51:03 +0200
committerChocobozzz <florian.bigard@gmail.com>2017-04-26 21:23:19 +0200
commit6562f1f727d13179025a8bb31715d2bf71dba86e (patch)
treee9ebec87e308557e9d3dd5412edfcd60d05643f0 /client/src
parent09223546a4d882a9dbfdbd95d551e48af7bee123 (diff)
downloadPeerTube-6562f1f727d13179025a8bb31715d2bf71dba86e.tar.gz
PeerTube-6562f1f727d13179025a8bb31715d2bf71dba86e.tar.zst
PeerTube-6562f1f727d13179025a8bb31715d2bf71dba86e.zip
Client: add titles to menu blocks
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/core/menu/menu-admin.component.scss18
-rw-r--r--client/src/app/core/menu/menu.component.html10
-rw-r--r--client/src/sass/_variables.scss3
3 files changed, 26 insertions, 5 deletions
diff --git a/client/src/app/core/menu/menu-admin.component.scss b/client/src/app/core/menu/menu-admin.component.scss
index 04403950e..5881475f1 100644
--- a/client/src/app/core/menu/menu-admin.component.scss
+++ b/client/src/app/core/menu/menu-admin.component.scss
@@ -1,13 +1,25 @@
1menu { 1menu {
2 background-color: $black-background; 2 background-color: $black-background;
3 padding: 20px; 3 padding: 25px;
4 margin: 0; 4 margin: 0;
5 height: 100%; 5 height: 100%;
6 6
7 .panel-block {
8 margin-bottom: 15px;
9 }
10
11 .block-title {
12 text-transform: uppercase;
13 font-weight: bold;
14 color: $menu-color-block;
15 margin-bottom: 10px;
16 }
17
7 a { 18 a {
8 display: block; 19 display: block;
20 margin-left: 5px;
9 height: 30px; 21 height: 30px;
10 color: #9cabb8; 22 color: $menu-color-link;
11 cursor: pointer; 23 cursor: pointer;
12 transition: color 0.3s; 24 transition: color 0.3s;
13 25
@@ -17,7 +29,7 @@ menu {
17 } 29 }
18 30
19 .glyphicon { 31 .glyphicon {
20 margin-right: 20px; 32 margin-right: 15px;
21 } 33 }
22 34
23 &:hover, &.active { 35 &:hover, &.active {
diff --git a/client/src/app/core/menu/menu.component.html b/client/src/app/core/menu/menu.component.html
index 0b093882f..63a1c03c5 100644
--- a/client/src/app/core/menu/menu.component.html
+++ b/client/src/app/core/menu/menu.component.html
@@ -1,5 +1,7 @@
1<menu> 1<menu>
2 <div class="panel-block"> 2 <div class="panel-block">
3 <div class="block-title">Account</div>
4
3 <div id="panel-user-login" class="panel-button"> 5 <div id="panel-user-login" class="panel-button">
4 <a *ngIf="!isLoggedIn" routerLink="/login" routerLinkActive="active"> 6 <a *ngIf="!isLoggedIn" routerLink="/login" routerLinkActive="active">
5 <span class="hidden-xs glyphicon glyphicon-log-in"></span> 7 <span class="hidden-xs glyphicon glyphicon-log-in"></span>
@@ -24,6 +26,8 @@
24 </div> 26 </div>
25 27
26 <div class="panel-block"> 28 <div class="panel-block">
29 <div class="block-title">Videos</div>
30
27 <a routerLink="/videos/list" routerLinkActive="active"> 31 <a routerLink="/videos/list" routerLinkActive="active">
28 <span class="hidden-xs glyphicon glyphicon-list"></span> 32 <span class="hidden-xs glyphicon glyphicon-list"></span>
29 See videos 33 See videos
@@ -35,8 +39,10 @@
35 </a> 39 </a>
36 </div> 40 </div>
37 41
38 <div class="panel-block"> 42 <div *ngIf="isUserAdmin()" class="panel-block">
39 <a *ngIf="isUserAdmin()" routerLink="/admin" routerLinkActive="active"> 43 <div class="block-title">Other</div>
44
45 <a routerLink="/admin" routerLinkActive="active">
40 <span class="hidden-xs glyphicon glyphicon-cog"></span> 46 <span class="hidden-xs glyphicon glyphicon-cog"></span>
41 Administration 47 Administration
42 </a> 48 </a>
diff --git a/client/src/sass/_variables.scss b/client/src/sass/_variables.scss
index 1b91434ba..d89fbb5e0 100644
--- a/client/src/sass/_variables.scss
+++ b/client/src/sass/_variables.scss
@@ -3,6 +3,9 @@ $grey-color: #555;
3$black-background: #1d2125; 3$black-background: #1d2125;
4$grey-background: #f6f2f2; 4$grey-background: #f6f2f2;
5 5
6$menu-color-link: #9cabb8;
7$menu-color-block: #686f77;
8
6$header-height: 65px; 9$header-height: 65px;
7$header-border-color: #e9eff6; 10$header-border-color: #e9eff6;
8 11