rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity
7,029 Commits 108 Branches 89 Tags 547 MiB
5e70642dd2
Commit Graph

7029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Chris Rebert
e317e116fd add dots to class name references for consistency 2013-10-15 17:25:34 -07:00
Mark Otto
401dca0ed7 Merge pull request #11110 from nikolawannabe/patch-1 
Include a note about text-based form control styling
 2013-10-15 17:07:22 -07:00
Case Talbot
9d54a42951 Include a note about text-based form control styling 
fixes #8824.
 2013-10-15 17:02:21 -07:00
Mark Otto
481791411c Merge branch 'master' of github.com:twbs/bootstrap 2013-10-15 14:11:29 -07:00
Mark Otto
acd4a0a140 update jumbotron docs; fixes #11109 2013-10-15 14:11:21 -07:00
Mark Otto
723f85fc0d Merge pull request #11105 from twbs/license-note 
Add notes about dual-licensing contributions before switching to MIT in v3.1
 2013-10-15 13:12:46 -07:00
Rhodry Korb
dd5c8a53ee Add Note About Changing to MIT 2013-10-15 13:06:27 -07:00
Mark Otto
2380b6be99 Merge pull request #11102 from ZDroid/less-fix 
Ditch `&`, as `+ ...` is enought
 2013-10-15 11:19:24 -07:00
Zlatan Vasović
0423635614 Ditch &, as + ... is enought 2013-10-15 17:35:11 +02:00
Mark Otto
dc495fe9d9 nuke commented out docs css 2013-10-14 22:08:23 -07:00
Alex Kalicki
21fad33858 Resolves #10923 
Rebased from #10930
 2013-10-14 21:20:17 -07:00
Chris Rebert
b05a287eb6 run grunt 2013-10-14 20:47:56 -07:00
Chris Rebert
a28d9539c7 fix #10952 2013-10-14 20:45:43 -07:00
Mark Otto
67829c6571 Merge pull request #11094 from twbs/address-10049 
Recommend only <div> (not <span>) for putting tooltips on disabled elements
 2013-10-14 20:21:17 -07:00
Chris Rebert
27e2c56792 In docs, recommend only <div> (not <span>) for putting tooltips on disabled elements 
Per issue comments, `display: inline` elements like <span> don't work for this.
Resolves #10049
 2013-10-14 20:18:12 -07:00
Mark Otto
a44bd01628 Merge pull request #10533 from topsitemakers/master 
adding required attribute for example signin form
 2013-10-14 19:56:33 -07:00
Chris Rebert
f11aa31023 Merge pull request #10519 from zba/master 
changed attr('data-target') to data('target');
 2013-10-14 19:14:58 -07:00
Chris Rebert
b5d7a51bff Merge pull request #10779 from ssorallen/customizer-bootstrap-less-order 
Use bootstrap.less file order in Customizer
 2013-10-14 18:56:10 -07:00