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

Convert grid classes in backend admin from skeleton to bootstrap #1484

Merged
merged 38 commits into from
Oct 12, 2016

Conversation

harmonymjb
Copy link
Contributor

This PR contains commits for all views within backend/app/views/spree that rely on skeleton grid classes.

This continues work on the Solidus admin roadmap #655 #1153 and allows the possibility of implementing the content-layout system introduced in #1114 by @graygilmore across any admin view without other modifications.

Each of these views have been updated using bootstrap grid classes and all skeleton classes have been removed. Layouts have not been significantly altered and no functionality has been added or removed.

Skeleton has been left enabled in order to maintain support for extensions that rely on it.
Because both skeleton and bootstrap implement a row class, bootstrap inherits skeleton's additional vertical spacing on row. This only affects bootstrap visually and rows work as intended if bootstrap classes are used.

Here is an example of an updated view, first with skeleton classes:
skeleton

And with bootstrap classes:
bootstrap

@jhawthorn jhawthorn added the changelog:solidus_backend Changes to the solidus_backend gem label Sep 29, 2016
@jrochkind
Copy link
Contributor

Nice!

How about making the skeleton CSS optional -- perhaps an app has to add a require line to their application.css manifest to get it. It would be nice if those who don't have customizations needing it could dispense with it altogether -- mainly to keep it from interfering with any other styles (like bootstrap row).

@@ -1,6 +1,5 @@
<div data-hook="admin_adjustment_reason_form_fields" class="row">
<div class="row">
<div class="alpha four columns">
<div class="col-xs-3">
Copy link
Member

Choose a reason for hiding this comment

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

I think you also want to correct the indenting here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, rebased this commit: b1bb56fe6a42f28c95f731a591cf670659bde336

@mtomov
Copy link
Contributor

mtomov commented Oct 7, 2016

Amazing effort and excellent commit names & all! Thanks a lot!

Copy link
Member

@tvdeyen tvdeyen left a comment

Choose a reason for hiding this comment

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

👍 we still need a final rebase, then this is good to be merged. Great work! Thanks

Graham Bouvier added 21 commits October 12, 2016 10:04
@jhawthorn
Copy link
Contributor

Thank you @omnistegan

@jhawthorn jhawthorn merged commit 9fe36e0 into solidusio:master Oct 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog:solidus_backend Changes to the solidus_backend gem
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants