aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/sass
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2020-03-13 20:38:50 +0100
committerRigel Kent <sendmemail@rigelk.eu>2020-03-13 20:38:50 +0100
commite61151b01c80e525db068ff12fcfe2c8ae04e1a4 (patch)
tree000244ef543eee9608afb1646561c8287bb7e9ef /client/src/sass
parentc4741804bceac6f5f3ea06f9041c5b4fde7a3d7d (diff)
downloadPeerTube-e61151b01c80e525db068ff12fcfe2c8ae04e1a4.tar.gz
PeerTube-e61151b01c80e525db068ff12fcfe2c8ae04e1a4.tar.zst
PeerTube-e61151b01c80e525db068ff12fcfe2c8ae04e1a4.zip
Replace p-progressbar and bootstrap progressbar with pure CSS alt
Diffstat (limited to 'client/src/sass')
-rw-r--r--client/src/sass/application.scss1
-rw-r--r--client/src/sass/bootstrap.scss7
-rw-r--r--client/src/sass/include/_bootstrap.scss2
-rw-r--r--client/src/sass/include/_mixins.scss29
-rw-r--r--client/src/sass/primeng-custom.scss4
5 files changed, 31 insertions, 12 deletions
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 413f8c49d..089a58009 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -181,6 +181,7 @@ label {
181 181
182.title-page-about, 182.title-page-about,
183.title-page-settings { 183.title-page-settings {
184 white-space: nowrap;
184 font-size: 115%; 185 font-size: 115%;
185 font-weight: $font-regular; 186 font-weight: $font-regular;
186 187
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index 6c42acaff..5c1ce1028 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -236,10 +236,3 @@ ngb-tooltip-window {
236 background-color: var(--secondaryColor); 236 background-color: var(--secondaryColor);
237 } 237 }
238} 238}
239
240.progress-bar {
241 background-color: var(--mainColor);
242}
243.progress-bar-secondary {
244 background-color: var(--secondaryColor);
245}
diff --git a/client/src/sass/include/_bootstrap.scss b/client/src/sass/include/_bootstrap.scss
index 61bb4739d..b1a23be6b 100644
--- a/client/src/sass/include/_bootstrap.scss
+++ b/client/src/sass/include/_bootstrap.scss
@@ -26,7 +26,7 @@
26@import '~bootstrap/scss/badge'; 26@import '~bootstrap/scss/badge';
27//@import '~bootstrap/scss/jumbotron'; 27//@import '~bootstrap/scss/jumbotron';
28@import '~bootstrap/scss/alert'; 28@import '~bootstrap/scss/alert';
29@import '~bootstrap/scss/progress'; 29//@import '~bootstrap/scss/progress';
30//@import '~bootstrap/scss/media'; 30//@import '~bootstrap/scss/media';
31//@import '~bootstrap/scss/list-group'; 31//@import '~bootstrap/scss/list-group';
32@import '~bootstrap/scss/close'; 32@import '~bootstrap/scss/close';
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 5163ea056..e8dfb79bc 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -225,6 +225,7 @@
225 overflow: hidden; 225 overflow: hidden;
226 display: inline-block; 226 display: inline-block;
227 width: $width; 227 width: $width;
228 min-height: 30px;
228 229
229 @include peertube-button; 230 @include peertube-button;
230 @include orange-button; 231 @include orange-button;
@@ -233,8 +234,8 @@
233 position: absolute; 234 position: absolute;
234 top: 0; 235 top: 0;
235 right: 0; 236 right: 0;
236 min-width: 100%; 237 width: 100%;
237 min-height: 100%; 238 height: 100%;
238 font-size: 100px; 239 font-size: 100px;
239 text-align: right; 240 text-align: right;
240 filter: alpha(opacity=0); 241 filter: alpha(opacity=0);
@@ -596,3 +597,27 @@
596 top: -2px; 597 top: -2px;
597 } 598 }
598} 599}
600
601@mixin progressbar {
602 background-color: $grey-background-color;
603 display: flex;
604 height: 1rem;
605 overflow: hidden;
606 font-size: 0.75rem;
607 border-radius: 0.25rem;
608
609 .progress-bar {
610 color: var(--mainBackgroundColor);
611 background-color: var(--mainColor);
612 display: flex;
613 flex-direction: column;
614 justify-content: center;
615 text-align: center;
616 white-space: nowrap;
617 transition: width 0.6s ease;
618
619 &.secondary {
620 background-color: var(--secondaryColor);
621 }
622 }
623}
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index fbba2ad5c..0a3634c94 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -416,9 +416,9 @@ p-toast {
416 .ui-toast-close-icon { 416 .ui-toast-close-icon {
417 font-family: "Glyphicons Halflings"; 417 font-family: "Glyphicons Halflings";
418 418
419 opacity: .5; 419 opacity: .3;
420 &:hover { 420 &:hover {
421 opacity: .8; 421 opacity: .5;
422 } 422 }
423 423
424 &:after { 424 &:after {