aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2018-09-02 19:22:34 +0200
committerChocobozzz <me@florianbigard.com>2018-09-03 08:49:29 +0200
commita54991da4224534bf4beaf994d99e4ce5a0a54f7 (patch)
treefc6f342b96eac331a54b75c468555bf945af2d03
parentc28beaea83abf32e4f0588895e961b8137ec5121 (diff)
downloadPeerTube-a54991da4224534bf4beaf994d99e4ce5a0a54f7.tar.gz
PeerTube-a54991da4224534bf4beaf994d99e4ce5a0a54f7.tar.zst
PeerTube-a54991da4224534bf4beaf994d99e4ce5a0a54f7.zip
make left menu show the scrollbar on hover/focus
add hotkey to the overview page
-rw-r--r--client/src/app/app.component.ts4
-rw-r--r--client/src/app/menu/menu.component.scss6
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.html2
3 files changed, 10 insertions, 2 deletions
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index a69f419be..7bab2e2fd 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -132,6 +132,10 @@ export class AppComponent implements OnInit {
132 this.router.navigate([ '/videos/subscriptions' ]) 132 this.router.navigate([ '/videos/subscriptions' ])
133 return false 133 return false
134 }, undefined, 'Go to the subscriptions videos page'), 134 }, undefined, 'Go to the subscriptions videos page'),
135 new Hotkey('g+o', (event: KeyboardEvent): boolean => {
136 this.router.navigate([ '/videos/overview' ])
137 return false
138 }, undefined, 'Go to the videos overview page'),
135 new Hotkey('g+t', (event: KeyboardEvent): boolean => { 139 new Hotkey('g+t', (event: KeyboardEvent): boolean => {
136 this.router.navigate([ '/videos/trending' ]) 140 this.router.navigate([ '/videos/trending' ])
137 return false 141 return false
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index f8c7d8519..941c208e2 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -18,12 +18,16 @@ menu {
18 overflow: hidden; 18 overflow: hidden;
19 z-index: 1000; 19 z-index: 1000;
20 color: $menu-color; 20 color: $menu-color;
21 overflow-y: auto;
22 display: flex; 21 display: flex;
23 flex-direction: column; 22 flex-direction: column;
24 23
24 &:focus, &:hover {
25 overflow-y: auto;
26 }
27
25 .top-menu { 28 .top-menu {
26 flex-grow: 1; 29 flex-grow: 1;
30 width: $menu-width;
27 } 31 }
28 32
29 .logged-in-block { 33 .logged-in-block {
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html
index c6118b763..7dbc96bf4 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -208,7 +208,7 @@
208 <div class="privacy-concerns-text"> 208 <div class="privacy-concerns-text">
209 <strong i18n>Friendly Reminder: </strong> 209 <strong i18n>Friendly Reminder: </strong>
210 <ng-container i18n> 210 <ng-container i18n>
211 the sharing system used by this video implies that some technical information about your system (such as a public IP address) can be sent to other peers. 211 the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers.
212 </ng-container> 212 </ng-container>
213 <a i18n i18n-title title="Get more information" target="_blank" rel="noopener noreferrer" href="/about/peertube">More information</a> 213 <a i18n i18n-title title="Get more information" target="_blank" rel="noopener noreferrer" href="/about/peertube">More information</a>
214 </div> 214 </div>