aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-08-09 09:22:10 +0200
committerChocobozzz <me@florianbigard.com>2018-08-09 09:22:10 +0200
commitb34a444e291c8ec90b4c2c965f7d0d6904d1faa7 (patch)
tree9880b79b12882b0cebf7b51ab6d5eb3efe62c585
parenteacb25c4366bcc8fba20f98f93f004fabc6d5578 (diff)
downloadPeerTube-b34a444e291c8ec90b4c2c965f7d0d6904d1faa7.tar.gz
PeerTube-b34a444e291c8ec90b4c2c965f7d0d6904d1faa7.tar.zst
PeerTube-b34a444e291c8ec90b4c2c965f7d0d6904d1faa7.zip
Upgrade to bootstrap 4 first step
-rw-r--r--client/package.json3
-rw-r--r--client/src/app/app.component.scss2
-rw-r--r--client/src/app/search/search.component.scss2
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.scss2
-rw-r--r--client/src/sass/application.scss5
-rw-r--r--client/src/sass/include/_bootstrap.scss85
-rw-r--r--client/yarn.lock10
7 files changed, 53 insertions, 56 deletions
diff --git a/client/package.json b/client/package.json
index fe7dd28a3..e6b6e3b05 100644
--- a/client/package.json
+++ b/client/package.json
@@ -45,6 +45,7 @@
45 "@angular/router": "~6.1.0", 45 "@angular/router": "~6.1.0",
46 "@angular/service-worker": "~6.1.0", 46 "@angular/service-worker": "~6.1.0",
47 "@angularclass/hmr": "^2.1.3", 47 "@angularclass/hmr": "^2.1.3",
48 "@neos21/bootstrap3-glyphicons": "^1.0.1",
48 "@ngx-loading-bar/core": "^2.0.0", 49 "@ngx-loading-bar/core": "^2.0.0",
49 "@ngx-loading-bar/http-client": "^2.0.0", 50 "@ngx-loading-bar/http-client": "^2.0.0",
50 "@ngx-loading-bar/router": "^2.0.0", 51 "@ngx-loading-bar/router": "^2.0.0",
@@ -62,7 +63,7 @@
62 "@types/webtorrent": "^0.98.4", 63 "@types/webtorrent": "^0.98.4",
63 "angular2-notifications": "^1.0.2", 64 "angular2-notifications": "^1.0.2",
64 "awesome-typescript-loader": "5.2.0", 65 "awesome-typescript-loader": "5.2.0",
65 "bootstrap-sass": "^3.3.7", 66 "bootstrap": "^4.1.3",
66 "buffer": "^5.1.0", 67 "buffer": "^5.1.0",
67 "cache-chunk-store": "^2.0.0", 68 "cache-chunk-store": "^2.0.0",
68 "codelyzer": "^4.0.2", 69 "codelyzer": "^4.0.2",
diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index 9eca31320..ded45b5f7 100644
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -85,10 +85,10 @@
85footer { 85footer {
86 border-top: 1px solid $footer-border-color; 86 border-top: 1px solid $footer-border-color;
87 padding: 10px 0; 87 padding: 10px 0;
88 text-align: center;
89 font-size: 11px; 88 font-size: 11px;
90 margin-top: $footer-margin; 89 margin-top: $footer-margin;
91 height: $footer-height; 90 height: $footer-height;
91 justify-content: center;
92} 92}
93 93
94simple-notifications { 94simple-notifications {
diff --git a/client/src/app/search/search.component.scss b/client/src/app/search/search.component.scss
index ef89c5666..e54a8b32a 100644
--- a/client/src/app/search/search.component.scss
+++ b/client/src/app/search/search.component.scss
@@ -11,7 +11,7 @@
11} 11}
12 12
13.search-result { 13.search-result {
14 margin: 40px; 14 padding: 40px;
15 15
16 .results-header { 16 .results-header {
17 font-size: 16px; 17 font-size: 16px;
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss
index 5127687b2..b27a70197 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -5,6 +5,7 @@
5 background-color: #000; 5 background-color: #000;
6 display: flex; 6 display: flex;
7 justify-content: center; 7 justify-content: center;
8 flex-grow: 1;
8 9
9 .remote-server-down { 10 .remote-server-down {
10 color: #fff; 11 color: #fff;
@@ -68,6 +69,7 @@
68.video-bottom { 69.video-bottom {
69 margin-top: 40px; 70 margin-top: 40px;
70 display: flex; 71 display: flex;
72 flex-grow: 1;
71 73
72 .video-info { 74 .video-info {
73 flex-grow: 1; 75 flex-grow: 1;
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 65711a225..74759348e 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -1,7 +1,7 @@
1@import '_variables'; 1@import '_variables';
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/@neos21/bootstrap3-glyphicons/assets/fonts/';
5@import '_bootstrap'; 5@import '_bootstrap';
6 6
7@import '_fonts'; 7@import '_fonts';
@@ -22,6 +22,7 @@ body {
22 font-family: $main-fonts; 22 font-family: $main-fonts;
23 font-weight: $font-regular; 23 font-weight: $font-regular;
24 color: #000; 24 color: #000;
25 font-size: 14px;
25} 26}
26 27
27#incompatible-browser { 28#incompatible-browser {
@@ -62,10 +63,12 @@ label {
62 63
63.main-col { 64.main-col {
64 margin-left: $menu-width; 65 margin-left: $menu-width;
66 width: auto;
65 67
66 .margin-content { 68 .margin-content {
67 margin-left: $not-expanded-horizontal-margins; 69 margin-left: $not-expanded-horizontal-margins;
68 margin-right: $not-expanded-horizontal-margins; 70 margin-right: $not-expanded-horizontal-margins;
71 flex-grow: 1;
69 } 72 }
70 73
71 .sub-menu { 74 .sub-menu {
diff --git a/client/src/sass/include/_bootstrap.scss b/client/src/sass/include/_bootstrap.scss
index f15b8966e..b56b71536 100644
--- a/client/src/sass/include/_bootstrap.scss
+++ b/client/src/sass/include/_bootstrap.scss
@@ -1,50 +1,37 @@
1// Core variables and mixins 1@import "~bootstrap/scss/functions";
2@import "~bootstrap-sass/assets/stylesheets/bootstrap/variables"; 2@import "~bootstrap/scss/variables";
3@import "~bootstrap-sass/assets/stylesheets/bootstrap/mixins"; 3@import "~bootstrap/scss/mixins";
4@import "~bootstrap/scss/root";
5@import "~bootstrap/scss/reboot";
6@import "~bootstrap/scss/type";
7//@import "~bootstrap/scss/images";
8//@import "~bootstrap/scss/code";
9@import "~bootstrap/scss/grid";
10//@import "~bootstrap/scss/tables";
11@import "~bootstrap/scss/forms";
12@import "~bootstrap/scss/buttons";
13//@import "~bootstrap/scss/transitions";
14@import "~bootstrap/scss/dropdown";
15//@import "~bootstrap/scss/button-group";
16@import "~bootstrap/scss/input-group";
17//@import "~bootstrap/scss/custom-forms";
18@import "~bootstrap/scss/nav";
19//@import "~bootstrap/scss/navbar";
20//@import "~bootstrap/scss/card";
21//@import "~bootstrap/scss/breadcrumb";
22//@import "~bootstrap/scss/pagination";
23//@import "~bootstrap/scss/badge";
24//@import "~bootstrap/scss/jumbotron";
25@import "~bootstrap/scss/alert";
26//@import "~bootstrap/scss/progress";
27//@import "~bootstrap/scss/media";
28//@import "~bootstrap/scss/list-group";
29@import "~bootstrap/scss/close";
30@import "~bootstrap/scss/modal";
31@import "~bootstrap/scss/tooltip";
32@import "~bootstrap/scss/popover";
33//@import "~bootstrap/scss/carousel";
34//@import "~bootstrap/scss/utilities";
35//@import "~bootstrap/scss/print";
4 36
5// Reset and dependencies 37@import "~@neos21/bootstrap3-glyphicons/assets/stylesheets/bootstrap3-glyphicons"; \ No newline at end of file
6@import "~bootstrap-sass/assets/stylesheets/bootstrap/normalize";
7@import "~bootstrap-sass/assets/stylesheets/bootstrap/print";
8@import "~bootstrap-sass/assets/stylesheets/bootstrap/glyphicons";
9
10// Core CSS
11@import "~bootstrap-sass/assets/stylesheets/bootstrap/scaffolding";
12@import "~bootstrap-sass/assets/stylesheets/bootstrap/type";
13//@import "~bootstrap-sass/assets/stylesheets/bootstrap/code";
14@import "~bootstrap-sass/assets/stylesheets/bootstrap/grid";
15//@import "~bootstrap-sass/assets/stylesheets/bootstrap/tables";
16@import "~bootstrap-sass/assets/stylesheets/bootstrap/forms";
17@import "~bootstrap-sass/assets/stylesheets/bootstrap/buttons";
18
19// Components
20@import "~bootstrap-sass/assets/stylesheets/bootstrap/component-animations";
21@import "~bootstrap-sass/assets/stylesheets/bootstrap/dropdowns";
22//@import "~bootstrap-sass/assets/stylesheets/bootstrap/button-groups";
23@import "~bootstrap-sass/assets/stylesheets/bootstrap/input-groups";
24@import "~bootstrap-sass/assets/stylesheets/bootstrap/navs";
25//@import "~bootstrap-sass/assets/stylesheets/bootstrap/navbar";
26//@import "~bootstrap-sass/assets/stylesheets/bootstrap/breadcrumbs";
27//@import "~bootstrap-sass/assets/stylesheets/bootstrap/pagination";
28//@import "~bootstrap-sass/assets/stylesheets/bootstrap/pager";
29//@import "~bootstrap-sass/assets/stylesheets/bootstrap/labels";
30//@import "~bootstrap-sass/assets/stylesheets/bootstrap/badges";
31//@import "~bootstrap-sass/assets/stylesheets/bootstrap/jumbotron";
32//@import "~bootstrap-sass/assets/stylesheets/bootstrap/thumbnails";
33@import "~bootstrap-sass/assets/stylesheets/bootstrap/alerts";
34//@import "~bootstrap-sass/assets/stylesheets/bootstrap/progress-bars";
35//@import "~bootstrap-sass/assets/stylesheets/bootstrap/media";
36//@import "~bootstrap-sass/assets/stylesheets/bootstrap/list-group";
37//@import "~bootstrap-sass/assets/stylesheets/bootstrap/panels";
38//@import "~bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed";
39//@import "~bootstrap-sass/assets/stylesheets/bootstrap/wells";
40//@import "~bootstrap-sass/assets/stylesheets/bootstrap/close";
41
42// Components w/ JavaScript
43@import "~bootstrap-sass/assets/stylesheets/bootstrap/modals";
44@import "~bootstrap-sass/assets/stylesheets/bootstrap/tooltip";
45@import "~bootstrap-sass/assets/stylesheets/bootstrap/popovers";
46//@import "~bootstrap-sass/assets/stylesheets/bootstrap/carousel";
47
48//// Utility classes
49//@import "~bootstrap-sass/assets/stylesheets/bootstrap/utilities";
50//@import "~bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";
diff --git a/client/yarn.lock b/client/yarn.lock
index f75d7787c..32c0f7ea3 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -187,6 +187,10 @@
187 version "2.1.3" 187 version "2.1.3"
188 resolved "https://registry.yarnpkg.com/@angularclass/hmr/-/hmr-2.1.3.tgz#34e658ed3da37f23b0a200e2da5a89be92bb209f" 188 resolved "https://registry.yarnpkg.com/@angularclass/hmr/-/hmr-2.1.3.tgz#34e658ed3da37f23b0a200e2da5a89be92bb209f"
189 189
190"@neos21/bootstrap3-glyphicons@^1.0.1":
191 version "1.0.1"
192 resolved "https://registry.yarnpkg.com/@neos21/bootstrap3-glyphicons/-/bootstrap3-glyphicons-1.0.1.tgz#e5eeec43e0153d4b51effd9ecb58cdf7029924d7"
193
190"@ngtools/webpack@6.1.1": 194"@ngtools/webpack@6.1.1":
191 version "6.1.1" 195 version "6.1.1"
192 resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-6.1.1.tgz#dcfea287c0c1358f3e123621c65b0e3ccaab5b70" 196 resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-6.1.1.tgz#dcfea287c0c1358f3e123621c65b0e3ccaab5b70"
@@ -1328,9 +1332,9 @@ boom@2.x.x:
1328 dependencies: 1332 dependencies:
1329 hoek "2.x.x" 1333 hoek "2.x.x"
1330 1334
1331bootstrap-sass@^3.3.7: 1335bootstrap@^4.1.3:
1332 version "3.3.7" 1336 version "4.1.3"
1333 resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz#6596c7ab40f6637393323ab0bc80d064fc630498" 1337 resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
1334 1338
1335brace-expansion@^1.1.7: 1339brace-expansion@^1.1.7:
1336 version "1.1.11" 1340 version "1.1.11"