diff options
author | Chocobozzz <me@florianbigard.com> | 2018-05-15 16:23:44 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-05-16 09:42:54 +0200 |
commit | e998cf3cc757b58f06adae7a367e88b494c609d2 (patch) | |
tree | 3d930ca12a18fbf46f654a8bf1e882209cb711fd | |
parent | db400f447a9f7aae1c56fa25396e93069744483f (diff) | |
download | PeerTube-e998cf3cc757b58f06adae7a367e88b494c609d2.tar.gz PeerTube-e998cf3cc757b58f06adae7a367e88b494c609d2.tar.zst PeerTube-e998cf3cc757b58f06adae7a367e88b494c609d2.zip |
Fix some components after Angular 6 upgrade
-rw-r--r-- | client/package.json | 2 | ||||
-rw-r--r-- | client/src/app/shared/misc/help.component.scss | 1 | ||||
-rw-r--r-- | client/src/app/videos/+video-edit/shared/video-edit.component.html | 2 | ||||
-rw-r--r-- | client/src/app/videos/+video-edit/shared/video-edit.component.scss | 4 | ||||
-rw-r--r-- | client/src/app/videos/+video-edit/shared/video-edit.component.ts | 1 | ||||
-rw-r--r-- | client/src/sass/application.scss | 4 | ||||
-rw-r--r-- | client/yarn.lock | 6 |
7 files changed, 10 insertions, 10 deletions
diff --git a/client/package.json b/client/package.json index b9e2feb05..cd975dd0b 100644 --- a/client/package.json +++ b/client/package.json | |||
@@ -65,7 +65,7 @@ | |||
65 | "linkifyjs": "^2.1.5", | 65 | "linkifyjs": "^2.1.5", |
66 | "lodash-es": "^4.17.4", | 66 | "lodash-es": "^4.17.4", |
67 | "markdown-it": "^8.4.0", | 67 | "markdown-it": "^8.4.0", |
68 | "ngx-bootstrap": "2.0.3", | 68 | "ngx-bootstrap": "2.0.5", |
69 | "ngx-chips": "1.9.2", | 69 | "ngx-chips": "1.9.2", |
70 | "ngx-clipboard": "11.0.0", | 70 | "ngx-clipboard": "11.0.0", |
71 | "ngx-pipes": "^2.1.7", | 71 | "ngx-pipes": "^2.1.7", |
diff --git a/client/src/app/shared/misc/help.component.scss b/client/src/app/shared/misc/help.component.scss index 0df8b86fa..fe64a270d 100644 --- a/client/src/app/shared/misc/help.component.scss +++ b/client/src/app/shared/misc/help.component.scss | |||
@@ -9,6 +9,7 @@ | |||
9 | background-image: url('../../../assets/images/global/help.svg'); | 9 | background-image: url('../../../assets/images/global/help.svg'); |
10 | background-color: #fff; | 10 | background-color: #fff; |
11 | border: none; | 11 | border: none; |
12 | margin: 5px; | ||
12 | } | 13 | } |
13 | 14 | ||
14 | /deep/ { | 15 | /deep/ { |
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.html b/client/src/app/videos/+video-edit/shared/video-edit.component.html index 77b554ad5..7e1be4467 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.html +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.html | |||
@@ -14,7 +14,7 @@ | |||
14 | <div class="form-group"> | 14 | <div class="form-group"> |
15 | <label class="label-tags">Tags</label> <span>(press Enter to add)</span> | 15 | <label class="label-tags">Tags</label> <span>(press Enter to add)</span> |
16 | <tag-input | 16 | <tag-input |
17 | [ngModel]="tags" [validators]="tagValidators" [errorMessages]="tagValidatorsMessages" | 17 | [validators]="tagValidators" [errorMessages]="tagValidatorsMessages" |
18 | formControlName="tags" maxItems="5" modelAsStrings="true" | 18 | formControlName="tags" maxItems="5" modelAsStrings="true" |
19 | ></tag-input> | 19 | ></tag-input> |
20 | </div> | 20 | </div> |
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss index 58ed5ab98..1295cf098 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss | |||
@@ -5,10 +5,6 @@ | |||
5 | @include peertube-select-container(auto); | 5 | @include peertube-select-container(auto); |
6 | } | 6 | } |
7 | 7 | ||
8 | .form-group-checkbox { | ||
9 | my-help { margin-left: 5px } | ||
10 | } | ||
11 | |||
12 | .video-edit { | 8 | .video-edit { |
13 | height: 100%; | 9 | height: 100%; |
14 | 10 | ||
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.ts b/client/src/app/videos/+video-edit/shared/video-edit.component.ts index eab0a898e..af4438bd2 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.ts +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.ts | |||
@@ -30,7 +30,6 @@ export class VideoEditComponent implements OnInit { | |||
30 | @Input() videoPrivacies = [] | 30 | @Input() videoPrivacies = [] |
31 | @Input() userVideoChannels = [] | 31 | @Input() userVideoChannels = [] |
32 | 32 | ||
33 | tags: string[] = [] | ||
34 | videoCategories = [] | 33 | videoCategories = [] |
35 | videoLicences = [] | 34 | videoLicences = [] |
36 | videoLanguages = [] | 35 | videoLanguages = [] |
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 2e1e5bf65..8331c9fa3 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -227,6 +227,10 @@ p-table { | |||
227 | width: 250px !important; | 227 | width: 250px !important; |
228 | padding: 0 !important; | 228 | padding: 0 !important; |
229 | text-align: center; | 229 | text-align: center; |
230 | |||
231 | my-edit-button + my-delete-button { | ||
232 | margin-left: 5px; | ||
233 | } | ||
230 | } | 234 | } |
231 | 235 | ||
232 | p-paginator { | 236 | p-paginator { |
diff --git a/client/yarn.lock b/client/yarn.lock index 0c08fc354..ee4af2e51 100644 --- a/client/yarn.lock +++ b/client/yarn.lock | |||
@@ -5464,9 +5464,9 @@ ng2-material-dropdown@0.10.0: | |||
5464 | dependencies: | 5464 | dependencies: |
5465 | tslib "^1.9.0" | 5465 | tslib "^1.9.0" |
5466 | 5466 | ||
5467 | ngx-bootstrap@2.0.3: | 5467 | ngx-bootstrap@2.0.5: |
5468 | version "2.0.3" | 5468 | version "2.0.5" |
5469 | resolved "https://registry.yarnpkg.com/ngx-bootstrap/-/ngx-bootstrap-2.0.3.tgz#b8ca4be305be4e2e99f60d941cc8a3e906f198d7" | 5469 | resolved "https://registry.yarnpkg.com/ngx-bootstrap/-/ngx-bootstrap-2.0.5.tgz#83aab39d1e4fe811fad2b34f7927f9ce19d68daa" |
5470 | 5470 | ||
5471 | ngx-chips@1.9.2: | 5471 | ngx-chips@1.9.2: |
5472 | version "1.9.2" | 5472 | version "1.9.2" |