]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoUpdare grunt-jekyll dependency 10996/head
Zlatan Vasović [Wed, 9 Oct 2013 06:33:03 +0000 (08:33 +0200)] 
Updare grunt-jekyll dependency

11 years agofix #10986
Chris Rebert [Tue, 8 Oct 2013 18:44:30 +0000 (11:44 -0700)] 
fix #10986

11 years agoFixes #10126: Update responsive test cases to properly highlight hidden class examples
Mark Otto [Mon, 7 Oct 2013 20:00:46 +0000 (15:00 -0500)] 
Fixes #10126: Update responsive test cases to properly highlight hidden class examples

11 years agoHalf fix for #9855: Don't fuck with margins for open modal dialog on account of Lion...
Mark Otto [Mon, 7 Oct 2013 19:39:11 +0000 (14:39 -0500)] 
Half fix for #9855: Don't fuck with margins for open modal dialog on account of Lion non-scrollbars and inconsistencies elsewhere

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 7 Oct 2013 19:32:29 +0000 (14:32 -0500)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #10959: round the .lead values down to nearest pixel via floor()
Mark Otto [Mon, 7 Oct 2013 19:32:23 +0000 (14:32 -0500)] 
Fixes #10959: round the .lead values down to nearest pixel via floor()

11 years agorun grunt
Mark Otto [Mon, 7 Oct 2013 19:31:41 +0000 (14:31 -0500)] 
run grunt

11 years agoMerge pull request #10962 from twbs/doc-h1-thru-h6-classes
Chris Rebert [Mon, 7 Oct 2013 07:55:21 +0000 (00:55 -0700)] 
Merge pull request #10962 from twbs/doc-h1-thru-h6-classes

document .h1 thru .h6; fixes part of #10102

11 years agodocument .h1 thru .h6; fixes part of #10102 10962/head
Chris Rebert [Mon, 7 Oct 2013 03:18:03 +0000 (20:18 -0700)] 
document .h1 thru .h6; fixes part of #10102

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 7 Oct 2013 00:06:40 +0000 (19:06 -0500)] 
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
css.html

11 years agoupdate gitignore to restore the ruby-version ignore and rename section to all docs...
Mark Otto [Sun, 6 Oct 2013 23:35:07 +0000 (18:35 -0500)] 
update gitignore to restore the ruby-version ignore and rename section to all docs stuff

11 years agofix #10961
Chris Rebert [Sun, 6 Oct 2013 23:17:32 +0000 (16:17 -0700)] 
fix #10961

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 6 Oct 2013 22:24:32 +0000 (17:24 -0500)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofixes #10961: change variable names in grid docs
Mark Otto [Sun, 6 Oct 2013 22:24:26 +0000 (17:24 -0500)] 
fixes #10961: change variable names in grid docs

11 years agoMerge pull request #10950 from twbs/docs-navbar-class
Mark Otto [Sat, 5 Oct 2013 17:59:44 +0000 (10:59 -0700)] 
Merge pull request #10950 from twbs/docs-navbar-class

Fix #10948: Clarify navbar example target in docs

11 years agoChange all navbar example targets 10950/head
Julian Thilo [Sat, 5 Oct 2013 17:32:52 +0000 (19:32 +0200)] 
Change all navbar example targets

According to comment on https://github.com/twbs/bootstrap/issues/10948#issuecomment-25751889 .

11 years agomerge in new ads
Mark Otto [Wed, 2 Oct 2013 05:11:51 +0000 (00:11 -0500)] 
merge in new ads

11 years agoFix #10948: Clarify navbar example target in docs
Julian Thilo [Sat, 5 Oct 2013 09:37:52 +0000 (11:37 +0200)] 
Fix #10948: Clarify navbar example target in docs

11 years agoMerge pull request #10932 from ZDroid/patch-1
Julian Thilo [Fri, 4 Oct 2013 06:21:30 +0000 (23:21 -0700)] 
Merge pull request #10932 from ZDroid/patch-1

Correct grammar

11 years agoCorrect grammar 10932/head
Zlatan Vasović [Thu, 3 Oct 2013 21:05:23 +0000 (23:05 +0200)] 
Correct grammar

Jekyll is the third person singular (it), so it should be 'its documentation', not 'their documentation'.

