Skip to content

Commit

Permalink
front: rem to px in /common
Browse files Browse the repository at this point in the history
Signed-off-by: Clara Ni <[email protected]>
  • Loading branch information
clarani committed Nov 25, 2024
1 parent 46aa74f commit 6301840
Show file tree
Hide file tree
Showing 23 changed files with 199 additions and 199 deletions.
6 changes: 3 additions & 3 deletions front/src/common/BootstrapSNCF/CardSNCF/CardSNCF.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.card-img-top {
padding: 2rem;
padding: 32px;
}
.card-body {
display: flex;
align-items: center;
justify-content: center;
padding: 0.5rem;
height: 4rem;
padding: 8px;
height: 64px;
}
10 changes: 5 additions & 5 deletions front/src/common/BootstrapSNCF/InputGroupSNCF.scss
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
.input-group {
button {
height: 1.875rem;
height: 30px;
font-size: 0.875rem;
padding: 0.125rem 1.5rem;
padding: 2px 24px;
}
.form-control-container {
height: 1.875rem;
height: 30px;
input.form-control {
min-height: auto;
font-size: 0.875rem;
font-size: 14px;
}
}
z-index: auto !important;

.dropdown .dropdown-menu[x-placement='bottom-end'] {
top: 2.3rem !important;
top: 36.8px !important;
}
.osrd-dropdown-sncf {
right: 0 !important;
Expand Down
2 changes: 1 addition & 1 deletion front/src/common/BootstrapSNCF/ModalSNCF/ModalStyle.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
max-height: 90vh;
}
.modal-footer {
padding-top: 0.5rem;
padding-top: 8px;
}
}
}
14 changes: 7 additions & 7 deletions front/src/common/BootstrapSNCF/OptionsSNCF.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
.options-control {
border-radius: 0.4375rem !important;
border-radius: 7px !important;
.options-item {
border-radius: 0.4375rem;
border-radius: 7px;
.options-btn {
border-radius: 0.4375rem;
border-radius: 7px;
}
}
&.sm {
padding: 0.2rem;
padding: 3.2px;
.options-btn {
border-radius: 0.4375rem;
padding: 0.3rem 0.5rem 0.2rem;
border-radius: 7px;
padding: 4.8px 8px 3.2px;
font-size: 0.8rem;
height: 1.625rem;
height: 26px;
}
}
}
4 changes: 2 additions & 2 deletions front/src/common/BootstrapSNCF/SelectImprovedSNCF.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

.add-border-top {
border-top: var(--coolgray3) solid 1px;
border-top-right-radius: 0.4375rem;
border-top-left-radius: 0.4375rem;
border-top-right-radius: 7px;
border-top-left-radius: 7px;
}
14 changes: 7 additions & 7 deletions front/src/common/Map/MapKey.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
.mapkey {
display: block;
font-size: 0.9rem;
margin: 1rem 1rem 0;
margin: 16px 16px 0;
font-weight: lighter;
.mapkey-title {
border-bottom: 1px solid #555;
padding-bottom: 0.25rem;
margin-bottom: 0.5rem;
padding-bottom: 4px;
margin-bottom: 8px;
}
.mapkey-item {
display: flex;
Expand All @@ -26,13 +26,13 @@
text-align: center;
&.mapkey-icon-deparr {
position: relative;
width: 1rem;
height: 1rem;
border-radius: 1rem;
width: 16px;
height: 16px;
border-radius: 16px;
background: linear-gradient(0deg, #24842b 50%, #0d5f13 50%);
background-size: auto;
background-size: 1px 10px;
margin: 0 0.5rem 0 0;
margin: 0 8px 0 0;
}
}
.mapkey-icon img {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.gap-10 {
gap: 0.5rem;
gap: 8px;
}
22 changes: 11 additions & 11 deletions front/src/styles/scss/_overrideBootstrapSNCF.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
*
*/
.modal-header.modal-header-border-bottom {
padding-top: 0.5rem;
padding-bottom: 0.5rem;
padding-top: 8px;
padding-bottom: 8px;

div {
width: 100%;
Expand All @@ -70,26 +70,26 @@
*/
.chips-container {
.form-chips-container {
min-height: 3rem;
min-height: 48px;
}

input {
width: auto !important;
flex-grow: 1;
line-height: 1;
height: 2.2rem;
height: 35.2px;
}

.chips {
border: none !important;
&.chips-label {
font-size: 0.9rem;
line-height: 1.5;
height: 2.2rem;
height: 35.2px;
}

&.chips-btn {
min-height: 2rem;
min-height: 32px;

&:hover {
background-color: var(--secondary);
Expand All @@ -108,8 +108,8 @@ label,
.labels {
display: flex !important;
align-items: center !important;
height: 1.4rem;
gap: 0.5rem;
height: 22.4px;
gap: 8px;
}

/*
Expand All @@ -121,7 +121,7 @@ blockquote {
font-size: 0.9rem;
border-left: 3px solid var(--secondary);
background-color: var(--coolgray1);
padding-left: 0.5rem;
padding-left: 8px;
}

/*
Expand All @@ -139,12 +139,12 @@ blockquote {

input {
&.form-control {
padding-bottom: 0.45rem;
padding-bottom: 7.2px;
}
&.form-control-sm {
padding-bottom: 0;
}
}
.input-group-sm input {
padding-bottom: 0.45rem;
padding-bottom: 7.2px;
}
2 changes: 1 addition & 1 deletion front/src/styles/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ $colors: (
);

:root {
--border-radius: 4px; // 0.4375rem;
--border-radius: 4px;
--breakpoint-lg: 1024px;
@each $color, $value in $colors {
--#{$color}: #{$value};
Expand Down
Loading

0 comments on commit 6301840

Please sign in to comment.