Skip to content

Commit 50d5d17

Browse files
claraniclarani
committed
front: rem to px in /styles
Signed-off-by: Clara Ni <[email protected]>
1 parent 0c393c7 commit 50d5d17

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed

‎front/src/styles/scss/_body.scss

+21-21
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ body {
3636
}
3737

3838
.login-form .logo {
39-
max-height: 18rem;
39+
max-height: 288px;
4040
}
4141

4242
.version {
@@ -56,16 +56,16 @@ body {
5656
}
5757

5858
.mastnav.fullscreen {
59-
left: -7rem !important;
59+
left: -112px !important;
6060
}
6161

6262
.mastheader.fullscreen {
63-
top: -5rem !important;
63+
top: -80px !important;
6464
}
6565

6666
.mastheader-logo {
6767
img {
68-
height: 1.5rem !important;
68+
height: 24px !important;
6969
}
7070
}
7171

@@ -75,24 +75,24 @@ body {
7575
}
7676

7777
.mastcontainer.fullscreen {
78-
padding-top: 4.5rem;
78+
padding-top: 72px;
7979
padding-left: 0 !important;
8080
}
8181

8282
.table-filters.fullscreen {
83-
top: 5rem !important;
83+
top: 80px !important;
8484
}
8585

8686
.sideBar-container.fullscreen {
87-
left: -6.5rem !important;
88-
top: -3.7rem !important;
87+
left: -104px !important;
88+
top: -59.2px !important;
8989
height: 109vh !important;
9090
}
9191

9292
.navbar-breadcrumbs {
9393
display: flex;
9494
align-items: center;
95-
gap: 0.5rem;
95+
gap: 8px;
9696
font-size: 1.25rem;
9797
max-width: 84vw;
9898
a {
@@ -111,10 +111,10 @@ body {
111111
/* lg breakpoint 1024 px */
112112
@media screen and (max-width: 1023px) {
113113
.btn-fullscreen {
114-
bottom: 6rem;
114+
bottom: 96px;
115115
}
116116
.btn-resetviewport {
117-
bottom: 9rem;
117+
bottom: 144px;
118118
}
119119
}
120120

@@ -137,38 +137,38 @@ body {
137137

138138
@media screen and (min-width: 1280px) {
139139
.sideBar-container {
140-
margin-top: 9rem;
140+
margin-top: 144px;
141141
}
142142
.sideBar-container.fullscreen {
143-
top: -4.15rem;
143+
top: -66.4px;
144144
}
145145
}
146146

147147
.creation-sidebar.fullscreen {
148-
left: -6.25rem !important;
149-
top: -4.5rem !important;
148+
left: -100px !important;
149+
top: -72px !important;
150150
transition-delay: 0.2s;
151151
}
152152

153153
@media screen and (max-width: 1023.98px) {
154154
.creation-sidebar {
155-
padding-left: 0.5rem !important;
156-
padding-top: 17.8rem !important;
155+
padding-left: 8px !important;
156+
padding-top: 284.8px !important;
157157
transition-delay: 0.11s;
158158
}
159159
.creation-sidebar.fullscreen {
160160
transition-delay: 0.25s;
161-
top: -4.25rem !important;
161+
top: -68px !important;
162162
left: 0 !important;
163163
}
164164
}
165165

166166
.custom-control {
167-
padding-left: 1.625rem !important;
167+
padding-left: 26px !important;
168168
.custom-control-label {
169169
&::before,
170170
&::after {
171-
left: -1.625rem;
171+
left: -26px;
172172
}
173173
}
174174
}
@@ -181,7 +181,7 @@ body {
181181
@media (min-width: 576px) {
182182
.modal-dialog.modal-lg,
183183
.modal-dialog.modal-xl {
184-
max-width: calc(100vw - 3rem) !important;
184+
max-width: calc(100vw - 48px) !important;
185185
}
186186
}
187187
@media (min-width: 1024px) {

‎front/src/styles/scss/_home.scss

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
padding-bottom: 0 !important;
44
}
55
.cardscontainer {
6-
margin: 2rem;
6+
margin: 32px;
77
.card {
88
display: flex;
99
align-items: center;
1010
cursor: pointer;
1111
transition: 0.2s ease-in-out;
1212
img {
13-
padding: 1rem;
13+
padding: 16px;
1414
width: 50%;
1515
}
1616

@@ -33,33 +33,33 @@
3333
display: flex;
3434
align-items: center;
3535
justify-content: center;
36-
padding: 1rem 0 0;
36+
padding: 16px 0 0;
3737
h1 {
38-
padding-top: 2rem;
38+
padding-top: 32px;
3939
font-size: 3rem;
4040
color: var(--coolgray9);
4141
}
4242
img {
43-
width: 8rem;
43+
width: 128px;
4444
}
4545
@media screen and (max-width: 1024px) {
4646
h1 {
4747
font-size: 1.5rem;
4848
}
4949
img {
50-
width: 4rem;
50+
width: 64px;
5151
}
5252
}
5353
}
5454

5555
.modal-header .close {
56-
padding-top: 1.8rem !important;
56+
padding-top: 28.8px !important;
5757
}
5858

5959
.language-choice-btn {
6060
display: flex !important;
61-
padding: 0.5rem 1rem !important;
62-
gap: 1rem;
61+
padding: 8px 16px !important;
62+
gap: 16px;
6363
svg {
6464
height: 24px;
6565
}

‎front/src/styles/scss/_uiCoreIntegration.scss

+6-6
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ img {
3838
// __________________ Time Picker __________________
3939
.time-picker {
4040
.modal-content {
41-
left: -12.4rem !important;
41+
left: -198.4px !important;
4242
.time-picker-container {
43-
max-width: 20.2rem;
43+
max-width: 323.2px;
4444
}
4545
}
4646
}
@@ -62,9 +62,9 @@ img {
6262
// __________________ Tolerance Picker __________________
6363
.tolerance-picker {
6464
.modal-content {
65-
left: -23.5rem !important;
65+
left: -376px !important;
6666
.tolerance-grid {
67-
grid-auto-rows: 2rem !important;
67+
grid-auto-rows: 32px !important;
6868
}
6969
}
7070
}
@@ -74,9 +74,9 @@ img {
7474
.osrd-ui-custom-select {
7575
min-height: auto;
7676
padding: 0;
77-
margin-top: 0.188rem;
77+
margin-top: 3px;
7878
&:focus {
7979
background: url('data:image/svg+xml;charset=utf-8,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%3F%3E%0A%3Csvg%20width%3D%2216px%22%20height%3D%2216px%22%20viewBox%3D%220%200%2016%2016%22%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%3E%0A%20%20%20%20%3Ctitle%3Eicon%2F16%2Ftriangle-up-down-16%3C%2Ftitle%3E%0A%20%20%20%20%3Cg%20id%3D%22icon%2F16%2Ftriangle-up-down-16%22%20stroke%3D%22none%22%20stroke-width%3D%221%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%20%20%20%20%3Cpath%20d%3D%22M4.42845467%2C5.56944689%20L7.82445467%2C2.17344689%20C7.8713568%2C2.12642604%207.93504104%2C2.1%208.00145467%2C2.1%20C8.0678683%2C2.1%208.13155254%2C2.12642604%208.17845467%2C2.17344689%20L11.5744547%2C5.56944689%20C11.6461431%2C5.64095399%2011.6676197%2C5.74864161%2011.6288468%2C5.84217853%20C11.5900739%2C5.93571546%2011.4987091%2C5.99662805%2011.3974547%2C5.99644729%20L4.60545467%2C5.99644729%20C4.50420023%2C5.99662805%204.41283543%2C5.93571546%204.37406252%2C5.84217853%20C4.3352896%2C5.74864161%204.35676625%2C5.64095399%204.42845467%2C5.56944689%20Z%20M4.43345467%2C10.4270004%20L7.82945467%2C13.8230004%20C7.8763568%2C13.8700213%207.94004104%2C13.8964473%208.00645467%2C13.8964473%20C8.0728683%2C13.8964473%208.13655254%2C13.8700213%208.18345467%2C13.8230004%20L11.5794547%2C10.4270004%20C11.6511431%2C10.3554933%2011.6726197%2C10.2478057%2011.6338468%2C10.1542688%20C11.5950739%2C10.0607318%2011.5037091%2C9.99981924%2011.4024547%2C10%20L4.61045467%2C10%20C4.50920023%2C9.99981924%204.41783543%2C10.0607318%204.37906252%2C10.1542688%20C4.3402896%2C10.2478057%204.36176625%2C10.3554933%204.43345467%2C10.4270004%20L4.43345467%2C10.4270004%20Z%22%20id%3D%22Path%22%20fill%3D%22%23000000%22%20fill-rule%3D%22nonzero%22%3E%3C%2Fpath%3E%0A%20%20%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E')
80-
no-repeat right 0.75rem center;
80+
no-repeat right 12px center;
8181
}
8282
}

0 commit comments

Comments
 (0)