Client: try to make it work with Android Firefox

pull/10/head
Chocobozzz 2016-07-19 16:45:07 +02:00
parent f9f5478ca0
commit a64668c024
12 changed files with 54 additions and 31 deletions

View File

@ -39,6 +39,8 @@
"es6-shim": "^0.35.0",
"file-loader": "^0.8.5",
"html-webpack-plugin": "^2.19.0",
"ie-shim": "^0.1.0",
"intl": "^1.2.4",
"json-loader": "^0.5.4",
"ng2-bootstrap": "1.0.16",
"ng2-file-upload": "^1.0.3",
@ -66,11 +68,5 @@
"devDependencies": {
"codelyzer": "0.0.19",
"standard": "^7.0.1"
},
"standard": {
"ignore": [
"angular/",
"bundles/"
]
}
}

View File

@ -13,10 +13,10 @@
<div class="row">
<menu class="col-md-2 col-xs-3">
<menu class="col-md-2 col-sm-3 col-xs-3">
<div class="panel-block">
<div id="panel-user-login" class="panel-button">
<span class="glyphicon glyphicon-user"></span>
<span class="hidden-xs glyphicon glyphicon-user"></span>
<a *ngIf="!isLoggedIn" [routerLink]="['/login']">Login</a>
<a *ngIf="isLoggedIn" (click)="logout()">Logout</a>
</div>
@ -24,30 +24,30 @@
<div class="panel-block">
<div id="panel-get-videos" class="panel-button">
<span class="glyphicon glyphicon-list"></span>
<span class="hidden-xs glyphicon glyphicon-list"></span>
<a [routerLink]="['/videos/list']">Get videos</a>
</div>
<div id="panel-upload-video" class="panel-button" *ngIf="isLoggedIn">
<span class="glyphicon glyphicon-cloud-upload"></span>
<span class="hidden-xs glyphicon glyphicon-cloud-upload"></span>
<a [routerLink]="['/videos/add']">Upload a video</a>
</div>
</div>
<div class="panel-block" *ngIf="isLoggedIn">
<div id="panel-make-friends" class="panel-button">
<span class="glyphicon glyphicon-cloud"></span>
<span class="hidden-xs glyphicon glyphicon-cloud"></span>
<a (click)='makeFriends()'>Make friends</a>
</div>
<div id="panel-quit-friends" class="panel-button">
<span class="glyphicon glyphicon-plane"></span>
<span class="hidden-xs glyphicon glyphicon-plane"></span>
<a (click)='quitFriends()'>Quit friends</a>
</div>
</div>
</menu>
<div class="col-md-9 col-xs-8 router-outler-container">
<div class="col-md-9 col-sm-8 col-xs-8 router-outlet-container">
<router-outlet></router-outlet>
</div>

View File

@ -4,6 +4,12 @@ header div {
}
menu {
@media screen and (max-width: 600px) {
margin-right: 3px !important;
padding: 3px !important;
min-height: 400px !important;
}
min-height: 600px;
margin-right: 20px;
border-right: 1px solid rgba(0, 0, 0, 0.2);
@ -30,3 +36,9 @@ menu {
.panel-block:not(:last-child) {
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
}
.router-outlet-container {
@media screen and (max-width: 400px) {
padding: 0 3px 0 3px;
}
}

View File

@ -1,10 +1,12 @@
<div class="row videos-info">
<div class="col-md-9 videos-total-results">
<div class="row col-md-12 videos-info">
<div class="col-md-9 col-xs-5 videos-total-results">
<span *ngIf="pagination.totalItems !== null">{{ pagination.totalItems }} videos</span>
<my-loader [loading]="loading | async"></my-loader>
</div>
<my-video-sort class="col-md-3" [currentSort]="sort" (sort)="onSort($event)"></my-video-sort>
<my-video-sort class="col-md-3 col-xs-7" [currentSort]="sort" (sort)="onSort($event)"></my-video-sort>
</div>
<div class="videos-miniatures">

View File

@ -1,12 +1,12 @@
.videos-info {
@media screen and (max-width: 400px) {
margin-left: 0;
}
padding-bottom: 20px;
margin-bottom: 20px;
border-bottom: 1px solid #f1f1f1;
height: 40px;
line-height: 40px;
width: 765px;
margin-left: 15px;
my-video-sort {
padding-right: 0;

View File

@ -1,4 +1,4 @@
<div class="video-miniature col-md-4" (mouseenter)="onHover()" (mouseleave)="onBlur()">
<div class="video-miniature col-md-4 col-sm-6 col-xs-6" (mouseenter)="onHover()" (mouseleave)="onBlur()">
<a
[routerLink]="['/videos/watch', video.id]" [attr.title]="video.description"
class="video-miniature-thumbnail"

View File

@ -1,9 +1,14 @@
@import "../../../sass/pre-customizations.scss";
.video-miniature {
@media screen and (max-width: 400px) {
padding: 0;
}
margin-top: 30px;
display: inline-block;
position: relative;
min-width: 220px;
.video-miniature-thumbnail {
display: inline-block;

View File

@ -17,7 +17,7 @@
</div>
<div id="torrent-info">
<div id="torrent-info-download">Download: {{ downloadSpeed | bytes }}/s</div>
<div id="torrent-info-upload">Upload: {{ uploadSpeed | bytes }}/s</div>
<div id="torrent-info-peers">Number of peers: {{ numPeers }}</div>
<div id="torrent-info-download" class="col-md-4 col-sm-4 col-xs-4">Download: {{ downloadSpeed | bytes }}/s</div>
<div id="torrent-info-upload" class="col-md-4 col-sm-4 col-xs-4">Upload: {{ uploadSpeed | bytes }}/s</div>
<div id="torrent-info-peers" class="col-md-4 col-sm-4 col-xs-4">Number of peers: {{ numPeers }}</div>
<div>

View File

@ -11,10 +11,16 @@ my-loader {
#torrent-info {
font-size: 10px;
margin-top: 10px;
text-align: center;
div {
display: inline-block;
width: 33%;
text-align: center;
min-width: 60px;
}
}
.embed-responsive {
@media screen and (max-width: 600px) {
height: 300px;
}
}

View File

@ -1,10 +1,9 @@
// Polyfills
// (these modules are what are in 'angular2/bundles/angular2-polyfills' so don't use that here)
// import 'ie-shim'; // Internet Explorer
// import 'es6-shim';
// import 'es6-promise';
// import 'es7-reflect-metadata';
require('intl');
require('intl/locale-data/jsonp/en.js');
import 'ie-shim'; // Internet Explorer
// Prefer CoreJS over the polyfills above
import 'core-js/es6';

View File

@ -1,5 +1,9 @@
body {
padding: 20px;
@media screen and (max-width: 400px) {
padding: 3px;
}
}
footer {

View File

@ -45,7 +45,6 @@
"src/app/shared/users/index.ts",
"src/app/shared/users/token.model.ts",
"src/app/shared/users/user.model.ts",
"src/app/shared/videos-params.ts",
"src/app/videos/index.ts",
"src/app/videos/shared/index.ts",
"src/app/videos/shared/loader/index.ts",