0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

7053 Commits

Author SHA1 Message Date
Mark Otto
810a852f4a Merge pull request #11046 from ZDroid/patch-3
Nicer docs license name
2013-10-13 20:26:36 -07:00
Mark Otto
9da73d79c2 run grunt 2013-10-13 20:12:07 -07:00
Mark Otto
e7379f75bd no trailing decimal place 2013-10-13 20:04:28 -07:00
Mark Otto
fbc67a395f Merge branch 'master' of github.com:twbs/bootstrap 2013-10-13 20:04:00 -07:00
Mark Otto
36b4639b0d Merge pull request #10949 from StevenBlack/jumbotron.fontsize
Jumbotron: remove the hard-coded font-size from jumbotron.less and moved...
2013-10-13 20:03:02 -07:00
Mark Otto
be4e951b7d scope top padding of .form-control-static to be within horizontal forms only; fixes #10927 2013-10-13 20:02:24 -07:00
Mark Otto
44b32a3036 move .hidden to utilities; fixes #10997 2013-10-13 19:59:42 -07:00
Mark Otto
7bd955318a run grunt on that scaffolding change 2013-10-13 19:57:45 -07:00
Mark Otto
5a411af967 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-13 19:57:23 -07:00
Mark Otto
f946ff5d25 fix #10257 2013-10-13 19:57:14 -07:00
Mark Otto
7112d06a2b Merge pull request #10955 from ZDroid/patch-1
Insert comma to fix validation warning
2013-10-13 19:41:12 -07:00
Mark Otto
f660bd4205 clarify more grid stuff, specifically 100% fluid designs; fixes #10711 2013-10-13 19:36:39 -07:00
Mark Otto
950453db43 mention rows must be in containers in grid docs 2013-10-13 19:31:39 -07:00
Mark Otto
ee4a1ea295 docs notice for #11010 2013-10-13 19:24:13 -07:00
Mark Otto
bf4c714851 follow up to #10102, cc @cvrebert 2013-10-13 19:12:23 -07:00
Mark Otto
ed12d41cae add docs example for #10938 to show responsive column clearing in grid 2013-10-13 19:10:17 -07:00
Mark Otto
a43696467f Merge pull request #11050 from twbs/restore_grid_mixins
Restore grid mixins
2013-10-13 19:03:29 -07:00
Mark Otto
bf73f1f9d3 Merge branch 'master' into restore_grid_mixins
Conflicts:
	dist/css/bootstrap.min.css
2013-10-13 18:59:40 -07:00
Mark Otto
6351c30782 comment and spacing 2013-10-13 18:58:09 -07:00
Mark Otto
6085973e25 drop .tabbable since it's unused and undocumented /cc #10102 2013-10-13 18:56:31 -07:00
Mark Otto
dcbe591fa9 mention .invisible in docs per #10102 2013-10-13 18:56:03 -07:00
Mark Otto
2d1fa8cb5b mention .invisible in docs per #10102 2013-10-13 18:54:15 -07:00
Mark Otto
fd293be5a1 mention tooltip markup in docs per #10102 2013-10-13 18:49:13 -07:00
Mark Otto
c31ec22661 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-13 18:44:06 -07:00
Mark Otto
edca93b8c7 mention .modal-open and .modal-backdrop in docs /cc #10102 2013-10-13 18:43:19 -07:00
Mark Otto
6fa9037e1c mention .dropdown-backdrop and .open in dropdown docs /cc #10102 2013-10-13 18:40:47 -07:00
Mark Otto
6a93e729db Merge pull request #11016 from twbs/address-10965
address #10965; mention Glyphicons-over-file:// problem in Carousel example
2013-10-13 18:35:10 -07:00
Mark Otto
265fda7903 Merge branch 'master' into restore_grid_mixins
Conflicts:
	dist/css/bootstrap.min.css
2013-10-13 18:32:34 -07:00
Mark Otto
727a91de1c another grid .row mention 2013-10-13 17:25:27 -07:00
Mark Otto
49f177fe60 finish grid docs intro for now; needs work though 2013-10-13 17:12:04 -07:00
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