Skip to content

Commit 4838034

Browse files
dynamic fontsize mixed with fiw fontsize
1 parent 60a2fb4 commit 4838034

File tree

4 files changed

+60
-42
lines changed

4 files changed

+60
-42
lines changed

shapash/webapp/assets/material-icons.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
font-family: 'Material Icons';
1111
font-weight: normal;
1212
font-style: normal;
13-
font-size: 1.2vw;
13+
font-size: calc(0.5rem + 0.85vw);
1414
line-height: 1;
1515
letter-spacing: normal;
1616
text-transform: none;

shapash/webapp/assets/style.css

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
h3 {
2-
font-size: 1.5vw !important;
2+
font-size: calc(0.6rem + 1.1vw) !important;
33
}
44

55
h4 {
6-
font-size: 1.3vw !important;
6+
font-size: calc(0.55rem + 0.95vw) !important;
77
}
88
:root {
99
--main-color: #f4c000;
1010
--bkg-color: #343736;
11-
--bs-body-font-size: 0.7vw;
11+
--bs-body-font-size: calc(0.3rem + 0.5vw);
1212
}
1313

1414
#shapash_title {
@@ -68,7 +68,7 @@ h4 {
6868
}
6969

7070
.rc-slider-mark {
71-
font-size: 0.6vw;
71+
font-size: calc(0.25rem + 0.45vw);
7272
}
7373

7474

@@ -87,6 +87,7 @@ h4 {
8787
.Select--multi .Select-value {
8888
color: var(--bkg-color) !important;
8989
background-color: var(--main-color) !important;
90+
margin-top: 1px !important;
9091
}
9192

9293
/* DATATABLE */
@@ -199,18 +200,19 @@ h4 {
199200

200201
.Select-placeholder, .Select__placeholder {
201202
line-height: 1.4vw !important;
202-
font-size: 0.7vw !important;
203+
font-size: calc(0.3rem + 0.5vw) !important;
203204
}
204205

205206
.Select-control, .Select__control {
206207
height: 1.4vw !important;
207208
line-height: 1.4vw !important;
208-
font-size: 0.7vw !important;
209+
font-size: calc(0.3rem + 0.5vw) !important;
209210
}
210211

211212
.Select-value, .Select__single-value {
212-
line-height: 1.4vw !important;
213-
font-size: 0.7vw !important;
213+
line-height: 0.9vw !important;
214+
font-size: calc(0.3rem + 0.5vw) !important;
215+
margin-top: 0.3vw !important;
214216
}
215217

216218
.Select-input{
@@ -226,7 +228,7 @@ h4 {
226228
}
227229

228230
.Select-clear {
229-
font-size: 0.9vw !important;
231+
font-size: calc(0.4rem + 0.65vw) !important;
230232
}
231233

232234
.Select-multi-value-wrapper, .Select__value-container {
@@ -243,7 +245,7 @@ input.form-control-s, input.form-control-s.form-control {
243245

244246
button#id_card, .btn-warning {
245247
height: 1.5vw !important;
246-
font-size: 0.7vw !important;
248+
font-size: calc(0.3rem + 0.5vw) !important;
247249
align-items: center;
248250
padding-top: 0.2vw !important;
249251
}

0 commit comments

Comments
 (0)