aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/sass
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-06-15 14:59:25 +0200
committerChocobozzz <me@florianbigard.com>2022-06-16 11:37:08 +0200
commit5b0ec7cddb1ae6dbd2057f067382866f846b882c (patch)
tree5751d96ec4ab0d49b793c4ff1c8edbc8daeab6ac /client/src/sass
parentb13a0a48bacb53e65e665774e621326452045294 (diff)
downloadPeerTube-5b0ec7cddb1ae6dbd2057f067382866f846b882c.tar.gz
PeerTube-5b0ec7cddb1ae6dbd2057f067382866f846b882c.tar.zst
PeerTube-5b0ec7cddb1ae6dbd2057f067382866f846b882c.zip
Increase global font size
Diffstat (limited to 'client/src/sass')
-rw-r--r--client/src/sass/application.scss12
-rw-r--r--client/src/sass/bootstrap.scss38
-rw-r--r--client/src/sass/class-helpers.scss16
-rw-r--r--client/src/sass/include/_actor.scss8
-rw-r--r--client/src/sass/include/_mixins.scss28
-rw-r--r--client/src/sass/include/_nav.scss1
-rw-r--r--client/src/sass/include/_variables.scss3
-rw-r--r--client/src/sass/ng-select.scss3
-rw-r--r--client/src/sass/player/playlist.scss2
-rw-r--r--client/src/sass/primeng-custom.scss4
10 files changed, 56 insertions, 59 deletions
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 274f7b1ca..add01fb71 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -64,7 +64,7 @@ body {
64 font-weight: $font-regular; 64 font-weight: $font-regular;
65 color: pvar(--mainForegroundColor); 65 color: pvar(--mainForegroundColor);
66 background-color: pvar(--mainBackgroundColor); 66 background-color: pvar(--mainBackgroundColor);
67 font-size: 14px; 67 font-size: 1rem;
68 // On desktop browsers, make sure vertical scroll bar is always visible 68 // On desktop browsers, make sure vertical scroll bar is always visible
69 // Allow to disable the scrollbar instead of hide it when the content fit the body 69 // Allow to disable the scrollbar instead of hide it when the content fit the body
70 // And not move the content and header horizontally sticked to right when the content is updating 70 // And not move the content and header horizontally sticked to right when the content is updating
@@ -114,7 +114,6 @@ button {
114 114
115label { 115label {
116 font-weight: $font-bold; 116 font-weight: $font-bold;
117 font-size: 15px;
118 margin-bottom: 0.5rem; 117 margin-bottom: 0.5rem;
119} 118}
120 119
@@ -200,10 +199,13 @@ table {
200} 199}
201 200
202my-global-icon[iconName=external-link] { 201my-global-icon[iconName=external-link] {
203 margin: 0 3px; 202 margin: 0 0.3em;
204 width: 13px; 203 width: 0.9em;
205 vertical-align: text-bottom; 204 height: 0.9em;
205 display: inline-block;
206 color: pvar(--inputPlaceholderColor); 206 color: pvar(--inputPlaceholderColor);
207 position: relative;
208 top: -0.1em;
207} 209}
208 210
209@media screen and (max-width: #{breakpoint(xxl)}) { 211@media screen and (max-width: #{breakpoint(xxl)}) {
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index 4d2fcf5b3..6a5d36639 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -42,7 +42,6 @@
42// --------------------------------------------------------------------------- 42// ---------------------------------------------------------------------------
43 43
44.dropdown-menu { 44.dropdown-menu {
45 font-size: 15px;
46 color: pvar(--mainForegroundColor); 45 color: pvar(--mainForegroundColor);
47 background-color: pvar(--mainBackgroundColor); 46 background-color: pvar(--mainBackgroundColor);
48 47
@@ -74,6 +73,16 @@
74} 73}
75 74
76// --------------------------------------------------------------------------- 75// ---------------------------------------------------------------------------
76// Alert
77// ---------------------------------------------------------------------------
78
79.alert {
80 p:last-child {
81 margin-bottom: 0;
82 }
83}
84
85// ---------------------------------------------------------------------------
77// Modal 86// Modal
78// --------------------------------------------------------------------------- 87// ---------------------------------------------------------------------------
79 88
@@ -115,18 +124,10 @@
115 my-global-icon { 124 my-global-icon {
116 @include icon(22px); 125 @include icon(22px);
117 126
118 position: relative;
119 top: 5px;
120 float: right;
121
122 margin: 0;
123 padding: 0;
124 opacity: 0.5; 127 opacity: 0.5;
125 128
126 &[iconName=cross] { /* stylelint-disable-line selector-max-compound-selectors */ 129 &:hover {
127 @include icon(16px); 130 opacity: 0.8;
128
129 top: -3px;
130 } 131 }
131 } 132 }
132 } 133 }
@@ -165,8 +166,6 @@
165 opacity: 0.75; 166 opacity: 0.75;
166 content: ''; 167 content: '';
167 display: block; 168 display: block;
168 position: fixed;
169 z-index: z(overlay);
170 } 169 }
171 } 170 }
172 } 171 }
@@ -254,6 +253,11 @@
254// Buttons & form controls 253// Buttons & form controls
255// --------------------------------------------------------------------------- 254// ---------------------------------------------------------------------------
256 255
256.btn:not(.btn-sm) {
257 font-size: $button-font-size;
258 line-height: 1.2;
259}
260
257.btn-outline-secondary { 261.btn-outline-secondary {
258 border-color: $input-border-color; 262 border-color: $input-border-color;
259 263
@@ -294,7 +298,6 @@
294} 298}
295 299
296.form-control { 300.form-control {
297 font-size: 15px;
298 color: pvar(--mainForegroundColor); 301 color: pvar(--mainForegroundColor);
299 background-color: pvar(--inputBackgroundColor); 302 background-color: pvar(--inputBackgroundColor);
300 outline: none; 303 outline: none;
@@ -317,7 +320,6 @@
317 } 320 }
318 321
319 > .input-group-text { 322 > .input-group-text {
320 font-size: 15px;
321 line-height: normal; 323 line-height: normal;
322 opacity: 0.9; 324 opacity: 0.9;
323 } 325 }
@@ -333,8 +335,6 @@
333} 335}
334 336
335.has-clear { 337.has-clear {
336 position: relative;
337
338 input { 338 input {
339 @include padding-right(1.5rem !important); 339 @include padding-right(1.5rem !important);
340 } 340 }
@@ -344,10 +344,10 @@
344 display: flex; 344 display: flex;
345 justify-content: center; 345 justify-content: center;
346 align-items: center; 346 align-items: center;
347 position: absolute;
348 right: .5rem;
349 height: 95%; 347 height: 95%;
350 font-size: 14px; 348 font-size: 14px;
349 position: absolute;
350 right: .5rem;
351 351
352 &:hover { 352 &:hover {
353 color: rgba(0, 0, 0, 0.7); 353 color: rgba(0, 0, 0, 0.7);
diff --git a/client/src/sass/class-helpers.scss b/client/src/sass/class-helpers.scss
index 42e41c96f..75e14ec09 100644
--- a/client/src/sass/class-helpers.scss
+++ b/client/src/sass/class-helpers.scss
@@ -6,7 +6,9 @@
6.link-orange { 6.link-orange {
7 color: pvar(--mainForegroundColor); 7 color: pvar(--mainForegroundColor);
8 font-weight: $font-bold; 8 font-weight: $font-bold;
9 border-bottom: 0.20em solid pvar(--mainColor); 9 border-bottom: 0.19em solid pvar(--mainColor);
10 display: inline-block;
11 line-height: 1.2;
10 12
11 &:hover { 13 &:hover {
12 color: pvar(--mainForegroundColor); 14 color: pvar(--mainForegroundColor);
@@ -16,7 +18,7 @@
16 18
17.underline-orange { 19.underline-orange {
18 display: inline-block; 20 display: inline-block;
19 border-bottom: 0.20em solid pvar(--mainColor); 21 border-bottom: 0.19em solid pvar(--mainColor);
20} 22}
21 23
22// --------------------------------------------------------------------------- 24// ---------------------------------------------------------------------------
@@ -84,7 +86,7 @@
84.form-group-description { 86.form-group-description {
85 @extend .muted !optional; 87 @extend .muted !optional;
86 88
87 font-size: 90%; 89 font-size: 14px;
88 margin-top: 10px; 90 margin-top: 10px;
89} 91}
90 92
@@ -102,7 +104,6 @@ label + .form-group-description {
102 104
103 opacity: 0.6; 105 opacity: 0.6;
104 color: pvar(--mainForegroundColor); 106 color: pvar(--mainForegroundColor);
105 font-size: 16px;
106 display: inline-block; 107 display: inline-block;
107 font-weight: $font-semibold; 108 font-weight: $font-semibold;
108 border-bottom: 2px solid transparent; 109 border-bottom: 2px solid transparent;
@@ -149,7 +150,7 @@ label + .form-group-description {
149.title-page-about, 150.title-page-about,
150.title-page-settings { 151.title-page-settings {
151 white-space: nowrap; 152 white-space: nowrap;
152 font-size: 115%; 153 font-size: 1rem;
153} 154}
154 155
155.admin-sub-header { 156.admin-sub-header {
@@ -172,7 +173,6 @@ label + .form-group-description {
172 flex-direction: column; 173 flex-direction: column;
173 align-items: center; 174 align-items: center;
174 justify-content: center; 175 justify-content: center;
175 font-size: 16px;
176 font-weight: $font-semibold; 176 font-weight: $font-semibold;
177} 177}
178 178
@@ -246,10 +246,6 @@ label + .form-group-description {
246// --------------------------------------------------------------------------- 246// ---------------------------------------------------------------------------
247 247
248.alert { 248.alert {
249 p:last-child {
250 margin-bottom: 0;
251 }
252
253 &.pt-alert-primary { 249 &.pt-alert-primary {
254 background-color: pvar(--mainColorVeryLight); 250 background-color: pvar(--mainColorVeryLight);
255 border: 2px solid pvar(--mainColorLightest); 251 border: 2px solid pvar(--mainColorLightest);
diff --git a/client/src/sass/include/_actor.scss b/client/src/sass/include/_actor.scss
index aa2331efe..bf73b52dc 100644
--- a/client/src/sass/include/_actor.scss
+++ b/client/src/sass/include/_actor.scss
@@ -36,18 +36,16 @@
36 .actor-owner { 36 .actor-owner {
37 @include disable-default-a-behaviour; 37 @include disable-default-a-behaviour;
38 38
39 font-size: 13px;
40 color: pvar(--mainForegroundColor); 39 color: pvar(--mainForegroundColor);
40 display: flex;
41 align-items: center;
41 42
42 span:hover { 43 span:hover {
43 opacity: 0.8; 44 opacity: 0.8;
44 } 45 }
45 46
46 my-actor-avatar { 47 my-actor-avatar {
47 @include margin-left(7px); 48 @include margin-left(5px);
48
49 display: inline-block;
50 vertical-align: top;
51 } 49 }
52 } 50 }
53 51
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 565012717..1b460b723 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -94,7 +94,8 @@
94 background-color: pvar(--inputBackgroundColor); 94 background-color: pvar(--inputBackgroundColor);
95 border: 1px solid $input-border-color; 95 border: 1px solid $input-border-color;
96 border-radius: 3px; 96 border-radius: 3px;
97 font-size: 15px; 97 font-size: $form-input-font-size;
98 line-height: $form-input-line-height;
98 99
99 &::placeholder { 100 &::placeholder {
100 color: pvar(--inputPlaceholderColor); 101 color: pvar(--inputPlaceholderColor);
@@ -116,7 +117,6 @@
116 background-color: pvar(--textareaBackgroundColor) !important; 117 background-color: pvar(--textareaBackgroundColor) !important;
117 height: $height; 118 height: $height;
118 padding: 5px 15px; 119 padding: 5px 15px;
119 font-size: 15px;
120} 120}
121 121
122@mixin orange-button { 122@mixin orange-button {
@@ -249,7 +249,6 @@
249 249
250 border: 0; 250 border: 0;
251 font-weight: $font-semibold; 251 font-weight: $font-semibold;
252 font-size: 15px;
253 height: $button-height; 252 height: $button-height;
254 line-height: $button-height; 253 line-height: $button-height;
255 254
@@ -259,6 +258,8 @@
259 text-align: center; 258 text-align: center;
260 cursor: pointer; 259 cursor: pointer;
261 260
261 font-size: $button-font-size;
262
262 my-global-icon + * { 263 my-global-icon + * {
263 @include margin-right(4px); 264 @include margin-right(4px);
264 } 265 }
@@ -292,10 +293,6 @@
292} 293}
293 294
294@mixin button-with-icon($width: 20px, $margin-right: 3px, $top: -1px) { 295@mixin button-with-icon($width: 20px, $margin-right: 3px, $top: -1px) {
295 display: inline-flex;
296 align-items: center;
297 line-height: normal !important;
298
299 my-global-icon { 296 my-global-icon {
300 @include margin-right($margin-right); 297 @include margin-right($margin-right);
301 298
@@ -361,7 +358,6 @@
361 color: pvar(--inputForegroundColor); 358 color: pvar(--inputForegroundColor);
362 background: pvar(--inputBackgroundColor); 359 background: pvar(--inputBackgroundColor);
363 position: relative; 360 position: relative;
364 font-size: 15px;
365 height: min-content; 361 height: min-content;
366 362
367 &.disabled { 363 &.disabled {
@@ -403,6 +399,8 @@
403 height: $button-height; 399 height: $button-height;
404 text-overflow: ellipsis; 400 text-overflow: ellipsis;
405 color: pvar(--mainForegroundColor); 401 color: pvar(--mainForegroundColor);
402 font-size: $form-input-font-size;
403 line-height: $form-input-line-height;
406 404
407 &:focus { 405 &:focus {
408 outline: none; 406 outline: none;
@@ -435,6 +433,10 @@
435 433
436// Thanks: https://codepen.io/manabox/pen/raQmpL 434// Thanks: https://codepen.io/manabox/pen/raQmpL
437@mixin peertube-radio-container { 435@mixin peertube-radio-container {
436 label {
437 font-size: $form-input-font-size;
438 }
439
438 [type=radio]:checked, 440 [type=radio]:checked,
439 [type=radio]:not(:checked) { 441 [type=radio]:not(:checked) {
440 position: absolute; 442 position: absolute;
@@ -448,7 +450,6 @@
448 cursor: pointer; 450 cursor: pointer;
449 line-height: 20px; 451 line-height: 20px;
450 display: inline-block; 452 display: inline-block;
451 font-size: 15px;
452 font-weight: $font-regular; 453 font-weight: $font-regular;
453 } 454 }
454 455
@@ -540,7 +541,6 @@
540 + span + span { 541 + span + span {
541 @include margin-left(5px); 542 @include margin-left(5px);
542 543
543 font-size: 15px;
544 font-weight: $font-regular; 544 font-weight: $font-regular;
545 cursor: pointer; 545 cursor: pointer;
546 display: inline; 546 display: inline;
@@ -563,7 +563,6 @@
563 563
564@mixin actor-counters ($separator-margin: 10px) { 564@mixin actor-counters ($separator-margin: 10px) {
565 color: pvar(--greyForegroundColor); 565 color: pvar(--greyForegroundColor);
566 font-size: 16px;
567 display: flex; 566 display: flex;
568 align-items: center; 567 align-items: center;
569 568
@@ -585,7 +584,7 @@
585 text-transform: uppercase; 584 text-transform: uppercase;
586 color: pvar(--mainColor); 585 color: pvar(--mainColor);
587 font-weight: $font-bold; 586 font-weight: $font-bold;
588 font-size: 110%; 587 font-size: 1rem;
589 margin-bottom: 10px; 588 margin-bottom: 10px;
590} 589}
591 590
@@ -675,11 +674,10 @@
675@mixin breadcrumb { 674@mixin breadcrumb {
676 display: flex; 675 display: flex;
677 flex-wrap: wrap; 676 flex-wrap: wrap;
678 padding: 0.75rem 1rem; 677 padding: 0;
679 margin-bottom: 1rem; 678 margin-bottom: 1rem;
680 list-style: none; 679 list-style: none;
681 background-color: pvar(--submenuBackgroundColor); 680 font-weight: $font-semibold;
682 border-radius: 0.25rem;
683 681
684 .breadcrumb-item { 682 .breadcrumb-item {
685 display: flex; 683 display: flex;
diff --git a/client/src/sass/include/_nav.scss b/client/src/sass/include/_nav.scss
index d069ac9ae..5fd32df45 100644
--- a/client/src/sass/include/_nav.scss
+++ b/client/src/sass/include/_nav.scss
@@ -20,7 +20,6 @@
20 margin-bottom: -$border-width; 20 margin-bottom: -$border-width;
21 height: $nav-link-height !important; 21 height: $nav-link-height !important;
22 padding: 0 30px !important; 22 padding: 0 30px !important;
23 font-size: 15px;
24 23
25 border: $border-width $border-type transparent; 24 border: $border-width $border-type transparent;
26 25
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index 476a4ee52..3fe1f74a2 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -39,6 +39,7 @@ $grey-actor-name: #777272;
39$expanded-horizontal-margins: 150px; 39$expanded-horizontal-margins: 150px;
40$not-expanded-horizontal-margins: 30px; 40$not-expanded-horizontal-margins: 30px;
41 41
42$button-font-size: 15px;
42$button-height: 30px; 43$button-height: 30px;
43 44
44$header-height: 50px; 45$header-height: 50px;
@@ -97,6 +98,8 @@ $sub-menu-margin-bottom-small-view: 10px;
97$activated-action-button-color: #212529; 98$activated-action-button-color: #212529;
98 99
99$focus-box-shadow-form: 0 0 0 .2rem; 100$focus-box-shadow-form: 0 0 0 .2rem;
101$form-input-font-size: 15px;
102$form-input-line-height: 1.4;
100 103
101$video-watch-player-factor: math.div(16, 9); 104$video-watch-player-factor: math.div(16, 9);
102$video-watch-info-margin-left: 44px; 105$video-watch-info-margin-left: 44px;
diff --git a/client/src/sass/ng-select.scss b/client/src/sass/ng-select.scss
index b1b82b573..78e3a6de3 100644
--- a/client/src/sass/ng-select.scss
+++ b/client/src/sass/ng-select.scss
@@ -13,12 +13,13 @@ $ng-select-box-shadow: #{$focus-box-shadow-form} pvar(--mainColorLightest);
13// $ng-select-placeholder: lighten($ng-select-primary-text, 40) !default; 13// $ng-select-placeholder: lighten($ng-select-primary-text, 40) !default;
14$ng-select-height: 30px; 14$ng-select-height: 30px;
15$ng-select-value-padding-left: 15px; 15$ng-select-value-padding-left: 15px;
16$ng-select-value-font-size: 15px; 16$ng-select-value-font-size: $form-input-font-size;
17 17
18@import '~@ng-select/ng-select/scss/default.theme'; 18@import '~@ng-select/ng-select/scss/default.theme';
19 19
20.ng-select { 20.ng-select {
21 font-size: $ng-select-value-font-size; 21 font-size: $ng-select-value-font-size;
22 line-height: $form-input-line-height;
22 23
23 &.ng-select-focused { 24 &.ng-select-focused {
24 &:not(.ng-select-opened) > .ng-select-container { 25 &:not(.ng-select-opened) > .ng-select-container {
diff --git a/client/src/sass/player/playlist.scss b/client/src/sass/player/playlist.scss
index e1999709e..4419df242 100644
--- a/client/src/sass/player/playlist.scss
+++ b/client/src/sass/player/playlist.scss
@@ -82,7 +82,7 @@ $playlist-menu-width: 350px;
82} 82}
83 83
84.vjs-playlist-button { 84.vjs-playlist-button {
85 font-size: 15px; 85 font-size: 16px;
86 position: absolute; 86 position: absolute;
87 right: 0; 87 right: 0;
88 top: 0; 88 top: 0;
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index 787fdbc88..061d626d8 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -476,7 +476,7 @@ p-table {
476 476
477 td, th { 477 td, th {
478 font-family: $main-fonts; 478 font-family: $main-fonts;
479 font-size: 15px !important; 479 font-size: 15px;
480 color: pvar(--mainForegroundColor) !important; 480 color: pvar(--mainForegroundColor) !important;
481 } 481 }
482 482
@@ -890,7 +890,7 @@ p-toast {
890 } 890 }
891 891
892 p { 892 p {
893 font-size: 15px; 893 font-size: 16px;
894 margin-bottom: 0; 894 margin-bottom: 0;
895 } 895 }
896 } 896 }