aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorWicklow <wicklow@framasoft.org>2023-02-17 10:40:37 +0100
committerChocobozzz <chocobozzz@cpy.re>2023-02-20 13:52:22 +0100
commit178af31cb8624567a26a1ca06cba9f3a475be330 (patch)
treeb06d68f83dbf8c8d60911629be940772224f8143
parent422a11e2a4e52ec8a052a9646e1677cf284931a2 (diff)
downloadPeerTube-178af31cb8624567a26a1ca06cba9f3a475be330.tar.gz
PeerTube-178af31cb8624567a26a1ca06cba9f3a475be330.tar.zst
PeerTube-178af31cb8624567a26a1ca06cba9f3a475be330.zip
Change bootstrap helpers and variables
-rw-r--r--client/src/app/+about/about-instance/about-instance.component.html2
-rw-r--r--client/src/app/+about/about-peertube/about-peertube.component.html6
-rw-r--r--client/src/sass/class-helpers/_common.scss4
-rw-r--r--client/src/sass/class-helpers/_custom-bootstrap-helpers.scss30
-rw-r--r--client/src/sass/class-helpers/index.scss11
-rw-r--r--client/src/sass/include/_bootstrap-variables.scss4
-rw-r--r--client/src/sass/include/_variables.scss3
7 files changed, 15 insertions, 45 deletions
diff --git a/client/src/app/+about/about-instance/about-instance.component.html b/client/src/app/+about/about-instance/about-instance.component.html
index 5230b5c4e..4c7504628 100644
--- a/client/src/app/+about/about-instance/about-instance.component.html
+++ b/client/src/app/+about/about-instance/about-instance.component.html
@@ -2,7 +2,7 @@
2 <div class="col-md-12 col-xl-6"> 2 <div class="col-md-12 col-xl-6">
3 3
4 <div class="d-flex justify-content-between"> 4 <div class="d-flex justify-content-between">
5 <h1 i18n class="fw-semibold pt-fs-5">About {{ instanceName }}</h1> 5 <h1 i18n class="fw-semibold fs-5">About {{ instanceName }}</h1>
6 6
7 <a routerLink="/about/contact" i18n *ngIf="isContactFormEnabled" class="peertube-button-link orange-button h-100 d-flex align-items-center">Contact us</a> 7 <a routerLink="/about/contact" i18n *ngIf="isContactFormEnabled" class="peertube-button-link orange-button h-100 d-flex align-items-center">Contact us</a>
8 </div> 8 </div>
diff --git a/client/src/app/+about/about-peertube/about-peertube.component.html b/client/src/app/+about/about-peertube/about-peertube.component.html
index c748154e9..c0177fe6c 100644
--- a/client/src/app/+about/about-peertube/about-peertube.component.html
+++ b/client/src/app/+about/about-peertube/about-peertube.component.html
@@ -1,5 +1,5 @@
1<div class="root"> 1<div class="root">
2 <h1 i18n class="pt-fs-3 text-center fw-semibold mb-3"> 2 <h1 i18n class="fs-3 text-center fw-semibold mb-3">
3 This website is powered by PeerTube 3 This website is powered by PeerTube
4 </h1> 4 </h1>
5 5
@@ -60,7 +60,7 @@
60 </div> 60 </div>
61 61
62 <div class="d-flex flex-column"> 62 <div class="d-flex flex-column">
63 <h2 class="mb-4 mt-5 text-center pt-fs-5 fw-semibold"> 63 <h2 class="mb-4 mt-5 text-center fs-5 fw-semibold">
64 <div class="anchor" id="privacy"></div> <!-- privacy anchor --> 64 <div class="anchor" id="privacy"></div> <!-- privacy anchor -->
65 <ng-container i18n>P2P & Privacy</ng-container> 65 <ng-container i18n>P2P & Privacy</ng-container>
66 </h2> 66 </h2>
@@ -76,7 +76,7 @@
76 tracker as long as you download or watch the video. 76 tracker as long as you download or watch the video.
77 </p> 77 </p>
78 78
79 <h3 i18n class="pt-fs-5">What are the consequences?</h3> 79 <h3 i18n class="fs-5">What are the consequences?</h3>
80 80
81 <p i18n> 81 <p i18n>
82 In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video. 82 In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video.
diff --git a/client/src/sass/class-helpers/_common.scss b/client/src/sass/class-helpers/_common.scss
index 182c51c8f..d342c2ceb 100644
--- a/client/src/sass/class-helpers/_common.scss
+++ b/client/src/sass/class-helpers/_common.scss
@@ -1,7 +1,7 @@
1@use '_variables' as *;
2@use '_mixins' as *;
3@use '_badges' as *; 1@use '_badges' as *;
4@use '_icons' as *; 2@use '_icons' as *;
3@use '_mixins' as *;
4@use '_variables' as *;
5 5
6.link-orange { 6.link-orange {
7 color: pvar(--mainForegroundColor); 7 color: pvar(--mainForegroundColor);
diff --git a/client/src/sass/class-helpers/_custom-bootstrap-helpers.scss b/client/src/sass/class-helpers/_custom-bootstrap-helpers.scss
index 78c4d30df..d5606181d 100644
--- a/client/src/sass/class-helpers/_custom-bootstrap-helpers.scss
+++ b/client/src/sass/class-helpers/_custom-bootstrap-helpers.scss
@@ -3,34 +3,6 @@
3 3
4// Font sizes 4// Font sizes
5 5
6.pt-fs-1 { 6.fs-5-5 {
7 @include font-size(2.5rem);
8}
9
10.pt-fs-2 {
11 @include font-size(2rem);
12}
13
14.pt-fs-3 {
15 @include font-size(1.75rem);
16}
17
18.pt-fs-4 {
19 @include font-size(1.5rem);
20}
21
22.pt-fs-5 {
23 @include font-size(1.25rem);
24}
25
26.pt-fs-5-5 {
27 @include font-size(1.125rem); 7 @include font-size(1.125rem);
28}
29
30.pt-fs-6 {
31 @include font-size(1rem);
32}
33
34.pt-fs-7 {
35 @include font-size(0.875rem);
36} \ No newline at end of file 8} \ No newline at end of file
diff --git a/client/src/sass/class-helpers/index.scss b/client/src/sass/class-helpers/index.scss
index ad5fd7838..ec0aea52e 100644
--- a/client/src/sass/class-helpers/index.scss
+++ b/client/src/sass/class-helpers/index.scss
@@ -1,10 +1,5 @@
1@use '_variables' as *;
2@use '_mixins' as *;
3@use '_badges' as *;
4@use '_icons' as *;
5@use '_fonts' as *;
6@use '_menu' as *;
7@use '_buttons' as *; 1@use '_buttons' as *;
8@use '_forms' as *;
9@use '_common' as *; 2@use '_common' as *;
10@use '_custom-bootstrap-helpers' as *; \ No newline at end of file 3@use '_custom-bootstrap-helpers' as *;
4@use '_forms' as *;
5@use '_menu' as *; \ No newline at end of file
diff --git a/client/src/sass/include/_bootstrap-variables.scss b/client/src/sass/include/_bootstrap-variables.scss
index 1c05f467a..558610893 100644
--- a/client/src/sass/include/_bootstrap-variables.scss
+++ b/client/src/sass/include/_bootstrap-variables.scss
@@ -8,9 +8,9 @@ $grid-breakpoints: (
8 // Extra small screen / phone 8 // Extra small screen / phone
9 xs: 0, 9 xs: 0,
10 // Small screen / phone 10 // Small screen / phone
11 sm: 576px, 11 sm: $mobile-view,
12 // Medium screen / tablet 12 // Medium screen / tablet
13 md: 768px, 13 md: $small-view,
14 // Large screen / desktop 14 // Large screen / desktop
15 lg: 900px, 15 lg: 900px,
16 // Extra large screens / wide desktops 16 // Extra large screens / wide desktops
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index 8358270da..1243854ec 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -10,6 +10,9 @@ $font-semibold: 600;
10$font-bold: 700; 10$font-bold: 700;
11$line-height-normal: 1.2; 11$line-height-normal: 1.2;
12 12
13$font-size-rem-13px: 0.8125rem;
14$font-size-rem-14px: 0.875rem;
15
13$grey-background-color: #E5E5E5; 16$grey-background-color: #E5E5E5;
14$grey-background-hover-color: #EFEFEF; 17$grey-background-hover-color: #EFEFEF;
15$grey-foreground-color: #585858; 18$grey-foreground-color: #585858;