11 years agounify button sizing, use mixin ".button-size" also for the base sized button
Tobias Lindig [Thu, 12 Sep 2013 08:45:15 +0000 (10:45 +0200)] 
unify button sizing, use mixin ".button-size" also for the base sized button

11 years agorun grunt
Chris Rebert [Thu, 3 Oct 2013 17:42:55 +0000 (10:42 -0700)] 
run grunt

11 years agoMerge pull request #10871 from ZDroid/patch-2
Chris Rebert [Thu, 3 Oct 2013 17:21:39 +0000 (10:21 -0700)] 
Merge pull request #10871 from ZDroid/patch-2

Remove .ruby-version from excludes

11 years agoMerge pull request #10908 from ZDroid/patch-4
Mark Otto [Wed, 2 Oct 2013 17:59:03 +0000 (10:59 -0700)] 
Merge pull request #10908 from ZDroid/patch-4

Indent banner to match the *'s

11 years agoIndent banner to match the *'s 10908/head
Zlatan Vasović [Wed, 2 Oct 2013 12:33:17 +0000 (14:33 +0200)] 
Indent banner to match the *'s

11 years agorun up-to-date grunt
Chris Rebert [Tue, 1 Oct 2013 18:01:08 +0000 (11:01 -0700)] 
run up-to-date grunt

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 1 Oct 2013 16:37:53 +0000 (11:37 -0500)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agorun grunt
Mark Otto [Tue, 1 Oct 2013 16:37:47 +0000 (11:37 -0500)] 
run grunt

11 years agoMerge pull request #10806 from twbs/ios-safari-pct-rounding
Chris Rebert [Tue, 1 Oct 2013 01:11:20 +0000 (18:11 -0700)] 
Merge pull request #10806 from twbs/ios-safari-pct-rounding

add iOS and versions to Safari percent rounding warning; fixes #10723

11 years agoMerge pull request #10826 from twbs/doc-multiple-navbars-unsupported
Chris Rebert [Tue, 1 Oct 2013 01:06:17 +0000 (18:06 -0700)] 
Merge pull request #10826 from twbs/doc-multiple-navbars-unsupported

document that multiple navbars aren't supported by default

11 years agoadd maintenance note regarding #10864's addition
Chris Rebert [Tue, 1 Oct 2013 00:54:24 +0000 (17:54 -0700)] 
add maintenance note regarding #10864's addition

11 years agodocument that multiple navbars aren't supported by default; addresses #10824 10826/head
Chris Rebert [Thu, 26 Sep 2013 19:57:03 +0000 (12:57 -0700)] 
document that multiple navbars aren't supported by default; addresses #10824

11 years agoMerge pull request #10864 from akalicki/included_files
Mark Otto [Tue, 1 Oct 2013 00:15:15 +0000 (17:15 -0700)] 
Merge pull request #10864 from akalicki/included_files

Added abridged form of 'What's included' docs to README

11 years agoMerge pull request #10856 from akalicki/grid_class_docs
Mark Otto [Tue, 1 Oct 2013 00:11:55 +0000 (17:11 -0700)] 
Merge pull request #10856 from akalicki/grid_class_docs

Better documentation and optimized examples for grid classes

11 years agoMerge pull request #10865 from Quy/master
Mark Otto [Tue, 1 Oct 2013 00:10:48 +0000 (17:10 -0700)] 
Merge pull request #10865 from Quy/master

Apply help-block class to help text in customize.html

11 years agoMerge pull request #10883 from ZDroid/patch-3
Mark Otto [Tue, 1 Oct 2013 00:08:09 +0000 (17:08 -0700)] 
Merge pull request #10883 from ZDroid/patch-3

Remove "Remove margin on the body" from base css docs

11 years agoMerge pull request #10889 from twbs/contextual-table-docs-xs
Mark Otto [Tue, 1 Oct 2013 00:07:19 +0000 (17:07 -0700)] 
Merge pull request #10889 from twbs/contextual-table-docs-xs

table contextual classes docs: .col-lg-* => .col-xs-*

11 years agoMerge pull request #10888 from twbs/favor-xs-in-docs
Mark Otto [Tue, 1 Oct 2013 00:06:31 +0000 (17:06 -0700)] 
Merge pull request #10888 from twbs/favor-xs-in-docs

