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

Update dont' working csscomb properties #12917

Merged
merged 1 commit into from
Mar 4, 2014
Merged

Update dont' working csscomb properties #12917

merged 1 commit into from
Mar 4, 2014

Conversation

@cvrebert cvrebert added customizer and removed css labels Mar 4, 2014
@mdo mdo added this to the v3.2.0 milestone Mar 4, 2014
@mdo
Copy link
Member

mdo commented Mar 4, 2014

Looks good. In the future, be sure to include a code snippet that includes the output so we can verify what's changed.

mdo added a commit that referenced this pull request Mar 4, 2014
Update dont' working csscomb properties
@mdo mdo merged commit 88f01c4 into twbs:master Mar 4, 2014
mdo added a commit that referenced this pull request Mar 4, 2014
@5im0n
Copy link
Contributor Author

5im0n commented Mar 5, 2014

Understood, thanks for the merge ;-)

ithcy pushed a commit to stevelaz/bootstrap that referenced this pull request Mar 6, 2014
* upstream/master: (45 commits)
  fix twbs#12936
  Run `grunt update-shrinkwrap`
  grunt-contrib-jade@0.11.0
  Fixes twbs#12901: Refactors list group active state for use on non-anchors
  nav
  Fixes twbs#12848: Account for and document progress bars at 0-3%
  use full version number in deprecation note
  clarify deprecation /cc @cvrebert
  Fixes twbs#12697: Document readonly inputs
  docs for twbs#12873
  grunt after merging twbs#12917
  Grunt after merging twbs#12863
  grunt
  Fixes twbs#12868: Enables icon feedback on validation states for large/small inputs.
  Fixes twbs#12913: Remove scoped media queries from custom xs grid mixins
  Fixes twbs#12914: Darken immediate children hr elements in jumbotrons
  Fixes twbs#12916: Don't let .lead resize on viewport change
  add svg logos to brand guidelines
  Update csscomb properties. 'colon-spac'e and 'stick-brace' don't take boolean values.
  grunt
  ...

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
stempler pushed a commit to stempler/bootstrap that referenced this pull request Nov 4, 2014
Update dont' working csscomb properties
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants