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

Jump to bottom

Cleanup custom CSS #2508

Merged
merged 5 commits into from Jan 15, 2020
Merged

Cleanup custom CSS #2508

merged 5 commits into from Jan 15, 2020

Conversation

gravitystorm
Copy link
Collaborator

This PR contains some changes that clean up our custom CSS rules.

  • Rename form-row to standard-form-row, since form-row clashes with a class in the bootstrap forms component (and so things go badly awry when enabling the forms component).
  • Rework lists to assume that they have margin+discs by default. It's easier to override them in the few cases that we don't want that to happen (e.g. forms, nav links) and the number of overrides is likely to decrease anyway as we use more bootstrap components
  • Remove the custom reset code. Bootstrap contains its own reset, so there's nothing to be gained by resetting things again.

@gravitystorm
Rename form-row to standard-form-row to avoid clashing with a bootstr…
f885cfe 
…ap class
@gravitystorm
Remove list style reset, and add overrides where necessary
65c3c2a 
This allows the bootstrap list typography to work without being overridden. It also means
that lists look like normal lists by default, instead of needing to be recreated from
scratch each time. Only the cases where padding and discs are unwanted need to have
custom CSS.
@gravitystorm
Remove some reset styles and clearfix
ce3b92c 
These are included in bootstrap
@gravitystorm
Remove more reset styles that are handled by bootstrap
ecf8590
@gravitystorm
Remove last custom reset styles
5c93386
@tomhughes tomhughes merged commit 5c93386 into openstreetmap:master Jan 15, 2020
@gravitystorm gravitystorm deleted the bootstrap_cleanup branch January 16, 2020 10:17
This was referenced Jan 16, 2020
Merged
Closed
@gravitystorm gravitystorm mentioned this pull request Jan 30, 2020
Merged
@gravitystorm gravitystorm mentioned this pull request Jul 4, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@gravitystorm @tomhughes