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.

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 margin around scenario simulation results scrollbar #9869

Merged
merged 1 commit into from
Dec 17, 2024

Conversation

emersion
Copy link
Member

@emersion emersion commented Nov 26, 2024

Multiple issues here:

  • The navbar height was incorrect. EDIT: fixed separately in front: stop hardcoding navbar height in scenario #10089.
  • Two elements had the same "scenario-sidemenu" CSS class.
  • A CSS rule was overwriting Bootstrap's paddings for one column,
    but this messes up the layout because other columns weren't
    adjusted to take up more space. Use "no-gutters" instead, which
    is designed specifically for this use-case.
  • Drop the min/max widths for the train list, because this creates
    a weird blank space for some screen sizes. Leave it up to the
    parent column to pick a reasonable width.

Before:

out-old

After:

out

@emersion emersion requested a review from a team as a code owner November 26, 2024 16:14
@github-actions github-actions bot added the area:front Work on Standard OSRD Interface modules label Nov 26, 2024
@theocrsb theocrsb assigned theocrsb and unassigned theocrsb Nov 27, 2024
Copy link
Contributor

@theocrsb theocrsb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Navbar size varies according to screen size. If we choose one or the other, a scrollbar appears.
It might be better to set the navbar size to 40px (as seen with @thibautsailly).

image

@emersion emersion self-assigned this Dec 3, 2024
@emersion emersion force-pushed the emr/scenario-scroll-layout branch from ac0c046 to 1556ea9 Compare December 16, 2024 10:37
@emersion
Copy link
Member Author

I've dropped the first commit which changes the navbar size. I'll fix it separately.

@emersion emersion requested a review from theocrsb December 16, 2024 10:37
@emersion emersion changed the title front: fix margin around scenario simulation results scrollbar and conflict list front: fix margin around scenario simulation results scrollbar Dec 16, 2024
Copy link
Contributor

@theocrsb theocrsb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM and tested

Copy link
Contributor

@SharglutDev SharglutDev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm and tested

@emersion emersion force-pushed the emr/scenario-scroll-layout branch from 1556ea9 to a4bc495 Compare December 17, 2024 08:29
@emersion emersion enabled auto-merge December 17, 2024 08:29
@emersion emersion force-pushed the emr/scenario-scroll-layout branch 2 times, most recently from 11aa32b to fbcfd06 Compare December 17, 2024 11:13
@emersion emersion requested a review from a team as a code owner December 17, 2024 11:13
The scrollbar was displayed with a margin on the right.

Multiple issues here:

- Two elements had the same "scenario-sidemenu" CSS class.
- A CSS rule was overwriting Bootstrap's paddings for one column,
  but this messes up the layout because other columns weren't
  adjusted to take up more space. Use "no-gutters" instead, which
  is designed specifically for this use-case.
- Drop the min/max widths for the train list, because this creates
  a weird blank space for some screen sizes. Leave it up to the
  parent column to pick a reasonable width.

Signed-off-by: Simon Ser <[email protected]>
@emersion emersion force-pushed the emr/scenario-scroll-layout branch from fbcfd06 to e477866 Compare December 17, 2024 11:38
@emersion emersion requested a review from Maymanaf December 17, 2024 11:53
@emersion emersion added this pull request to the merge queue Dec 17, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 17, 2024
@emersion emersion added this pull request to the merge queue Dec 17, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 17, 2024
@emersion emersion added this pull request to the merge queue Dec 17, 2024
Merged via the queue into dev with commit 6d39b6b Dec 17, 2024
27 checks passed
@emersion emersion deleted the emr/scenario-scroll-layout branch December 17, 2024 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:front Work on Standard OSRD Interface modules
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants