Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

front: rem to px in /common #9842

Merged
merged 8 commits into from
Nov 26, 2024
Merged

front: rem to px in /common #9842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a442c9b
front: rem to px in /common
clarani Nov 25, 2024
c8c8153
front: rem to px in /stdcm
clarani Nov 25, 2024
ee53f86
front: rem to px ./operationalStudies
clarani Nov 25, 2024
fcb3ec0
front: rem to px in /editor
clarani Nov 25, 2024
1107f16
front: rem to px in /rollingStockEditor
clarani Nov 25, 2024
eeaecab
front: rem to px in /modules
clarani Nov 25, 2024
0e8d520
front: rem to px in /styles
clarani Nov 25, 2024
fbdca28
front: clean some css
clarani Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions front/src/common/BootstrapSNCF/CardSNCF/CardSNCF.scss
View file
Open in desktop
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;
}
8 changes: 4 additions & 4 deletions front/src/common/BootstrapSNCF/InputGroupSNCF.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
.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;
Expand All @@ -14,7 +14,7 @@
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion front/src/common/SpeedLimitByTagSelector/SpeedLimitByTagSelector.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.gap-10 {
gap: 0.5rem;
gap: 8px;
}
66 changes: 33 additions & 33 deletions front/src/modules/conflict/styles/_conflictList.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
.conflicts-list {
margin-top: auto;
margin-inline: -1.5rem;
margin-inline: -24px;
&.expanded {
margin-inline: -1.5rem;
margin-inline: -24px;
position: absolute;
bottom: 0;
z-index: 2;
width: 100%;
}
.conflicts-list-header {
border-bottom: 0.0625rem solid var(--error80);
border-bottom: 1px solid var(--error80);
background-color: var(--error60);
color: var(--white100);
height: 2.9375rem;
height: 47px;
display: flex;
justify-content: space-between;
padding: 0.6875rem 1rem 0.75rem 1rem;
padding: 11px 16px 12px 16px;
h2 {
color: var(--white100);
font-size: 1.125rem;
line-height: 1.5rem;
line-height: 24px;
font-weight: 600;
}
}
Expand All @@ -28,86 +28,86 @@
display: none;
color: var(--black100);
background-color: var(--error60);
box-shadow: inset 0 0.0625rem var(--error30);
box-shadow: inset 0 1px var(--error30);

&.expanded {
display: block;
overflow: auto;
max-height: calc(50vh - 4.0625rem);
max-height: calc(50vh - 65px);
}

.conflict-card {
background-color: var(--white100);
margin: 0.25rem 0.5rem;
border-radius: 0.25rem;
margin: 4px 8px;
border-radius: 4px;
display: flex;
min-height: 5.5rem;
min-height: 88px;

.trains-info {
font-family: 'IBM Plex Mono', monospace;
flex-basis: calc(43.3% - 0.0313rem);
border-right: 0.0313rem solid var(--grey20);
flex-basis: calc(43.3% - 0.5px);
border-right: 0.5px solid var(--grey20);

.conflict-type {
font-family: 'IBM Plex Sans';
height: 2.3125rem;
height: 37px;
color: var(--black100);
font-size: 1.125rem;
line-height: 1.5rem;
line-height: 24px;
font-weight: 600;
padding: 0.5625rem 0 0.25rem 0.75rem;
padding: 9px 0 4px 12px;
margin: 0;
}

.start-and-end-time {
display: flex;
gap: 1rem;
gap: 16px;
.start-time {
padding-left: 0.75rem;
padding-left: 12px;
color: var(--black100);
font-size: 0.875rem;
font-weight: 600;
line-height: 1.25rem;
line-height: 20px;
}
.end-time {
color: var(--black100);
font-size: 0.875rem;
line-height: 1.25rem;
line-height: 20px;
}
}

.departure-date {
padding-left: 0.75rem;
padding-left: 12px;
color: var(--grey50);
font-size: 0.75rem;
line-height: 1.25rem;
margin-bottom: 0.9375rem;
line-height: 20px;
margin-bottom: 15px;
}
}

.trains-name {
flex-basis: calc(56.7% - 0.0313rem);
border-left: 0.0313rem solid var(--grey20);
flex-basis: calc(56.7% - 0.5px);
border-left: 0.5px solid var(--grey20);
display: flex;
flex-wrap: wrap;
padding: 1rem 0 1rem 1rem;
gap: 0.5rem;
padding: 16px 0 16px 16px;
gap: 8px;

.train-name-card {
font-family: 'IBM Plex Mono', monospace;
height: 1.5rem;
max-width: 13.0437rem;
height: 24px;
max-width: 208.6992px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
background-color: var(--error5);
color: var(--error80);
border: 0.0625rem solid var(--error30);
border-radius: 0.25rem;
padding: 0.125rem 0.5rem;
border: 1px solid var(--error30);
border-radius: 4px;
padding: 2px 8px;
font-size: 0.875rem;
font-weight: 600;
line-height: 1.25rem;
line-height: 20px;
}
}
}
Expand Down
Loading
Loading