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: fix wrong padding after stdcm simulation and convert rem to px #9742

Merged
merged 2 commits into from
Nov 18, 2024
Merged

front: fix wrong padding after stdcm simulation and convert rem to px #9742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5591617
front: fix padding after stdcm simulation
theocrsb Nov 18, 2024
1b0f132
front: convert rem to px in stdcm results file
theocrsb Nov 18, 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
1 change: 0 additions & 1 deletion front/src/styles/scss/applications/operationalStudies/_simulationresults.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.simulation-results {
position: relative;
padding-bottom: 3rem;

.osrd-simulation-sticky-bar {
// TODO: remove the `display none` when the design has been changed
Expand Down
168 changes: 84 additions & 84 deletions front/src/styles/scss/applications/stdcm/_results.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
.stdcm-results {
background-color: rgb(233, 239, 242);
padding: 1.8125rem 2rem 10rem 2rem;
padding: 29px 30px 32px 32px;
position: relative;

.simulation-navigator {
position: relative;
color: rgb(0, 0, 0);
font-weight: 600;
font-size: 1.125rem;
line-height: 1.5rem;
margin-bottom: 2.25rem;
font-size: 18px;
line-height: 24px;
margin-bottom: 36px;

&.with-error-status {
margin-top: 10rem;
margin-top: 160px;
}

.simulation-list-wrapper {
Expand All @@ -21,11 +21,11 @@

.scroll-btn {
position: absolute;
border-radius: 0.375rem;
box-shadow: 0rem 0rem 0rem 0.125rem rgba(255, 255, 255, 1) inset;
border-radius: 6px;
box-shadow: 0 0 0 2px rgba(255, 255, 255, 1) inset;
background-color: rgba(246, 248, 249, 1);
width: 3rem;
height: 3rem;
width: 48px;
height: 48px;
display: flex;
justify-content: center;
align-items: center;
Expand All @@ -36,11 +36,11 @@
}

&.left {
left: -0.75rem;
left: -12px;
}

&.right {
right: -0.75rem;
right: -12px;
}
}

Expand All @@ -51,20 +51,20 @@
overflow-x: hidden;

.simulation-item {
width: 7.813rem;
width: 125px;
display: inline-block;
margin: 0.563rem 4rem 0 0;
margin: 9px 64px 0 0;
cursor: pointer;

.creation-date {
color: rgba(182, 178, 175, 1);
font-weight: 400;
font-size: 0.875rem;
line-height: 1.25rem;
font-size: 14px;
line-height: 20px;
letter-spacing: 0;
text-align: left;
padding-top: 0.25rem;
padding-bottom: 0.688rem;
padding-top: 4px;
padding-bottom: 11px;
}

.simulation-name {
Expand All @@ -76,7 +76,7 @@

.check-circle {
color: rgb(60, 202, 128);
padding-left: 0.5rem;
padding-left: 8px;
}
}

Expand All @@ -92,7 +92,7 @@
.selected-simulation-indicator {
width: 100%;
background-color: rgba(92, 89, 85, 1);
height: 0.25rem;
height: 4px;
}
}

Expand All @@ -118,8 +118,8 @@
.separator {
width: 100%;
position: absolute;
bottom: 0.25rem;
border-bottom: 0.063rem solid rgb(182, 178, 175);
bottom: 4px;
border-bottom: 1px solid rgb(182, 178, 175);
}
}

Expand All @@ -137,10 +137,10 @@
}

.table-container {
margin-right: 2rem;
margin-right: 32px;

.table-results {
border-radius: 0.375rem;
border-radius: 6px;
background-color: rgba(0, 0, 0, 0.05);

thead {
Expand All @@ -150,13 +150,13 @@
}

th {
height: 2rem;
font-size: 0.875rem;
height: 32px;
font-size: 14px;
font-weight: 400;
text-transform: capitalize;
color: rgb(121, 118, 113);
padding-top: 0.313rem;
padding-bottom: 0.313rem;
padding-top: 5px;
padding-bottom: 5px;
vertical-align: middle;
}
th:last-child {
Expand All @@ -169,41 +169,41 @@
background-color: rgb(246, 248, 249);
}
td {
height: 2rem;
font-size: 0.875rem;
height: 32px;
font-size: 14px;
font-weight: 400;
color: rgb(49, 46, 43);
line-height: 1.25rem;
line-height: 20px;
vertical-align: middle;
}
.index {
padding-left: 2rem;
padding-left: 32px;
}
.pr {
padding-right: 12.438rem;
padding-right: 199px;
}
.ch {
padding-right: 2.25rem;
padding-right: 36px;
}
.stop {
font-size: 0.875rem;
font-size: 14px;
font-weight: 600;
color: rgb(0, 0, 0);
line-height: 1.25rem;
width: 4.688rem;
line-height: 20px;
width: 75px;
}
.stop-with-duration {
font-size: 0.875rem;
font-size: 14px;
color: rgb(255, 255, 255);
background-color: rgb(33, 100, 130);
border-radius: 0.625rem;
margin-top: 0.375rem;
margin-bottom: 0.375rem;
margin-right: 1.813rem;
border-radius: 10px;
margin-top: 6px;
margin-bottom: 6px;
margin-right: 29px;
text-align: center;
}
.weight {
padding-left: 2.063rem;
padding-left: 33px;
color: '#797671';

&.lastStep {
Expand All @@ -217,48 +217,48 @@
.results-buttons {
position: sticky;
bottom: 0;
height: 6.5rem;
height: 104px;
background-color: #dde3e6;
display: flex;
justify-content: space-between;
border-bottom-left-radius: 0.375rem;
border-bottom-right-radius: 0.375rem;
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;

&.simulation-retained {
border-radius: 0;
}
.button-display-all-PR {
padding-top: 2rem;
padding-left: 2.25rem;
padding-top: 32px;
padding-left: 36px;
}
.button-get-simulation {
padding-top: 2rem;
padding-right: 2.25rem;
padding-top: 32px;
padding-right: 36px;
}
.selected-simulation {
padding-top: 0.6rem;
padding-top: 9.6px;
}
}
}

.upgrade {
display: flex;
flex-direction: column;
margin-right: 2rem;
margin-top: 3.5rem;
border-top: 0.313rem solid rgb(211, 209, 207);
margin-right: 32px;
margin-top: 56px;
border-top: 5px solid rgb(211, 209, 207);
.text {
color: rgb(0, 0, 0);
margin-left: 0.5rem;
margin-left: 8px;
.title {
font-weight: 600;
font-size: 1.125rem;
padding-top: 1.563rem;
font-size: 18px;
padding-top: 25px;
display: flex;
flex-direction: row;
.comment-icon {
color: #b6b2af;
margin-left: 0.625rem;
margin-left: 10px;
display: flex;
}
}
Expand All @@ -268,14 +268,14 @@
flex-direction: row;
justify-content: flex-start;
flex-wrap: wrap;
margin-top: 1.375rem;
margin-top: 22px;
button {
height: 2rem;
font-size: 1rem;
padding-top: 0.313rem;
padding-bottom: 0.438rem;
margin-right: 1.438rem;
margin-bottom: 1.438rem;
height: 32px;
font-size: 16px;
padding-top: 5px;
padding-bottom: 7px;
margin-right: 23px;
margin-bottom: 23px;
}
}
}
Expand All @@ -285,24 +285,24 @@
justify-content: center;
align-items: center;
flex-direction: column;
margin: 0 2rem;
margin: 0 32px;
background-color: rgb(255, 255, 255);
border-bottom-left-radius: 0.375rem;
border-bottom-right-radius: 0.375rem;
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
.download-simulation {
margin-top: 2.813rem;
margin-bottom: 1.313rem;
margin-top: 45px;
margin-bottom: 21px;
}
.gesico-text {
font-weight: 400;
font-size: 1rem;
font-size: 16px;
color: rgb(49, 46, 43);
margin-bottom: 2.625rem;
margin-bottom: 42px;
}
}

.start-new-query {
margin-top: 4.75rem;
margin-top: 76px;
display: flex;
justify-content: center;
align-items: center;
Expand All @@ -314,40 +314,40 @@
letter-spacing: 0;
display: flex;
flex-direction: column;
min-height: 10.5rem;
min-height: 168px;
width: 70%;
color: var(--grey80);

.title {
color: rgba(33, 100, 130, 1);
font-size: 1.5rem;
font-size: 24px;
font-weight: 600;
font-style: SemiBold;
line-height: 2rem;
margin-bottom: 0.438rem;
line-height: 32px;
margin-bottom: 7px;
}

.change-criteria {
opacity: 1;
color: rgba(49, 46, 43, 1);
font-size: 1rem;
font-size: 16px;
font-weight: 400;
font-style: Regular;
line-height: 1.5rem;
line-height: 24px;
}
}

.map-results {
position: sticky;
top: 0;
width: 40%;
height: 33.75rem;
margin-right: 2rem;
border-radius: 0.5rem;
border: 0.063rem solid rgba(255, 255, 255, 1);
height: 540px;
margin-right: 32px;
border-radius: 8px;
border: 1px solid rgba(255, 255, 255, 1);
box-shadow:
0rem 0rem 0rem 0.125rem rgba(255, 255, 255, 0.75) inset,
0rem 0rem 0rem 0.063rem rgba(0, 0, 0, 0.25) inset;
0 0 0 2px rgba(255, 255, 255, 0.75) inset,
0 0 0 1px rgba(0, 0, 0, 0.25) inset;
&.no-pointer-events {
pointer-events: none;
}
Expand Down
Loading