aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-04-21 17:12:28 +0200
committerChocobozzz <florian.bigard@gmail.com>2017-04-26 21:23:19 +0200
commitea9f487b40c7f1d7348d9f88703cb9d52c7e8603 (patch)
tree94cd67ea5b3cab7449fd66e5c9864c1c3649ad2b /client/src/app
parent6562f1f727d13179025a8bb31715d2bf71dba86e (diff)
downloadPeerTube-ea9f487b40c7f1d7348d9f88703cb9d52c7e8603.tar.gz
PeerTube-ea9f487b40c7f1d7348d9f88703cb9d52c7e8603.tar.zst
PeerTube-ea9f487b40c7f1d7348d9f88703cb9d52c7e8603.zip
Client: fixed header and menu
Diffstat (limited to 'client/src/app')
-rw-r--r--client/src/app/app.component.html12
-rw-r--r--client/src/app/app.component.scss39
-rw-r--r--client/src/app/videos/video-watch/video-watch.component.scss2
3 files changed, 48 insertions, 5 deletions
diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index f1eb6e021..061ebe134 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -11,6 +11,10 @@
11 </div> 11 </div>
12 </div> 12 </div>
13 13
14 <!-- Used for the fixed menu -->
15 <div class="col-md-2 col-sm-3 col-xs-3">
16 </div>
17
14 <div class="col-md-10 col-sm-9 col-xs-9 main-col"> 18 <div class="col-md-10 col-sm-9 col-xs-9 main-col">
15 <div class="header"> 19 <div class="header">
16 <my-search></my-search> 20 <my-search></my-search>
@@ -19,12 +23,12 @@
19 <div class="main-row"> 23 <div class="main-row">
20 <router-outlet></router-outlet> 24 <router-outlet></router-outlet>
21 </div> 25 </div>
26
27 <footer>
28 PeerTube, CopyLeft 2015-2017
29 </footer>
22 </div> 30 </div>
23 </div> 31 </div>
24
25 <footer>
26 PeerTube, CopyLeft 2015-2017
27 </footer>
28</div> 32</div>
29 33
30<my-confirm></my-confirm> 34<my-confirm></my-confirm>
diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index e69de29bb..dc4dcf28b 100644
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -0,0 +1,39 @@
1.title-menu-left {
2 height: calc(100vh - #{$header-height});
3 padding-right: 0;
4
5 .title-menu-left-block {
6 margin-left: -15px;
7
8 &.menu {
9 height: 100%;
10 }
11 }
12
13 #peertube-title {
14 background-color: #fff;
15 border-right: 1px solid $header-border-color;
16 font-size: 25px;
17 line-height: $header-height;
18 text-align: center;
19 margin-top: 0;
20 margin-bottom: 0;
21
22 a {
23 color: inherit !important;
24
25 &:hover {
26 color: inherit !important;
27 text-decoration: none !important;
28 }
29 }
30 }
31}
32
33footer {
34 border-top: 1px solid rgba(0, 0, 0, 0.2);
35 padding: 10px;
36 text-align: center;
37 font-size: small;
38 margin: 30px 10px 0 10px;
39}
diff --git a/client/src/app/videos/video-watch/video-watch.component.scss b/client/src/app/videos/video-watch/video-watch.component.scss
index cd9d71fb4..abd2832df 100644
--- a/client/src/app/videos/video-watch/video-watch.component.scss
+++ b/client/src/app/videos/video-watch/video-watch.component.scss
@@ -45,7 +45,7 @@
45 } 45 }
46 46
47 .video-small-blocks { 47 .video-small-blocks {
48 height: 150px; 48 height: $video-watch-info-height;
49 color: $video-watch-info-color; 49 color: $video-watch-info-color;
50 border-color: $video-watch-border-color; 50 border-color: $video-watch-border-color;
51 border-width: 1px 0px; 51 border-width: 1px 0px;