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

Update _custom.scss imports in other builds #21825

Merged
merged 1 commit into from
Jan 24, 2017
Merged

Update _custom.scss imports in other builds #21825

merged 1 commit into from
Jan 24, 2017

Conversation

mdo
Copy link
Member

@mdo mdo commented Jan 24, 2017

  • Correctly places the _custom.scss file first in the other two buids.
  • Also removes the clearfix mixin from the grid build because flexbox yo.

Fixes #21682.

@mdo
Update _custom.scss imports in other builds
f09e220 
- Correctly places the _custom.scss file first in the other two buids.
- Also removes the clearfix mixin from the grid build because flexbox yo.
@mdo mdo added this to the v4.0.0-beta milestone Jan 24, 2017
@mdo
Copy link
Member Author

mdo commented Jan 24, 2017

/cc @Quy who commented on my commit but I forgot about it until now because commit comments 😅

@mdo mdo merged commit ea6390d into v4-dev Jan 24, 2017
@mdo mdo deleted the imports-and-more branch January 24, 2017 07:59
@mdo mdo mentioned this pull request Jan 24, 2017
Closed
@Starsam80
Copy link
Contributor

I also commented here too: #21603 (comment) but it looks like it went unnoticed. I was going to do a pull request and I totally forgot about it.

pvdlg added a commit to pvdlg/bootstrap that referenced this pull request Jan 27, 2017
@pvdlg
Merge commit 'cfb25f6995160d1ba03da23c3a01446844f45fec' into current
c444c81 
* commit 'cfb25f6995160d1ba03da23c3a01446844f45fec':
  Add aria-label to docs search field
  Remove random cursor: default from pill nav (twbs#21835)
  Allow button toolbars to wrap (twbs#21826)
  fixes twbs#21567
  grunt (fixes twbs#21819)
  Add align self to navbar brand (twbs#21626)
  Rename order utilities to intended class names (twbs#21739)
  Pixel perfect navbar toggler (twbs#21821)
  Update _custom.scss imports in other builds (twbs#21825)
  Allow flex-based navs to wrap like they used to (twbs#21824)
  Remove `cursor: pointer;` (twbs#21812)
rudionrails added a commit to joblocal/bootstrap that referenced this pull request Jan 30, 2017
@rudionrails
Merge remote-tracking branch 'bootstrap/v4-dev' into joblocal-bootstrap4
cccde09 
* bootstrap/v4-dev: (979 commits)
  Add aria-label to docs search field
  Remove random cursor: default from pill nav (twbs#21835)
  Allow button toolbars to wrap (twbs#21826)
  fixes twbs#21567
  grunt (fixes twbs#21819)
  Add align self to navbar brand (twbs#21626)
  Rename order utilities to intended class names (twbs#21739)
  Pixel perfect navbar toggler (twbs#21821)
  Update _custom.scss imports in other builds (twbs#21825)
  Allow flex-based navs to wrap like they used to (twbs#21824)
  Remove `cursor: pointer;` (twbs#21812)
  Fix body padding in Dashboard and Jumbotron examples.
  Move htmllint to npm script.
  Change to markdown (twbs#21815)
  Change header to use markdown (twbs#21809)
  Update grid layout docs (twbs#21806)
  grunt
  Drop Normalize, port relevant parts to Reboot (twbs#21741)
  grunt
  Fix container within navbar on smallest breakpoint (twbs#21722)
  ...
rudionrails added a commit to joblocal/bootstrap that referenced this pull request Jan 30, 2017
@rudionrails
Merge remote-tracking branch 'bootstrap/v4-dev' into joblocal-bootstrap4
e0e6c47 
* bootstrap/v4-dev: (979 commits)
  Add aria-label to docs search field
  Remove random cursor: default from pill nav (twbs#21835)
  Allow button toolbars to wrap (twbs#21826)
  fixes twbs#21567
  grunt (fixes twbs#21819)
  Add align self to navbar brand (twbs#21626)
  Rename order utilities to intended class names (twbs#21739)
  Pixel perfect navbar toggler (twbs#21821)
  Update _custom.scss imports in other builds (twbs#21825)
  Allow flex-based navs to wrap like they used to (twbs#21824)
  Remove `cursor: pointer;` (twbs#21812)
  Fix body padding in Dashboard and Jumbotron examples.
  Move htmllint to npm script.
  Change to markdown (twbs#21815)
  Change header to use markdown (twbs#21809)
  Update grid layout docs (twbs#21806)
  grunt
  Drop Normalize, port relevant parts to Reboot (twbs#21741)
  grunt
  Fix container within navbar on smallest breakpoint (twbs#21722)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bardiharborow bardiharborow bardiharborow approved these changes

Assignees
No one assigned
Labels
css v4
Projects
None yet
Milestone
v4.0.0-beta
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mdo @Starsam80 @bardiharborow