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

4753 Commits

Author SHA1 Message Date
Mark Otto
879d517cb3 delete icons in assets 2013-06-27 18:49:59 -07:00
Mark Otto
e5a9a1f5ff remove icons from sidenav 2013-06-27 18:49:37 -07:00
Mark Otto
62f76ad33f Merge branch '3.0.0-wip' into bs3_remove_icons
Conflicts:
	docs/components.html
2013-06-27 18:49:05 -07:00
Mark Otto
cb483b6758 Add parens so sublime picks up on syntax highlighting 2013-06-27 18:45:08 -07:00
Mark Otto
7636577681 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-27 18:43:54 -07:00
Mark Otto
c9ccbd2cf0 Fixes #8329: add !important to .hidden 2013-06-27 18:43:29 -07:00
Mark Otto
cb29ed0751 Merge pull request #8307 from cvrebert/8287-docs-patch
Fix #8287
2013-06-27 18:38:34 -07:00
Mark Otto
5e29c42211 remove custom url in jekyll 2013-06-27 18:38:00 -07:00
Mark Otto
296b9d7293 Merge pull request #8313 from jholl/patch-1
typo: match doc text and example
2013-06-26 11:42:04 -07:00
Mark Otto
68792fc1f9 Merge pull request #8306 from cvrebert/styling-n-typo
Docs: fix 1 typo; use <code> in 1 place
2013-06-26 11:20:14 -07:00
Mark Otto
cd4f131c49 Merge pull request #8305 from cvrebert/copyedit
copyedit JS docs
2013-06-26 11:19:43 -07:00
James Holland
2471b9d725 typo: match doc text and example 2013-06-26 08:27:12 -04:00
Chris Rebert
242d92e09c Fix #8287 2013-06-25 20:18:30 -07:00
Chris Rebert
274a342657 Docs: fix 1 typo; use <code> in 1 place 2013-06-25 19:50:37 -07:00
Chris Rebert
694c650f8e copyedit JS docs 2013-06-25 19:32:17 -07:00
Mark Otto
cc43ba35d7 Merge pull request #8301 from cvrebert/patch-3
Fix spelling in comment
2013-06-25 17:11:31 -07:00
Mark Otto
0f371d409f Merge pull request #8300 from cvrebert/patch-2
Fix typo in comment
2013-06-25 17:11:20 -07:00
Mark Otto
2da485d6bb Merge pull request #8299 from cvrebert/patch-1
Spelling in comment
2013-06-25 17:10:59 -07:00
Mark Otto
5c9bd469ae Merge pull request #8303 from cvrebert/patch-4
Fix 2 typos
2013-06-25 17:10:34 -07:00
Mark Otto
ae9fde5cab Merge pull request #8304 from cvrebert/patch-5
rm :invalid styling from docs
2013-06-25 17:09:52 -07:00
Chris Rebert
266bdfcaaa rm :invalid styling from docs
It was removed from the code in 90d4343f66  :-/
2013-06-25 16:31:12 -07:00
Chris Rebert
d82941265c Fix 2 typos 2013-06-25 17:07:51 -06:00
Chris Rebert
8ee0e39ef9 Fix spelling in comment 2013-06-25 17:05:26 -06:00
Chris Rebert
d2b5f4e45c Fix typo in comment 2013-06-25 17:03:57 -06:00
Chris Rebert
64a01f01cb Spelling in comment 2013-06-25 17:01:46 -06:00
Mark Otto
ac90fbf4d8 Merge pull request #8297 from cvrebert/patch-1
rm pre{white-space:pre-wrap;} since redundant to Normalize
2013-06-25 14:57:41 -07:00
Mark Otto
73ec8e031b Merge pull request #8298 from cvrebert/patch-2
rm fallback white-space for <code>
2013-06-25 14:57:17 -07:00
Chris Rebert
1bb159aa6f rm fallback white-space for <code>
If my analysis is right, this should be unnecessary.
2013-06-25 15:53:48 -06:00
Chris Rebert
9b97d63188 rm pre{white-space:pre-wrap;} since redundant to Normalize.css 2013-06-25 14:48:57 -07:00
Mark Otto
211d6831fc Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-25 13:35:49 -07:00
Mark Otto
6ac063430f Merge pull request #8290 from juthilo/3.0.0-docs-nothird
Add new callouts to docs
2013-06-25 13:34:03 -07:00
Mark Otto
534ba060be Merge pull request #8292 from cvrebert/patch-1
fix "Data attributes" link in JS docs sidenav
2013-06-25 13:32:41 -07:00
Mark Otto
327a951ca3 Move mixin to mixins.less 2013-06-25 13:32:21 -07:00
Mark Otto
03e67e44f9 Merge pull request #8291 from cvrebert/refactor
refactor responsive-utilities slightly
2013-06-25 13:28:34 -07:00
Mark Otto
08ab44708d Merge pull request #8294 from cvrebert/patch-2
fix ID of Normalize heading in docs so that the sidenav can find it
2013-06-25 13:26:14 -07:00
Julian Thilo
fe25ebc2af Recess welcome 2013-06-25 22:22:23 +02:00
Chris Rebert
e46e63463a fix ID of Normalize heading in docs so that the sidenav can find it 2013-06-25 14:16:39 -06:00
Chris Rebert
4be21c422a fix "Data attributes" link in JS docs sidenav
`#js-data-attributes` => `#js-data-attrs`
2013-06-25 14:09:24 -06:00
Julian Thilo
a87ea9345b Add IDs, adjust text 2013-06-25 21:59:34 +02:00
Chris Rebert
83c4073ec7 refactor responsive-utilities slightly 2013-06-25 12:23:56 -07:00
Julian Thilo
0f0e7fc376 Add a link to the mailing list for JS help 2013-06-25 21:19:19 +02:00
Julian Thilo
30e5e89fac Add callout to docs: LESS compiler support 2013-06-25 21:01:13 +02:00
Julian Thilo
abb112173e Add callout to docs: 3rd-party libs not supported 2013-06-25 20:52:49 +02:00
Mark Otto
e9951385b0 Merge pull request #8283 from luishdez/hotfix/add-on-breaks
Fix line breaks on add-ons with spaces
2013-06-25 09:37:56 -07:00
Luis Hdez
9ed5b5e653 Fix line breaks on add-ons with spaces 2013-06-25 14:34:57 +02:00
Mark Otto
5fe3de1cb3 Merge pull request #8270 from kylase/3.0.0-wip
Replaced <i> with <span> for glyphicon
2013-06-23 21:26:56 -07:00
Kyle
c455d92f9e Replaced <i> with <span> for glyphicon 2013-06-24 11:27:05 +08:00
Mark Otto
55120d124c Merge pull request #8268 from luishdez/hotfix/sidebar-overlap
Fix overlap sidebar for Tablets and up in docs
2013-06-23 15:16:25 -07:00
Mark Otto
573a197417 Move grid offsets to desktop only (fixes #8229) 2013-06-23 15:15:42 -07:00
Mark Otto
164e88781b Make on previous commits 2013-06-23 15:05:58 -07:00