aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2017-12-20 09:26:50 +0100
committerChocobozzz <me@florianbigard.com>2017-12-20 09:26:50 +0100
commite203f2e0e1ba778201191dfaf83bc90341616610 (patch)
tree0115fa08560588882949cad47a0572fcaf33d774
parent24a8e782d8b2adb208d9cfb8659450395e2e2a77 (diff)
downloadPeerTube-e203f2e0e1ba778201191dfaf83bc90341616610.tar.gz
PeerTube-e203f2e0e1ba778201191dfaf83bc90341616610.tar.zst
PeerTube-e203f2e0e1ba778201191dfaf83bc90341616610.zip
Only import bootstrap component that we need
-rw-r--r--client/src/sass/application.scss2
-rw-r--r--client/src/sass/include/_bootstrap.scss86
-rw-r--r--server/lib/activitypub/process/process-announce.ts4
3 files changed, 43 insertions, 49 deletions
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 968dc5f58..a1c222c31 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -2,7 +2,7 @@
2@import '_mixins'; 2@import '_mixins';
3 3
4$icon-font-path: '../../node_modules/bootstrap-sass/assets/fonts/bootstrap/'; 4$icon-font-path: '../../node_modules/bootstrap-sass/assets/fonts/bootstrap/';
5@import '~bootstrap-sass/assets/stylesheets/_bootstrap'; 5@import '_bootstrap';
6 6
7$FontPathSourceSansPro: '../../node_modules/npm-font-source-sans-pro/fonts'; 7$FontPathSourceSansPro: '../../node_modules/npm-font-source-sans-pro/fonts';
8@import '~npm-font-source-sans-pro/source-sans-pro'; 8@import '~npm-font-source-sans-pro/source-sans-pro';
diff --git a/client/src/sass/include/_bootstrap.scss b/client/src/sass/include/_bootstrap.scss
index e72d1def2..3857bb521 100644
--- a/client/src/sass/include/_bootstrap.scss
+++ b/client/src/sass/include/_bootstrap.scss
@@ -1,56 +1,50 @@
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 1// Core variables and mixins
8@import "bootstrap/variables"; 2@import "~bootstrap-sass/assets/stylesheets/bootstrap/variables";
9@import "bootstrap/mixins"; 3@import "~bootstrap-sass/assets/stylesheets/bootstrap/mixins";
10 4
11// Reset and dependencies 5// Reset and dependencies
12@import "bootstrap/normalize"; 6@import "~bootstrap-sass/assets/stylesheets/bootstrap/normalize";
13@import "bootstrap/print"; 7@import "~bootstrap-sass/assets/stylesheets/bootstrap/print";
14@import "bootstrap/glyphicons"; 8@import "~bootstrap-sass/assets/stylesheets/bootstrap/glyphicons";
15 9
16// Core CSS 10// Core CSS
17@import "bootstrap/scaffolding"; 11@import "~bootstrap-sass/assets/stylesheets/bootstrap/scaffolding";
18@import "bootstrap/type"; 12@import "~bootstrap-sass/assets/stylesheets/bootstrap/type";
19@import "bootstrap/code"; 13//@import "~bootstrap-sass/assets/stylesheets/bootstrap/code";
20@import "bootstrap/grid"; 14@import "~bootstrap-sass/assets/stylesheets/bootstrap/grid";
21@import "bootstrap/tables"; 15//@import "~bootstrap-sass/assets/stylesheets/bootstrap/tables";
22@import "bootstrap/forms"; 16@import "~bootstrap-sass/assets/stylesheets/bootstrap/forms";
23@import "bootstrap/buttons"; 17@import "~bootstrap-sass/assets/stylesheets/bootstrap/buttons";
24 18
25// Components 19// Components
26@import "bootstrap/component-animations"; 20@import "~bootstrap-sass/assets/stylesheets/bootstrap/component-animations";
27@import "bootstrap/dropdowns"; 21@import "~bootstrap-sass/assets/stylesheets/bootstrap/dropdowns";
28@import "bootstrap/button-groups"; 22//@import "~bootstrap-sass/assets/stylesheets/bootstrap/button-groups";
29@import "bootstrap/input-groups"; 23@import "~bootstrap-sass/assets/stylesheets/bootstrap/input-groups";
30@import "bootstrap/navs"; 24@import "~bootstrap-sass/assets/stylesheets/bootstrap/navs";
31@import "bootstrap/navbar"; 25//@import "~bootstrap-sass/assets/stylesheets/bootstrap/navbar";
32@import "bootstrap/breadcrumbs"; 26//@import "~bootstrap-sass/assets/stylesheets/bootstrap/breadcrumbs";
33@import "bootstrap/pagination"; 27//@import "~bootstrap-sass/assets/stylesheets/bootstrap/pagination";
34@import "bootstrap/pager"; 28//@import "~bootstrap-sass/assets/stylesheets/bootstrap/pager";
35@import "bootstrap/labels"; 29//@import "~bootstrap-sass/assets/stylesheets/bootstrap/labels";
36@import "bootstrap/badges"; 30//@import "~bootstrap-sass/assets/stylesheets/bootstrap/badges";
37@import "bootstrap/jumbotron"; 31//@import "~bootstrap-sass/assets/stylesheets/bootstrap/jumbotron";
38@import "bootstrap/thumbnails"; 32//@import "~bootstrap-sass/assets/stylesheets/bootstrap/thumbnails";
39@import "bootstrap/alerts"; 33@import "~bootstrap-sass/assets/stylesheets/bootstrap/alerts";
40@import "bootstrap/progress-bars"; 34//@import "~bootstrap-sass/assets/stylesheets/bootstrap/progress-bars";
41@import "bootstrap/media"; 35//@import "~bootstrap-sass/assets/stylesheets/bootstrap/media";
42@import "bootstrap/list-group"; 36//@import "~bootstrap-sass/assets/stylesheets/bootstrap/list-group";
43@import "bootstrap/panels"; 37//@import "~bootstrap-sass/assets/stylesheets/bootstrap/panels";
44@import "bootstrap/responsive-embed"; 38//@import "~bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed";
45@import "bootstrap/wells"; 39//@import "~bootstrap-sass/assets/stylesheets/bootstrap/wells";
46@import "bootstrap/close"; 40@import "~bootstrap-sass/assets/stylesheets/bootstrap/close";
47 41
48// Components w/ JavaScript 42// Components w/ JavaScript
49@import "bootstrap/modals"; 43@import "~bootstrap-sass/assets/stylesheets/bootstrap/modals";
50@import "bootstrap/tooltip"; 44//@import "~bootstrap-sass/assets/stylesheets/bootstrap/tooltip";
51@import "bootstrap/popovers"; 45//@import "~bootstrap-sass/assets/stylesheets/bootstrap/popovers";
52@import "bootstrap/carousel"; 46//@import "~bootstrap-sass/assets/stylesheets/bootstrap/carousel";
53 47
54// Utility classes 48//// Utility classes
55@import "bootstrap/utilities"; 49//@import "~bootstrap-sass/assets/stylesheets/bootstrap/utilities";
56@import "bootstrap/responsive-utilities"; 50//@import "~bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";
diff --git a/server/lib/activitypub/process/process-announce.ts b/server/lib/activitypub/process/process-announce.ts
index 5568ff538..c9738f926 100644
--- a/server/lib/activitypub/process/process-announce.ts
+++ b/server/lib/activitypub/process/process-announce.ts
@@ -51,10 +51,10 @@ function shareVideo (actorAnnouncer: ActorModel, activity: ActivityAnnounce) {
51 let video: VideoModel 51 let video: VideoModel
52 52
53 if (typeof announced === 'string') { 53 if (typeof announced === 'string') {
54 video = await VideoModel.loadByUrlAndPopulateAccount(announced as string) 54 video = await VideoModel.loadByUrlAndPopulateAccount(announced)
55 if (!video) throw new Error('Unknown video to share ' + announced) 55 if (!video) throw new Error('Unknown video to share ' + announced)
56 } else { 56 } else {
57 video = await processCreateActivity(announced as ActivityCreate) 57 video = await processCreateActivity(announced)
58 } 58 }
59 59
60 const share = { 60 const share = {