diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-12-11 11:06:32 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-12-11 11:06:32 +0100 |
commit | fada8d75550dc7365f7e18ee1569b9406251d660 (patch) | |
tree | db9dc01c18693824f83fce5020f4c1f3ae7c0865 /client/src/app/app.component.ts | |
parent | 492fd28167f770d79a430fc57451b5a9e075d8e7 (diff) | |
parent | c2830fa8f84f61462098bf36add824f89436dfa9 (diff) | |
download | PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.gz PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.zst PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.zip |
Merge branch 'feature/design' into develop
Diffstat (limited to 'client/src/app/app.component.ts')
-rw-r--r-- | client/src/app/app.component.ts | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts index 9b699fafd..b1818c298 100644 --- a/client/src/app/app.component.ts +++ b/client/src/app/app.component.ts | |||
@@ -1,8 +1,6 @@ | |||
1 | import { Component, OnInit } from '@angular/core' | 1 | import { Component, OnInit } from '@angular/core' |
2 | import { Router } from '@angular/router' | 2 | import { Router } from '@angular/router' |
3 | |||
4 | import { AuthService, ServerService } from './core' | 3 | import { AuthService, ServerService } from './core' |
5 | import { UserService } from './shared' | ||
6 | 4 | ||
7 | @Component({ | 5 | @Component({ |
8 | selector: 'my-app', | 6 | selector: 'my-app', |
@@ -62,20 +60,9 @@ export class AppComponent implements OnInit { | |||
62 | } | 60 | } |
63 | 61 | ||
64 | getMainColClasses () { | 62 | getMainColClasses () { |
65 | const colSizes = { | ||
66 | md: 10, | ||
67 | sm: 9, | ||
68 | xs: 9 | ||
69 | } | ||
70 | |||
71 | // Take all width is the menu is not displayed | 63 | // Take all width is the menu is not displayed |
72 | if (this.isMenuDisplayed === false) { | 64 | if (this.isMenuDisplayed === false) return [ 'expanded' ] |
73 | Object.keys(colSizes).forEach(col => colSizes[col] = 12) | ||
74 | } | ||
75 | |||
76 | const classes = [] | ||
77 | Object.keys(colSizes).forEach(col => classes.push(`col-${col}-${colSizes[col]}`)) | ||
78 | 65 | ||
79 | return classes | 66 | return [] |
80 | } | 67 | } |
81 | } | 68 | } |