use .col-xs-* in "Forms: Column Sizing" docs so more responsive

11 years agotable contextual classes docs: .col-lg-* => .col-xs-* 10889/head
Chris Rebert [Mon, 30 Sep 2013 18:01:29 +0000 (11:01 -0700)] 
table contextual classes docs: .col-lg-* => .col-xs-*

11 years agouse .col-xs-* in "Forms: Column Sizing" docs so more responsive 10888/head
Chris Rebert [Mon, 30 Sep 2013 17:52:57 +0000 (10:52 -0700)] 
use .col-xs-* in "Forms: Column Sizing" docs so more responsive

11 years agoalso use .col-sm-* in other .form-horizontal example for consistency
Chris Rebert [Mon, 30 Sep 2013 17:45:18 +0000 (10:45 -0700)] 
also use .col-sm-* in other .form-horizontal example for consistency

11 years agoRemove "Remove margin on the body" from base css docs 10883/head
Zlatan Vasović [Mon, 30 Sep 2013 17:31:41 +0000 (19:31 +0200)] 
Remove "Remove margin on the body" from base css docs

Normalize did that.

11 years agoRemove .ruby-version due to https://github.com/twbs/bootstrap/commit/4f20a29c329aa589... 10871/head
Zlatan Vasović [Mon, 30 Sep 2013 09:26:52 +0000 (11:26 +0200)] 
Remove .ruby-version due to https://github.com/twbs/bootstrap/commit/4f20a29c329aa58919919426cbd2190fabfdb723

11 years agoMerge pull request #10869 from ZDroid/patch-2
Chris Rebert [Mon, 30 Sep 2013 08:09:30 +0000 (01:09 -0700)] 
Merge pull request #10869 from ZDroid/patch-2

Update qunit dependency

11 years agoUpdate qunit dependency 10869/head
Zlatan Vasović [Mon, 30 Sep 2013 07:36:20 +0000 (09:36 +0200)] 
Update qunit dependency

11 years agoApply help-block class to help text in customize.html 10865/head
Quy Ton [Mon, 30 Sep 2013 01:24:00 +0000 (18:24 -0700)] 
Apply help-block class to help text in customize.html

11 years agoMoved 'getting started' link out of 'What's included' section in README 10864/head
Alex Kalicki [Mon, 30 Sep 2013 00:45:55 +0000 (20:45 -0400)] 
Moved 'getting started' link out of 'What's included' section in README

11 years agorm unnecessary backslashes from jqueryCheck
Chris Rebert [Sun, 29 Sep 2013 22:37:22 +0000 (15:37 -0700)] 
rm unnecessary backslashes from jqueryCheck

11 years agoMerge pull request #10863 from DeanMarkTaylor/patch-2
Chris Rebert [Sun, 29 Sep 2013 22:32:34 +0000 (15:32 -0700)] 
Merge pull request #10863 from DeanMarkTaylor/patch-2

Update Gruntfile.js fixing undefined jQuery check

11 years agoAdded abridged form of 'What's included' docs to README
Alex Kalicki [Sun, 29 Sep 2013 22:17:46 +0000 (18:17 -0400)] 
Added abridged form of 'What's included' docs to README

11 years agoUpdate Gruntfile.js fixing undefined jQuery check 10863/head
Dean Taylor [Sun, 29 Sep 2013 20:14:24 +0000 (21:14 +0100)] 
Update Gruntfile.js fixing undefined jQuery check

The check to see if jQuery was defined as incorrect causing the "Bootstrap requires jQuery" message to only be displayed if jQuery is defined and has a value which equates to `false`.

11 years agoBetter documentation and optimized examples for grid classes 10856/head
Alex Kalicki [Sun, 29 Sep 2013 02:51:30 +0000 (22:51 -0400)] 
Better documentation and optimized examples for grid classes

11 years agoMerge pull request #10855 from dan-silver/master
Chris Rebert [Sat, 28 Sep 2013 21:42:59 +0000 (14:42 -0700)] 
Merge pull request #10855 from dan-silver/master

Spelling mistakes in documentation.

11 years agoSpelling mistakes in documentation. 10855/head
Dan Silver [Sat, 28 Sep 2013 21:21:23 +0000 (16:21 -0500)] 
Spelling mistakes in documentation.

11 years agoMerge pull request #10841 from DeanMarkTaylor/patch-1
Chris Rebert [Fri, 27 Sep 2013 17:23:28 +0000 (10:23 -0700)] 
Merge pull request #10841 from DeanMarkTaylor/patch-1

Update Gruntfile.js removing pointless reading of customize.html.

11 years agoUpdate Gruntfile.js removing pointless reading of customize.html. 10841/head
Dean Taylor [Fri, 27 Sep 2013 17:17:02 +0000 (18:17 +0100)] 
Update Gruntfile.js removing pointless reading of customize.html.

I couldn't see a reason to read "customize.html", removed line.

11 years agoMerge pull request #10827 from akalicki/issue_10726
Chris Rebert [Thu, 26 Sep 2013 22:04:23 +0000 (15:04 -0700)] 
Merge pull request #10827 from akalicki/issue_10726

Resolves #10726 - clarifies javascript tab markup in docs

11 years agoResolves #10726 - clarifies javascript tab markup in docs 10827/head
Alex Kalicki [Thu, 26 Sep 2013 21:49:03 +0000 (17:49 -0400)] 
Resolves #10726 - clarifies javascript tab markup in docs

11 years agoadd iOS and versions to Safari percent rounding warning; fixes #10723 10806/head
Chris Rebert [Wed, 25 Sep 2013 18:45:26 +0000 (11:45 -0700)] 
add iOS and versions to Safari percent rounding warning; fixes #10723

11 years agodon't include . in link
Mark Otto [Wed, 25 Sep 2013 02:27:49 +0000 (21:27 -0500)] 
don't include . in link

11 years agoMerge pull request #10797 from twbs/input-groups-xref
Mark Otto [Wed, 25 Sep 2013 02:26:58 +0000 (19:26 -0700)] 
Merge pull request #10797 from twbs/input-groups-xref

add cross-reference to Input Groups in CSS Form docs; fixes #10792

11 years agoadd cross-reference to Input Groups in CSS Form docs; fixes #10792 10797/head
Chris Rebert [Wed, 25 Sep 2013 01:48:01 +0000 (18:48 -0700)] 
add cross-reference to Input Groups in CSS Form docs; fixes #10792

11 years agoMerge pull request #10796 from twbs/skip-to-main-content
Mark Otto [Wed, 25 Sep 2013 01:37:13 +0000 (18:37 -0700)] 
Merge pull request #10796 from twbs/skip-to-main-content

Use "Skip to main content" phrasing consistently; further #10786 fixes

11 years agoUse "Skip to main content" phrasing consistently; further #10786 fixes 10796/head
Chris Rebert [Wed, 25 Sep 2013 01:02:10 +0000 (18:02 -0700)] 
Use "Skip to main content" phrasing consistently; further #10786 fixes

11 years agoMerge pull request #10786 from acspike/skip-nav-link-wording
Mark Otto [Wed, 25 Sep 2013 00:24:00 +0000 (17:24 -0700)] 
Merge pull request #10786 from acspike/skip-nav-link-wording

Alter wording of example Skip Nav link to improve pronunciation

11 years agoMerge pull request #10790 from twbs/disable-compatibility-mode
Mark Otto [Wed, 25 Sep 2013 00:16:06 +0000 (17:16 -0700)] 
Merge pull request #10790 from twbs/disable-compatibility-mode

Disable IE Compatibility Mode in docs, examples

11 years agoAdd note about IE mode tag being included in docs 10790/head
Julian Thilo [Tue, 24 Sep 2013 20:49:47 +0000 (22:49 +0200)] 
Add note about IE mode tag being included in docs

11 years agoMerge pull request #10778 from twbs/old-android-glyphicons-fix
Chris Rebert [Tue, 24 Sep 2013 17:39:03 +0000 (10:39 -0700)] 
Merge pull request #10778 from twbs/old-android-glyphicons-fix

Use updated Glyphicons to workaround old Android WebKit bug

11 years agoAlter wording of example Skip Nav link to improve pronunciation 10786/head
Aaron Spike [Tue, 24 Sep 2013 16:52:06 +0000 (11:52 -0500)] 
Alter wording of example Skip Nav link to improve pronunciation

Screen reading applications, including Apple's VoiceOver, improperly pronounce the word "content" in "Skip to content" as an adjective rather than a noun because of insufficient context. "Skip to main content" is pronounced correctly.

See #6 and Guideline #10 at the following site for more information:
http://redish.net/content/papers/interactions.htmlAlter wording of example Skip Nav link to improve pronunciation

11 years agoDisable IE Compatibility Mode in docs, examples
Julian Thilo [Tue, 24 Sep 2013 16:43:16 +0000 (18:43 +0200)] 
Disable IE Compatibility Mode in docs, examples

...because we don't support it and it may cause problems for people
trying to view the docs in IE.

11 years agorun grunt dist 10778/head
Chris Rebert [Tue, 24 Sep 2013 05:35:51 +0000 (22:35 -0700)] 
run grunt dist

11 years agore-sort affected .glyphicon-* classes by new codepoints
Chris Rebert [Tue, 24 Sep 2013 05:30:59 +0000 (22:30 -0700)] 
re-sort affected .glyphicon-* classes by new codepoints

11 years agoUpdate affected .glyphicon-* CSS classes to use new codepoints
Chris Rebert [Tue, 24 Sep 2013 05:06:11 +0000 (22:06 -0700)] 
Update affected .glyphicon-* CSS classes to use new codepoints

.glyphicon-briefcase: U+1F4BC -> U+E139
.glyphicon-calendar:  U+1F4C5 -> U+E109
.glyphicon-pushpin:   U+1F4CC -> U+E146
.glyphicon-paperclip: U+1F4CE -> U+E142
.glyphicon-camera:    U+1F4F7 -> U+E046
.glyphicon-lock:      U+1F512 -> U+E033
.glyphicon-bell:      U+1F514 -> U+E123
.glyphicon-bookmark:  U+1F516 -> U+E044
.glyphicon-fire:      U+1F525 -> U+E104
.glyphicon-wrench:    U+1F527 -> U+E136

11 years agoUpdate Glyphicons font to resolve #10106
Chris Rebert [Tue, 24 Sep 2013 04:58:28 +0000 (21:58 -0700)] 
Update Glyphicons font to resolve #10106

Workaround an old Android WebKit bug by switching to codepoints within the BMP.
Details: http://stackoverflow.com/questions/9241519/webkit-css-content-unicode-bug
Extra special thanks to @jankovarik for doing this update. <3
Source: https://www.dropbox.com/s/clh9y6lqtmj01l8/halflings_updated_for_android.zip
(As posted in https://github.com/twbs/bootstrap/issues/10106#issuecomment-24539909 )

11 years agorun grunt dist
Chris Rebert [Tue, 24 Sep 2013 05:34:36 +0000 (22:34 -0700)] 
run grunt dist

11 years agoMerge pull request #10768 from twbs/polaroid-thumbnail-docs
Mark Otto [Tue, 24 Sep 2013 02:10:38 +0000 (19:10 -0700)] 
Merge pull request #10768 from twbs/polaroid-thumbnail-docs

fix #10767; current .img-thumbnail is equivalent to old .img-polaroid

11 years agoMerge pull request #10770 from twbs/rename-assets
Mark Otto [Tue, 24 Sep 2013 02:08:50 +0000 (19:08 -0700)] 
Merge pull request #10770 from twbs/rename-assets

move /assets/ to /docs-assets/ ; fixes #10715

11 years agoMerge pull request #10769 from twbs/deprecate-hide
Mark Otto [Tue, 24 Sep 2013 02:08:01 +0000 (19:08 -0700)] 
Merge pull request #10769 from twbs/deprecate-hide

deprecate .hide; fixes #10446

11 years agoavoid using the term "assets" due to potential confusion 10770/head
Chris Rebert [Mon, 23 Sep 2013 20:01:11 +0000 (13:01 -0700)] 
avoid using the term "assets" due to potential confusion

11 years agomove /assets/ to /docs-assets/ ; fixes #10715
Chris Rebert [Mon, 23 Sep 2013 20:00:43 +0000 (13:00 -0700)] 
move /assets/ to /docs-assets/ ; fixes #10715

11 years agodeprecate .hide; fixes #10446 10769/head
Chris Rebert [Mon, 23 Sep 2013 19:46:57 +0000 (12:46 -0700)] 
deprecate .hide; fixes #10446

11 years agofix #10767; current .img-thumbnail is equivalent to old .img-polaroid 10768/head
Chris Rebert [Mon, 23 Sep 2013 19:06:33 +0000 (12:06 -0700)] 
fix #10767; current .img-thumbnail is equivalent to old .img-polaroid

11 years agoMerge pull request #10763 from XhmikosR/html5shiv
Chris Rebert [Mon, 23 Sep 2013 16:03:16 +0000 (09:03 -0700)] 
Merge pull request #10763 from XhmikosR/html5shiv

Update html5shiv to v3.7.0.

11 years agoUpdate html5shiv to v3.7.0. 10763/head
XhmikosR [Mon, 23 Sep 2013 13:51:34 +0000 (16:51 +0300)] 
Update html5shiv to v3.7.0.

11 years agoMerge pull request #10695 from FredericoC/fix-nav-active-caret
Mark Otto [Sun, 22 Sep 2013 23:53:01 +0000 (16:53 -0700)] 
Merge pull request #10695 from FredericoC/fix-nav-active-caret

Fixed issue where caret wouldn't inherit "active" li style on nav-pills

11 years agoMerge pull request #10741 from ZDroid/patch-1
Mark Otto [Sun, 22 Sep 2013 14:25:33 +0000 (07:25 -0700)] 
Merge pull request #10741 from ZDroid/patch-1

Avoid LESS nesting if isn't needed

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 22 Sep 2013 14:20:15 +0000 (09:20 -0500)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #10755: Don't remove quotes around q element by default
Mark Otto [Sun, 22 Sep 2013 14:19:37 +0000 (09:19 -0500)] 
Fixes #10755: Don't remove quotes around q element by default

11 years agoMerge pull request #10749 from ZDroid/patch-2
Chris Rebert [Sat, 21 Sep 2013 21:19:21 +0000 (14:19 -0700)] 
Merge pull request #10749 from ZDroid/patch-2

@headingsColor → @headings-color

11 years ago@headingsColor → @headings-color 10749/head
Zlatan Vasović [Sat, 21 Sep 2013 12:19:11 +0000 (14:19 +0200)] 
@headingsColor → @headings-color

11 years agoMerge pull request #10693 from twbs/include-docs-license
Mark Otto [Sat, 21 Sep 2013 05:14:57 +0000 (22:14 -0700)] 
Merge pull request #10693 from twbs/include-docs-license

include a copy of the CC-BY 3.0 License that the docs are under

11 years agofix #10737
Chris Rebert [Fri, 20 Sep 2013 18:49:32 +0000 (11:49 -0700)] 
fix #10737

11 years agoMerge pull request #10743 from hnrch02/patch-1
Chris Rebert [Fri, 20 Sep 2013 17:49:13 +0000 (10:49 -0700)] 
Merge pull request #10743 from hnrch02/patch-1

Fix a silly typo

11 years agoFix a silly typo 10743/head
Heinrich Fenkart [Fri, 20 Sep 2013 17:43:47 +0000 (19:43 +0200)] 
Fix a silly typo

11 years agoAvoid LESS nesting if isn't needed 10741/head
Zlatan Vasović [Fri, 20 Sep 2013 16:06:48 +0000 (18:06 +0200)] 
Avoid LESS nesting if isn't needed

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Fri, 20 Sep 2013 03:57:11 +0000 (22:57 -0500)] 
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
dist/css/bootstrap.min.css

11 years agoFixes #10694: Remove unnecessary `content` property from `.caret`
Mark Otto [Fri, 20 Sep 2013 03:56:17 +0000 (22:56 -0500)] 
Fixes #10694: Remove unnecessary `content` property from `.caret`

11 years agoMerge pull request #10724 from ZDroid/patch-1
Mark Otto [Fri, 20 Sep 2013 00:20:47 +0000 (17:20 -0700)] 
Merge pull request #10724 from ZDroid/patch-1

white → #fff

11 years agofix #10732
Chris Rebert [Thu, 19 Sep 2013 22:49:53 +0000 (15:49 -0700)] 
fix #10732

11 years agowhite → #fff 10724/head
Zlatan Vasović [Thu, 19 Sep 2013 14:41:06 +0000 (16:41 +0200)] 
white → #fff