Client: fixed header and menu

pull/71/head
Chocobozzz 2017-04-21 17:12:28 +02:00
parent 6562f1f727
commit ea9f487b40
5 changed files with 58 additions and 46 deletions

View File

@ -11,6 +11,10 @@
</div>
</div>
<!-- Used for the fixed menu -->
<div class="col-md-2 col-sm-3 col-xs-3">
</div>
<div class="col-md-10 col-sm-9 col-xs-9 main-col">
<div class="header">
<my-search></my-search>
@ -19,12 +23,12 @@
<div class="main-row">
<router-outlet></router-outlet>
</div>
<footer>
PeerTube, CopyLeft 2015-2017
</footer>
</div>
</div>
<footer>
PeerTube, CopyLeft 2015-2017
</footer>
</div>
<my-confirm></my-confirm>

View File

@ -0,0 +1,39 @@
.title-menu-left {
height: calc(100vh - #{$header-height});
padding-right: 0;
.title-menu-left-block {
margin-left: -15px;
&.menu {
height: 100%;
}
}
#peertube-title {
background-color: #fff;
border-right: 1px solid $header-border-color;
font-size: 25px;
line-height: $header-height;
text-align: center;
margin-top: 0;
margin-bottom: 0;
a {
color: inherit !important;
&:hover {
color: inherit !important;
text-decoration: none !important;
}
}
}
}
footer {
border-top: 1px solid rgba(0, 0, 0, 0.2);
padding: 10px;
text-align: center;
font-size: small;
margin: 30px 10px 0 10px;
}

View File

@ -45,7 +45,7 @@
}
.video-small-blocks {
height: 150px;
height: $video-watch-info-height;
color: $video-watch-info-color;
border-color: $video-watch-border-color;
border-width: 1px 0px;

View File

@ -15,4 +15,4 @@ $video-miniature-other-infos: #686767;
$video-watch-border-color: #eceef4;
$video-watch-title-height: 90px;
$video-watch-info-color: #8e909b;
$video-watch-info-height: 150px;
$video-watch-info-height: 120px;

View File

@ -24,6 +24,11 @@ input.readonly {
.header {
height: $header-height;
my-search {
position: fixed;
z-index: 1000;
}
.search-col {
height: 100%;
margin-left: -15px;
@ -31,6 +36,10 @@ input.readonly {
}
}
.title-menu-left {
position: fixed;
}
.main-col {
padding: 0;
@ -51,38 +60,6 @@ input.readonly {
}
}
.title-menu-left {
height: calc(100vh - #{$header-height});
padding-right: 0;
.title-menu-left-block {
margin-left: -15px;
&.menu {
height: 100%;
}
}
#peertube-title {
background-color: #fff;
border-right: 1px solid $header-border-color;
font-size: 25px;
line-height: $header-height;
text-align: center;
margin-top: 0;
margin-bottom: 0;
a {
color: inherit !important;
&:hover {
color: inherit !important;
text-decoration: none !important;
}
}
}
}
/* some fixes for ng2-smart-table */
ng2-smart-table {
thead tr {
@ -103,11 +80,3 @@ ng2-smart-table {
font-family: 'Glyphicons Halflings' !important;
}
}
footer {
border-top: 1px solid rgba(0, 0, 0, 0.2);
padding-top: 10px;
text-align: center;
font-size: small;
margin-top: 30px;
}