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

New layout #100

Merged
merged 11 commits into from
Dec 1, 2020
Merged

New layout #100

merged 11 commits into from
Dec 1, 2020

Conversation

peterdesmet
Copy link
Member

Implement new layout: #97 and add description #83 (not yet footer)

BEFORE

before

AFTER

after

peterdesmet and others added 11 commits November 27, 2020 15:43
Co-Authored-By: Maarten Reyniers <24940236+mrtnrey@users.noreply.github.com>
- Make use of <b-form inline>
- Rename color scheme to colour scheme
- Label, select box and scale now all appear on on line
- Use margin left/right (x) on select field for spacing
- Add chart descriptions of @mrtnrey near charts
- Rename that section the "header"

Co-Authored-By: Maarten Reyniers <24940236+mrtnrey@users.noreply.github.com>
- Use container-fluid
- Drop "content" class (mb-3 is used)
- Make control background dark, chart background light
- Put time input fields first
- Control has 3 states:
  - lg: on the left, everything stacked except timezone/interval
  - sm/md: on top, with 1) date, timezone/interval and 2) site and share
  - xs: on top, with 1) date, 2) timezone/interval, and 3) site and share
Hi @mrtnrey, I've shortened these chart descriptions, based on input from @CeciliaNilsson709
Breaks build: Object literal may only specify known properties, and 'unit' does not exist in type 'DisplayMode'
@peterdesmet
Copy link
Member Author

@niconoe I've run npm run build and got Build complete. The docs directory is ready to be deployed.

Can I safely merge this into master?

@niconoe niconoe merged commit fd474a3 into master Dec 1, 2020
@niconoe
Copy link
Collaborator

niconoe commented Dec 1, 2020

Thanks @peterdesmet and @mrtnrey, great work. I really like the new layout, it will just need some finishing touches here and there (I'll open issues for those).

As a general rule: you can merge into master as long as 1) you're happy with the result and application behaviour 2) there's no compilation / build errors.

I'll also have a look at the split label / unit issue that you had to revert so we can restore that.

@peterdesmet peterdesmet deleted the new_layout branch March 5, 2021 10:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants