Mark Otto
9023c087db
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-15 14:14:32 -08:00
Mark Otto
f5c13a3e1b
revert an earlier change to move the component-animations.less file because it fubared modal backdrop .fade usage
2013-12-15 14:14:09 -08:00
Mark Otto
f6fe62cdf7
run grunt on modal scrolling change
2013-12-15 14:13:25 -08:00
Mark Otto
122245fe87
Merge branch 'master' into pr/11676
...
Conflicts:
less/modals.less
2013-12-15 14:10:48 -08:00
Mark Otto
55f6beb427
Merge branch 'master' into pr/11776
...
Conflicts:
package.json
2013-12-15 14:09:50 -08:00
Mark Otto
e7a56df5a2
Merge pull request #11732 from dak/include-dev-fonts-in-bower
...
Don't exclude fonts from bower installs
2013-12-15 14:07:17 -08:00
Mark Otto
56eecf97ac
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-15 13:53:41 -08:00
Mark Otto
ee80b5e1d4
typo
2013-12-15 13:52:56 -08:00
Mark Otto
f126411735
Merge pull request #11840 from ZDroid/pagination-boom
...
Improve pager customization
2013-12-15 13:46:11 -08:00
Mark Otto
93a4d6cc5e
Fixes #11783 : Document requirement of .container(-fluid) in navbars
2013-12-15 13:44:26 -08:00
Mark Otto
540677c42a
Fixes #11795 : Update the contributing guidelines to include some more CSS guidelines
2013-12-15 13:39:45 -08:00
Mark Otto
a13d459491
Clarify number of columns in nested grid
2013-12-15 13:08:17 -08:00
Mark Otto
d57e81d06d
Fixes #11799 : Mention support of number of add-ons in docs
2013-12-15 12:41:47 -08:00
Mark Otto
c7c9929c12
Fixes #11770 : Move component-animations.less to the utility section of import list to match Customizer
2013-12-15 12:31:40 -08:00
Mark Otto
a925a0b985
Browser/device support docs update
...
* Fixes #11055 : add mention of select menu styling on Android stock
browsers with included optional fix
* Update IDs and docs nav to include bookmark links to each section
* Add callout to navbar docs about fixed position, inputs, and virtual
keyboard
2013-12-15 12:27:46 -08:00
Mark Otto
cb3d9dfe83
Fixes #11833 : add warning to docs for popover multiple line positioning; update it's docs with example markup, too
2013-12-15 11:44:16 -08:00
Mark Otto
1264cb7140
update tooltip docs
2013-12-15 11:41:46 -08:00
Mark Otto
61ec569211
Fixes #11805 with docs mention of navbar
2013-12-15 11:36:16 -08:00
Mark Otto
f60b8169c6
finalize blog template
2013-12-15 11:33:06 -08:00
Mark Otto
a7029edc61
Restyle the blockquote to not thin text or change line-height
2013-12-15 11:29:58 -08:00
Mark Otto
fd62247bf8
Merge branch 'master' into cover_template
2013-12-15 11:16:57 -08:00
Mark Otto
2b86e05a61
Change variable
2013-12-15 11:09:03 -08:00
Mark Otto
bc261ecc52
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-15 11:02:45 -08:00
Mark Otto
a319ec5b7d
Fixes #11829 : Adds .make-xs-column mixins
2013-12-15 11:02:32 -08:00
Mark Otto
2ea370f93b
Merge pull request #11861 from freeman/master
...
Issue #11852 : create a new variable for the list group active item link...
2013-12-15 10:59:23 -08:00
Mark Otto
9a8e619543
Fixes #11871 : commas last
2013-12-15 10:57:11 -08:00
Mark Otto
ad782ff89a
comments and spacing
2013-12-15 10:53:53 -08:00
Mark Otto
8c13565e3c
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-15 10:39:12 -08:00
Mark Otto
82c52a7e9d
Fixes #11801 : use correct variables for grid containers
2013-12-15 10:38:54 -08:00
Mark Otto
ca7fd08646
Merge pull request #11879 from ZDroid/wrong-variable
...
Fix wrong variable name
2013-12-15 10:28:32 -08:00
Zlatan Vasović
ae170a5930
Fix wrong variable name
2013-12-15 11:47:23 +01:00
Mark Otto
168469f545
Fixes #11588 : Scope font-size to only p elements in a .jumbotron and remove the supersized line-height from the base class
2013-12-14 21:50:47 -08:00
Mark Otto
647e9eb0f1
Fixes #11555 : Add @tooltip-opacity variable
2013-12-14 21:43:08 -08:00
Mark Otto
072ccd4dda
Fixes #11572 : Add contextual background-color classes to match text classes; move both sets of classes to Helper Classes section of the CSS docs
2013-12-14 21:40:16 -08:00
Mark Otto
67b536ea51
change class name
2013-12-14 21:25:57 -08:00
Mark Otto
bcc2c8b09e
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-14 20:04:52 -08:00
Mark Otto
432b9f9cde
Fixes #11561 : Add float: left; to .form-control within input groups to prevent IE9 from screwing up placeholder text and select menu arrows
2013-12-14 20:04:12 -08:00
Chris Rebert
c243e2417e
Merge pull request #11864 from twbs/parallelize-build
...
parallelize Travis using build matrix & test subsuites
2013-12-14 19:40:28 -08:00
Mark Otto
4da03c83c5
correct bookmark prefix
2013-12-14 19:31:20 -08:00
Mark Otto
88a8669656
document #11326
2013-12-14 19:31:03 -08:00
Chris Rebert
39a2dab722
parallelize Travis using build matrix & test subsuites
2013-12-14 19:11:04 -08:00
Mark Otto
e98c2dc3ad
Merge pull request #11326 from ZDroid/animations
...
Add `.animation-*()` mixins
2013-12-14 18:58:41 -08:00
Mark Otto
35dd6b9fd7
Merge pull request #10704 from XhmikosR/various
...
rm unused vars
2013-12-14 18:55:25 -08:00
Mark Otto
46c3d27468
Merge branch 'master' into pr/11435
...
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
2013-12-14 16:56:56 -08:00
Mark Otto
4c64c1eecd
Merge branch 'master' into pr/11302
...
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
2013-12-14 16:46:40 -08:00
Mark Otto
d79431ca02
Document new modal sizes
2013-12-14 16:29:55 -08:00
Mark Otto
323a40cc53
Merge branch 'master' into pr/11162
...
Conflicts:
less/modals.less
2013-12-14 16:29:47 -08:00
Mark Otto
83c60ef3ee
Merge branch 'master' into pr/11107
...
Conflicts:
docs-assets/js/raw-files.js
2013-12-14 16:20:19 -08:00
Mark Otto
4afcebe0e7
Merge pull request #11286 from BBosman/well-border
...
Add well-border variable
2013-12-14 16:17:41 -08:00
Mark Otto
544b8ecab7
Fixes #10921 : Add support for input groups within button toolbars
...
* Floats any `.input-group` within a toolbar
* Simplifies the CSS to remove sibling selectors and instead use a
negative amrgin on the parent with only `margin-left`
See it in action: http://jsbin.com/aGEcUqAT/1/ .
2013-12-14 16:03:21 -08:00
