aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2017-12-20 09:04:52 +0100
committerChocobozzz <me@florianbigard.com>2017-12-20 09:05:16 +0100
commit24a8e782d8b2adb208d9cfb8659450395e2e2a77 (patch)
tree2f8aaebb8ec06c1c9b82728a9f46efd59163767f /client/src
parent1c6c7699f54e516839058529f11fb2e3d49c4ec0 (diff)
downloadPeerTube-24a8e782d8b2adb208d9cfb8659450395e2e2a77.tar.gz
PeerTube-24a8e782d8b2adb208d9cfb8659450395e2e2a77.tar.zst
PeerTube-24a8e782d8b2adb208d9cfb8659450395e2e2a77.zip
Add bootstrap analyzer and optimize build
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/+admin/admin.module.ts2
-rw-r--r--client/src/app/shared/shared.module.ts3
-rw-r--r--client/src/app/videos/+video-edit/shared/video-description.component.ts2
-rw-r--r--client/src/sass/include/_bootstrap.scss56
4 files changed, 59 insertions, 4 deletions
diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts
index c0b006e73..74ceb25ef 100644
--- a/client/src/app/+admin/admin.module.ts
+++ b/client/src/app/+admin/admin.module.ts
@@ -1,5 +1,6 @@
1import { NgModule } from '@angular/core' 1import { NgModule } from '@angular/core'
2import { TabsModule } from 'ngx-bootstrap/tabs' 2import { TabsModule } from 'ngx-bootstrap/tabs'
3import { DataTableModule } from 'primeng/components/datatable/datatable'
3import { SharedModule } from '../shared' 4import { SharedModule } from '../shared'
4import { AdminRoutingModule } from './admin-routing.module' 5import { AdminRoutingModule } from './admin-routing.module'
5import { AdminComponent } from './admin.component' 6import { AdminComponent } from './admin.component'
@@ -16,6 +17,7 @@ import { VideoBlacklistComponent, VideoBlacklistListComponent } from './video-bl
16 imports: [ 17 imports: [
17 AdminRoutingModule, 18 AdminRoutingModule,
18 TabsModule.forRoot(), 19 TabsModule.forRoot(),
20 DataTableModule,
19 SharedModule 21 SharedModule
20 ], 22 ],
21 23
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts
index 5af118c98..a5c56cb46 100644
--- a/client/src/app/shared/shared.module.ts
+++ b/client/src/app/shared/shared.module.ts
@@ -10,7 +10,6 @@ import { ModalModule } from 'ngx-bootstrap/modal'
10import { InfiniteScrollModule } from 'ngx-infinite-scroll' 10import { InfiniteScrollModule } from 'ngx-infinite-scroll'
11import { BytesPipe, KeysPipe, NgPipesModule } from 'ngx-pipes' 11import { BytesPipe, KeysPipe, NgPipesModule } from 'ngx-pipes'
12import { SharedModule as PrimeSharedModule } from 'primeng/components/common/shared' 12import { SharedModule as PrimeSharedModule } from 'primeng/components/common/shared'
13import { DataTableModule } from 'primeng/components/datatable/datatable'
14 13
15import { AUTH_INTERCEPTOR_PROVIDER } from './auth' 14import { AUTH_INTERCEPTOR_PROVIDER } from './auth'
16import { DeleteButtonComponent } from './misc/delete-button.component' 15import { DeleteButtonComponent } from './misc/delete-button.component'
@@ -39,7 +38,6 @@ import { VideoService } from './video/video.service'
39 BsDropdownModule.forRoot(), 38 BsDropdownModule.forRoot(),
40 ModalModule.forRoot(), 39 ModalModule.forRoot(),
41 40
42 DataTableModule,
43 PrimeSharedModule, 41 PrimeSharedModule,
44 InfiniteScrollModule, 42 InfiniteScrollModule,
45 NgPipesModule 43 NgPipesModule
@@ -66,7 +64,6 @@ import { VideoService } from './video/video.service'
66 64
67 BsDropdownModule, 65 BsDropdownModule,
68 ModalModule, 66 ModalModule,
69 DataTableModule,
70 PrimeSharedModule, 67 PrimeSharedModule,
71 InfiniteScrollModule, 68 InfiniteScrollModule,
72 BytesPipe, 69 BytesPipe,
diff --git a/client/src/app/videos/+video-edit/shared/video-description.component.ts b/client/src/app/videos/+video-edit/shared/video-description.component.ts
index 9b77a27e6..34dbc21a6 100644
--- a/client/src/app/videos/+video-edit/shared/video-description.component.ts
+++ b/client/src/app/videos/+video-edit/shared/video-description.component.ts
@@ -1,10 +1,10 @@
1import { Component, forwardRef, Input, OnInit } from '@angular/core' 1import { Component, forwardRef, Input, OnInit } from '@angular/core'
2import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms' 2import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
3import { truncate } from 'lodash'
4import 'rxjs/add/operator/debounceTime' 3import 'rxjs/add/operator/debounceTime'
5import 'rxjs/add/operator/distinctUntilChanged' 4import 'rxjs/add/operator/distinctUntilChanged'
6import { Subject } from 'rxjs/Subject' 5import { Subject } from 'rxjs/Subject'
7import { MarkdownService } from '../../shared' 6import { MarkdownService } from '../../shared'
7import truncate from 'lodash-es/truncate'
8 8
9@Component({ 9@Component({
10 selector: 'my-video-description', 10 selector: 'my-video-description',
diff --git a/client/src/sass/include/_bootstrap.scss b/client/src/sass/include/_bootstrap.scss
new file mode 100644
index 000000000..e72d1def2
--- /dev/null
+++ b/client/src/sass/include/_bootstrap.scss
@@ -0,0 +1,56 @@
1/*!
2 * Bootstrap v3.3.7 (http://getbootstrap.com)
3 * Copyright 2011-2016 Twitter, Inc.
4 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
5 */
6
7// Core variables and mixins
8@import "bootstrap/variables";
9@import "bootstrap/mixins";
10
11// Reset and dependencies
12@import "bootstrap/normalize";
13@import "bootstrap/print";
14@import "bootstrap/glyphicons";
15
16// Core CSS
17@import "bootstrap/scaffolding";
18@import "bootstrap/type";
19@import "bootstrap/code";
20@import "bootstrap/grid";
21@import "bootstrap/tables";
22@import "bootstrap/forms";
23@import "bootstrap/buttons";
24
25// Components
26@import "bootstrap/component-animations";
27@import "bootstrap/dropdowns";
28@import "bootstrap/button-groups";
29@import "bootstrap/input-groups";
30@import "bootstrap/navs";
31@import "bootstrap/navbar";
32@import "bootstrap/breadcrumbs";
33@import "bootstrap/pagination";
34@import "bootstrap/pager";
35@import "bootstrap/labels";
36@import "bootstrap/badges";
37@import "bootstrap/jumbotron";
38@import "bootstrap/thumbnails";
39@import "bootstrap/alerts";
40@import "bootstrap/progress-bars";
41@import "bootstrap/media";
42@import "bootstrap/list-group";
43@import "bootstrap/panels";
44@import "bootstrap/responsive-embed";
45@import "bootstrap/wells";
46@import "bootstrap/close";
47
48// Components w/ JavaScript
49@import "bootstrap/modals";
50@import "bootstrap/tooltip";
51@import "bootstrap/popovers";
52@import "bootstrap/carousel";
53
54// Utility classes
55@import "bootstrap/utilities";
56@import "bootstrap/responsive-utilities";