Added Bootstrap Alpha.2 #5046
Merged
Added Bootstrap Alpha.2 #5046
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
scott1702
force-pushed
the
integrate-bootstrap
branch
from
6b1774c
to
0a84d16
Compare
|
This has been updated now that #5034 has been merged. |
| @@ -277,7 +277,6 @@ | |||
| @extend .icon-sprites-64x64; | |||
| @include sprite($sprites-64x64-preview); | |||
|
|
|||
| display: block; | |||
There was a problem hiding this comment.
The second param of the sprite mixin is the display value, if one is not given then it defaults to display: block making that line redundant (see https://github.com/silverstripe/silverstripe-framework/blob/master/admin/scss/_spritey.scss#L184).
- Managed by npm - Created an `npm run css` task to compile - Updated shrinkwrap - Updated changelog
We've had some issues with different dependencies causing different results based on the environment, which in turn causes unnecessary diffs - making our work harder to review. Comments can be read through the ES6 source files, and through source maps when generated through `npm run build --development`
chillu
force-pushed
the
integrate-bootstrap
branch
from
0a84d16
to
9079c11
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
npm run csstask to compileThe other half of #5034 which was split from #5027
Based on which gets merged first (#5034 or this), the unmerged PR will need some changing. ie both of those PRs have their own
npm run csstask which compiles different things@dhensby @jonom @ianherbert