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

Add bootstrap v4.0.0-alpha.2 into the admin #955

Merged
merged 20 commits into from
Mar 8, 2016
Merged
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -48,6 +48,14 @@

More information is available in the [VersionCake README](https://github.com/bwillis/versioncake)

* Bootstrap 4.0.0-alpha.2 is included into the admin.

* Pagination now uses an admin-specific kaminari theme, which uses the
bootstrap4 styles. If you have a custom admin page with pagination you can
use this style with the following.

<%= paginate @collection, theme: "solidus_admin" %>

## Solidus 1.2.0 (2016-01-26)

* Admin menu has been moved from top of the page to the left side.
2 changes: 2 additions & 0 deletions backend/app/assets/javascripts/spree/backend.js
Original file line number Diff line number Diff line change
@@ -9,6 +9,8 @@
//= require jquery.sticky-kit.min
//= require underscore-min
//= require backbone
//= require solidus_admin/tether
//= require solidus_admin/bootstrap
//= require prism
//= require spree
//= require ./backend/backbone-overrides
Loading