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

6966 Commits

Author SHA1 Message Date
Mark Otto
be1f0b07f3 mention .small in docs /cc #10102 2013-10-13 16:02:56 -07:00
Mark Otto
590975b407 remove undocumented and unsupported .pill-content and .pill-pane /cc #10102 2013-10-13 15:55:13 -07:00
Mark Otto
6c9ec3d87f run grunt dist on .small additions 2013-10-13 15:54:49 -07:00
Mark Otto
857e697d72 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-13 15:24:48 -07:00
Mark Otto
ef2e0c99f4 remove screen from all docs media queries 2013-10-13 15:24:39 -07:00
Mark Otto
12fa502e67 Document caret /cc #10102 2013-10-13 15:23:58 -07:00
Zlatan Vasović
c75f8a5bf6 Sort dependencies A-Z 2013-10-13 05:31:47 -07:00
Mark Otto
570aa8a309 Merge pull request #11059 from ZDroid/patch-5
Add more functionality to .small to match <small>
2013-10-12 16:58:49 -07:00
Mark Otto
d82650102c Merge pull request #10933 from ZDroid/patch-2
Change border to border-radius
2013-10-12 15:35:07 -07:00
Zlatan Vasović
8098f4e5ba Add more functionality to .small 2013-10-12 23:28:50 +02:00
Mark Otto
a46003b8c7 restore var to customizer 2013-10-11 22:01:11 -07:00
Mark Otto
c814ad1833 Combine separate efforts for grid mixins into one, cleanup and reorganize 2013-10-11 22:00:37 -07:00
Mark Otto
dcef0a78d5 Merge pull request #11049 from alexdahl/multiple-modals-doc
documentation that multiple modals are not supported
2013-10-11 18:52:57 -07:00
Alex Dahl
dfdde46312 documentation that multiple modals are not supported 2013-10-11 18:11:58 -07:00
Zlatan Vasović
40db8e811d Nicer docs license name
DOCUMENTATION-LICENSE is so long.
2013-10-11 22:53:38 +02:00
Mark Otto
3ea40c0d4f Merge pull request #11018 from twbs/use-https
use https:// for CDN links
2013-10-10 13:37:06 -07:00
Chris Rebert
a96aff1e56 fix typo in Getting Started docs prose 2013-10-10 02:27:26 -07:00
Chris Rebert
4b175d908c use https:// for CDN links
- works when viewing page via file://
- sets a good example security-wise
2013-10-10 01:51:18 -07:00
Chris Rebert
c42af6951f address #10965; mention Glyphicons-over-file:// problem in Carousel example 2013-10-10 01:42:34 -07:00
Mark Otto
84413f6e29 Merge pull request #11013 from twbs/fix-10989
Use CDNs for more example JavaScripts
2013-10-09 20:05:21 -07:00
Chris Rebert
7016f02e51 Merge pull request #11015 from twbs/use-data-ride-carousel
use data-ride="carousel" in the docs & examples; fixes #11005
2013-10-09 19:49:44 -07:00
Chris Rebert
ef1fc34e61 use data-ride="carousel" in the docs & examples; fixes #11005 2013-10-09 19:29:27 -07:00
Chris Rebert
4da37222cf re-remove execute permissions; apparent upstream bug 2013-10-09 18:58:50 -07:00
Chris Rebert
1a0df1fbd0 upgrade holder.js to v2.1 2013-10-09 18:52:57 -07:00
Chris Rebert
a388b7906e Merge pull request #10956 from ZDroid/patch-4
Sort tasks alphabetically
2013-10-09 18:31:17 -07:00
Kurt Maine
a216589056 Convert "Recess" to "RECESS"
Except when speaking of the "recess" Node package, RECESS should be in all-caps.
2013-10-09 18:18:05 -07:00
Chris Rebert
ca090aef02 fix #10805 2013-10-09 18:07:08 -07:00
Chris Rebert
f9ed8e6f00 trivial refactor in build-customizer grunt task 2013-10-09 18:03:08 -07:00
herom
aad70834fc Fixes #9925: convert font data to base64, fixing 0xefbfbd (Unicode Replacement Character) chars in customizer fonts.
Merges #9982
2013-10-09 18:03:04 -07:00
Stuart P. Bentley
58a47b6bfd Customizer: include config.json in bootstrap.zip
merges #10633; fixes part of #9951
2013-10-09 17:35:26 -07:00
Chris Rebert
5e652332d1 use CDN for jQuery instead of vendoring it; fixes part of #10989 2013-10-09 16:36:15 -07:00
Chris Rebert
d72768a16a use CDN for html5shiv instead of vendoring it; fixes part of #10989 2013-10-09 16:36:02 -07:00
Chris Rebert
d820c6d225 there's no reason for holder.js to be executable 2013-10-09 15:34:39 -07:00
Chris Rebert
da4a275473 Merge pull request #10896 from ZDroid/patch-3
Change clone protocol from git:// to https://
2013-10-09 12:45:43 -07:00
Mark Otto
a007769ac3 Merge pull request #10998 from ZDroid/patch-7
Remove [type]
2013-10-09 10:12:17 -07:00
Chris Rebert
65b5b20776 Merge pull request #10996 from ZDroid/patch-6
Updare grunt-jekyll dependency
2013-10-09 01:39:56 -07:00
Zlatan Vasović
62c905f5bc Remove [type]
type="text/css" isn't needed
2013-10-09 09:45:05 +02:00
Zlatan Vasović
ef3ac6808f Updare grunt-jekyll dependency 2013-10-09 08:33:03 +02:00
Chris Rebert
730d7f0b13 fix #10986 2013-10-08 11:44:30 -07:00
Mark Otto
969cb04acb Fixes #10126: Update responsive test cases to properly highlight hidden class examples 2013-10-07 15:00:46 -05:00
Mark Otto
352532cd63 Half fix for #9855: Don't fuck with margins for open modal dialog on account of Lion non-scrollbars and inconsistencies elsewhere 2013-10-07 14:39:11 -05:00
Mark Otto
0647049513 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-07 14:32:29 -05:00
Mark Otto
1adbe2043a Fixes #10959: round the .lead values down to nearest pixel via floor() 2013-10-07 14:32:23 -05:00
Mark Otto
704635818f run grunt 2013-10-07 14:31:41 -05:00
Chris Rebert
d32380657b Merge pull request #10962 from twbs/doc-h1-thru-h6-classes
document .h1 thru .h6; fixes part of #10102
2013-10-07 00:55:21 -07:00
Chris Rebert
a8afb46688 document .h1 thru .h6; fixes part of #10102 2013-10-06 20:18:03 -07:00
Mark Otto
e62e7ffcbc Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	css.html
2013-10-06 19:06:40 -05:00
Mark Otto
61aa9a4f60 update gitignore to restore the ruby-version ignore and rename section to all docs stuff 2013-10-06 18:35:07 -05:00
Chris Rebert
bb50e33a30 fix #10961 2013-10-06 16:17:32 -07:00
Mark Otto
1eca83336e Merge branch 'master' of github.com:twbs/bootstrap 2013-10-06 17:24:32 -05:00