Mark Otto
2eec3f919e
Merge branch 'master' into pr/10656
...
Conflicts:
dist/css/bootstrap.min.css
2013-10-20 22:55:45 -07:00
Mark Otto
6585c5898a
spacing
2013-10-20 22:46:21 -07:00
Mark Otto
6ecb5d6cf3
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-20 22:43:03 -07:00
Mark Otto
d8fab5aa6e
Fixes #10620 : remove gradient on buttons for IE9 in theme.less due to bleed through with rounded corners
2013-10-20 22:41:57 -07:00
Mark Otto
98378d2d88
Merge pull request #11188 from twbs/navbar_zindex_auto
...
Fixes #10433 : Navbar z-index refactor
2013-10-20 21:16:37 -07:00
Mark Otto
76baacf2c9
Remove default z-index on navbar and only set on static and fixed variants
2013-10-20 21:12:09 -07:00
Mark Otto
c71f89518f
Fix up padding on default navbar example
2013-10-20 21:11:51 -07:00
Mark Otto
e486bb4f39
Fixes #10433 : Navbar z-index refactor
...
* Resets the default navbar z-index to auto at a certain breakpoint
* Adds fixed navbar z-index var to fixed bottom navbar (previously only on fixed top navbar)
2013-10-20 20:30:16 -07:00
Mark Otto
5aa4c5cb0c
fixes #11139 : add position: relative; to .modal-dialog so that z-index takes effect
2013-10-20 20:04:10 -07:00
Mark Otto
369f5ba760
Merge branch 'master' of https://github.com/jeonghwan-kim/bootstrap into jeonghwan-kim-master
...
Conflicts:
dist/css/bootstrap.min.css
2013-10-20 19:55:56 -07:00
Mark Otto
dd34102cb6
Fixes #10522 : Enable use of form validation class on .radio, .checkbox, .radio-inline, and .checkbox-inline
2013-10-20 19:54:22 -07:00
Mark Otto
23a85d6a7a
fixes #11126 : remove box-shadow from open dropdown toggle with .btn-link
2013-10-20 17:59:15 -07:00
Mark Otto
6d5c5105fa
Merge pull request #11186 from twbs/carousel_indicators_ie
...
Carousel indicators for IE8-9
2013-10-20 17:48:36 -07:00
Mark Otto
bc76be5dcf
Merge branch 'master' into carousel_indicators_ie
...
Conflicts:
dist/css/bootstrap.min.css
2013-10-20 17:45:07 -07:00
Mark Otto
f45c05a97a
fixes #11151 : remove unused h5bp class from print CSS
2013-10-20 17:40:19 -07:00
Mark Otto
5e70642dd2
Merge branch 'master' into carousel_indicators_ie
2013-10-20 16:53:57 -07:00
Mark Otto
ecadbe56f7
mo grunt
2013-10-20 16:53:45 -07:00
Mark Otto
ac6a7f044e
Merge branch 'master' into carousel_indicators_ie
...
Conflicts:
dist/css/bootstrap.min.css
2013-10-20 16:49:18 -07:00
Mark Otto
ecc6d9873f
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-20 16:48:52 -07:00
Mark Otto
291fd9828c
run grunt dist
2013-10-20 16:48:42 -07:00
Mark Otto
6a93a6b88a
Fixes #10903 and #10457 : IE8-9 don't support events on elements without background-color, so we have to hack it
2013-10-20 16:46:38 -07:00
Mark Otto
438a40a7f8
Merge pull request #11183 from ZDroid/patch-1
...
Continue tag way implementation
2013-10-20 14:55:10 -07:00
Zlatan Vasović
8a9e1af18d
Continue tag way implementation
2013-10-20 18:50:14 +02:00
Rogério Yokomizo
15f15cafd6
added bower_components to .gitignore
2013-10-19 01:07:10 -03:00
Chris Rebert
32468b087b
Merge pull request #11166 from ZDroid/tag_way
...
(Not HTML) tag way is much better
2013-10-18 13:14:03 -07:00
Zlatan Vasović
d2ad1dc88f
(Not HTML) tag way is much better
2013-10-18 21:34:18 +02:00
Mark Otto
eb4a92bfed
Merge pull request #11155 from twbs/ie8-file-proto-respond.js-examples-warnings
...
Warn about IE8 + Respond.js + file:// problem in examples
2013-10-17 19:17:05 -07:00
Mark Otto
0806819bcf
Merge pull request #11156 from twbs/mobile-modals-xref
...
JS docs: add cross-reference to Getting Started mobile modal section
2013-10-17 19:16:12 -07:00
Chris Rebert
73bb911b29
JS docs: add cross-reference to Getting Started mobile modal section
2013-10-17 19:12:24 -07:00
Chris Rebert
c23d6a2766
Warn about IE8 + Respond.js + file:// problem in examples; fix #11019
2013-10-17 18:39:03 -07:00
Mark Otto
4c043b7d5f
Merge pull request #11096 from twbs/navbar-button-docs
...
Resolves #10923
2013-10-17 14:53:50 -07:00
Mark Otto
70d85be3b7
Merge branch 'master' into navbar-button-docs
2013-10-17 14:47:31 -07:00
Mark Otto
96a19c18fb
copy change, add to buttons anchor section
2013-10-17 14:47:27 -07:00
Mark Otto
bb30f6355a
Merge branch 'fix-11112'
2013-10-17 14:11:46 -07:00
Mark Otto
1f33dc8033
even shorter banner; remove space between slash and period
2013-10-17 14:11:40 -07:00
Chris Rebert
c88cd1cd95
add explicit copyright header to docs CSS & JS files; fixes #11112
2013-10-17 14:02:22 -07:00
Chris Rebert
872c3588f3
Merge pull request #11150 from ZDroid/patch-1
...
FIx invalid element selector
2013-10-17 12:35:15 -07:00
Zlatan Vasović
5f79354dbe
FIx invalid element selector
...
`kbd` (keyboard) is right, not `kdb`. :P
2013-10-17 21:25:08 +02:00
Chris Rebert
25b7a5200d
fix #11144
2013-10-17 11:21:06 -07:00
Chris Rebert
a28b2cb9e1
Merge pull request #11141 from vincentchan/master
...
Update translation sites URL
2013-10-17 01:01:49 -07:00
Vincent Chan
d8a68e38f7
Update translation URL
2013-10-17 15:52:59 +08:00
Mark Otto
3e9e339ee3
Merge pull request #11137 from twbs/explain-https
...
add note about third-party JS, CDNs, and HTTPS
2013-10-16 17:28:46 -07:00
Chris Rebert
4d663e3879
add note about third-party JS, CDNs, and HTTPS
2013-10-16 15:50:40 -07:00
Chris Rebert
cf95fe20ba
upgrade to html5shiv v 3.7.0
2013-10-16 15:36:37 -07:00
Mark Otto
c1bf625dfe
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-16 10:44:03 -07:00
Mark Otto
8ac1495c63
redo the glyphicons icons list to make icons not blurry on edges /cc @jankovarik
2013-10-16 10:43:56 -07:00
Julian Thilo
d880398038
Merge pull request #11128 from lipis/patch-3
...
Fixed broken link in README.md
2013-10-16 09:34:27 -07:00
Lipis
397481903a
Fixed broken link
2013-10-16 16:42:32 +02:00
jeonghwan
976f6dfdad
Fixes issue #11122 -- navbar-fixed-bottom border
...
Enable border-top in .navbar-fixed-bottom
2013-10-16 23:20:34 +09:00
Chris Rebert
e317e116fd
add dots to class name references for consistency
2013-10-15 17:25:34 -07:00
