Mark Otto
|
57eed7867b
|
merge in latest
|
2012-11-05 19:00:34 -08:00 |
|
Mark Otto
|
9d1eefa4fb
|
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
|
2012-11-05 18:44:22 -08:00 |
|
Mark Otto
|
b82bc97023
|
update docs and all classes
|
2012-11-05 18:38:59 -08:00 |
|
Mark Otto
|
c0bbe1692c
|
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
less/variables.less
|
2012-11-05 18:27:25 -08:00 |
|
Alexandre Magno
|
0a1d296e19
|
insert missing i18n tag at customize and download string
|
2012-11-05 18:38:59 -02:00 |
|
Mark Otto
|
79b7017227
|
version bump
|
2012-11-05 09:32:48 -08:00 |
|
Mark Otto
|
ee93541421
|
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
less/buttons.less
less/forms.less
|
2012-11-04 19:59:07 -08:00 |
|
Mark Otto
|
62c78e46f8
|
more required input tweaks
|
2012-11-04 19:53:13 -08:00 |
|
Mark Otto
|
823b5accd3
|
start documenting html5 invalid form fields
|
2012-11-04 19:41:41 -08:00 |
|
Mark Otto
|
7e6cc0bf7e
|
Fixes #5785: allow for segmented button groups in input groups
|
2012-11-04 19:08:02 -08:00 |
|
Mark Otto
|
2320a09898
|
fix modals display in docs on tablet view
|
2012-11-04 12:58:57 -08:00 |
|
Mark Otto
|
508cc1fef4
|
change up list classes to use .list- prefix
|
2012-11-04 12:38:35 -08:00 |
|
Mark Otto
|
269be76f4a
|
Merge branch '2.2.2-wip' into exploratory
|
2012-11-04 12:37:44 -08:00 |
|
Mark Otto
|
28da31218f
|
Refine new inline list option
|
2012-11-04 12:36:37 -08:00 |
|
Mark Otto
|
68f26d959f
|
Merge branch '2.1.2-list-inline' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-list-inline
|
2012-11-04 12:27:30 -08:00 |
|
Mark Otto
|
e4866c4b3c
|
clarify unstyled lists docs
|
2012-11-04 12:27:18 -08:00 |
|
Mark Otto
|
83a3789b5e
|
add justified nav links for tabs and pills
|
2012-11-04 00:52:10 -07:00 |
|
Mark Otto
|
3de6f3ff88
|
Swap old icons for new in docs
|
2012-11-03 16:18:02 -07:00 |
|
Mark Otto
|
a56de2b84f
|
Merge branch 'glyphicons_font' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
less/sprites.less
|
2012-11-03 16:15:54 -07:00 |
|
Mark Otto
|
c0eacca0db
|
Navs refactor, restoring .nav-list
|
2012-11-03 16:14:44 -07:00 |
|
Mark Otto
|
a249d1c8ee
|
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/scaffolding.html
docs/templates/pages/scaffolding.mustache
|
2012-11-03 13:44:01 -07:00 |
|
Mark Otto
|
5d6cf2ee19
|
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
|
2012-11-03 13:43:23 -07:00 |
|
Mark Otto
|
c9dbd2d601
|
Fixes #5458: Clarify fluid nesting
|
2012-11-03 13:28:48 -07:00 |
|
Mark Otto
|
72e2d4bb77
|
Merge pull request #5766 from bradly/spelling-fixes-in-docs
Fixing various spelling typos in the docs.
|
2012-11-03 13:20:06 -07:00 |
|
Mark Otto
|
7ea343d570
|
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
|
2012-11-03 13:19:53 -07:00 |
|
Mark Otto
|
ead5dbeba5
|
Fixes #5775: Collapse labels/badges
* When :empty, display: none;
* Add documentation for change in behavior
|
2012-11-03 13:18:23 -07:00 |
|
Bradly Feeley
|
381d967ec8
|
Change example email addresses to use RFC 2606 reserved example domain.
|
2012-11-03 12:15:01 -06:00 |
|
Bradly Feeley
|
46b5e0cbc6
|
Fixing various spelling typos in the docs.
|
2012-11-02 16:34:21 -06:00 |
|
Mark Otto
|
fc42ac6a56
|
fixes #5756: duplicate media CSS in compiled builds
|
2012-11-02 09:47:42 -07:00 |
|
Mark Otto
|
1477e081d4
|
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/getting-started.html
docs/templates/pages/getting-started.mustache
less/accordion.less
less/alerts.less
less/breadcrumbs.less
less/buttons.less
less/code.less
less/dropdowns.less
less/forms.less
less/navbar.less
less/progress-bars.less
less/responsive-navbar.less
less/tables.less
less/thumbnails.less
less/tooltip.less
less/wells.less
|
2012-11-02 09:36:51 -07:00 |
|
Mark Otto
|
72198a59c0
|
removing glyphicons images, swapping in new icon font with new classes
|
2012-11-02 01:20:06 -07:00 |
|
Mark Otto
|
bf48c31406
|
Merge branch 'bradly-affix-docs-fix' into 2.2.2-wip
|
2012-10-31 10:48:44 -07:00 |
|
fat
|
3b3dd3ac3c
|
2.2.1 - hotfix for carousel
|
2012-10-30 21:59:56 -07:00 |
|
Bradly Feeley
|
cbf1dace2f
|
Fixing typos in affix options area in the docs.
|
2012-10-30 11:46:18 -07:00 |
|
Mark Otto
|
9352fe1750
|
add a ton of the new vars to the customizer
|
2012-10-29 21:30:39 -07:00 |
|
Mark Otto
|
81c3c1c68c
|
add media.less to customizer page
|
2012-10-29 21:02:05 -07:00 |
|
Mark Otto
|
41ad16fe40
|
v2.2.0 instead of v2.1.2
|
2012-10-29 21:00:53 -07:00 |
|
Andreas Cederström
|
233e050adf
|
Adding .inline for ul and ol
|
2012-10-26 09:47:55 +02:00 |
|
Mark Otto
|
c33169a6ba
|
fixes #5572: document .input-block-level
|
2012-10-18 11:19:16 -07:00 |
|
Jacob Thornton
|
ac6625de5f
|
add updater function and rebuild
|
2012-10-17 21:37:34 -07:00 |
|
Mark Otto
|
e0a007b929
|
Merge pull request #5507 from bradly/2.1.2-wip
Fixing typo in docs.
|
2012-10-16 20:36:26 -07:00 |
|
Mark Otto
|
57eb2a8018
|
more hellip on modals
|
2012-10-16 20:28:07 -07:00 |
|
Mark Otto
|
0ac50d28b5
|
fixes #5519: hellip in modal code
|
2012-10-16 20:18:50 -07:00 |
|
Mark Otto
|
bf78333531
|
add in latest carousel example, reorg examples on getting started
|
2012-10-16 12:50:10 -05:00 |
|
Mark Otto
|
463eae25b0
|
clarify js docs individual or compiled section
|
2012-10-16 12:37:36 -05:00 |
|
Bradly Feeley
|
ed5c5994a7
|
Fixing typo in docs.
|
2012-10-13 18:31:41 -07:00 |
|
Mark Otto
|
e73cd15fc8
|
copy and style changes to improve docs rendering on mobile devices
|
2012-10-02 17:01:18 -07:00 |
|
Mark Otto
|
7732d8b9b0
|
Merge branch '2.1.2-wip' into exploratory
|
2012-10-02 15:41:31 -07:00 |
|
Mark Otto
|
a2369021ce
|
fixes #5352: update docs messaging for disable nav links
|
2012-10-02 15:10:22 -07:00 |
|
Mark Otto
|
4ab7b77aa3
|
Merge branch '2.1.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/labels-badges.less
less/navbar.less
less/tables.less
|
2012-10-01 23:41:00 -07:00 |
|