0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Commit Graph

7172 Commits

Author SHA1 Message Date
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
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
Chris Rebert
4e1808930a add IDs to frequently-referenced parts of the docs 2013-10-14 16:24:58 -07:00
Mark Otto
036712ed90 Merge pull request #11091 from yokomizor/extended_thumbnail_hover_state
Extended hover state of linked versions of .thumbnail
2013-10-14 16:14:28 -07:00
Rogério Yokomizo
e20b02ad0b extended hover state of linked versions of .thumbnail 2013-10-14 20:10:49 -03:00
Mark Otto
fa64846acf Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/css/bootstrap.min.css
2013-10-14 13:45:57 -07:00
Mark Otto
7100711577 unnest the list-group-item link variation for #11085 and #11088 2013-10-14 13:45:32 -07:00
Mark Otto
3fb1381a30 Merge pull request #11084 from ZDroid/variable_way
Unhardcode .table-responsive bottom margin
2013-10-14 11:33:27 -07:00
Mark Otto
256f3a99c3 Merge pull request #11086 from twbs/table-responsive-breakpoint
fix .table-responsive media query; refs #11067
2013-10-14 11:32:46 -07:00
Mark Otto
50dd5d5088 fix about page html validation and run grunt 2013-10-14 11:30:06 -07:00
Mark Otto
6307d2c94d Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	getting-started.html
2013-10-14 11:06:25 -07:00
Mark Otto
1f5c754d57 remove dupe content 2013-10-14 11:05:49 -07:00
Chris Rebert
5c64ef393c fix .table-responsive media query; refs #11067 2013-10-14 10:58:12 -07:00
Zlatan Vasović
4ce1b08c32 Unhardcode .table-responsive bottom margin 2013-10-14 18:22:31 +02:00
Mark Otto
70278a4e4f Merge pull request #11078 from twbs/issue-11019-note
add note to docs about Respond.js & file:// ; fixes part of #11019
2013-10-14 09:09:02 -07:00
Mark Otto
efc741b151 Merge pull request #11082 from ZDroid/nuke_zeros
Nuke trailing zeros
2013-10-14 09:08:28 -07:00