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
|
23a7ab4b51
|
icon vertical align in buttons
|
2012-11-05 18:44:10 -08:00 |
|
Mark Otto
|
33beb93e1b
|
new docs css for new icons
|
2012-11-05 18:40:00 -08:00 |
|
Mark Otto
|
b82bc97023
|
update docs and all classes
|
2012-11-05 18:38:59 -08:00 |
|
Mark Otto
|
cea2a701f0
|
adding new fonts and css for glyphicons update
|
2012-11-05 18:36:16 -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 |
|
Mark Otto
|
02c0b788cd
|
Merge pull request #5795 from globocom/missing-i18n-customize-and-download
insert missing i18n tag at customize and download string
|
2012-11-05 17:47:45 -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
|
d38bda1480
|
Fixes #5471: Remove color from .navbar and .navbar-inverse and reassign to .navbar-text to prevent unintended cascading
|
2012-11-04 22:50:07 -08:00 |
|
Mark Otto
|
34880e3ef5
|
Fixes #5596: switch vars in .size mixin
|
2012-11-04 19:59:50 -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
|
91bcccd9a8
|
simplify invalid input css
|
2012-11-04 19:43:09 -08:00 |
|
Mark Otto
|
ebed09ec01
|
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
|
2012-11-04 19:42:13 -08:00 |
|
Mark Otto
|
f3b3814606
|
Merge pull request #5786 from cvrebert/2.2.2-wip
fixes #5494: style invalid fields as invalid regardless of required-ness
|
2012-11-04 19:41:59 -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 |
|
Chris Rebert
|
76f9c9128e
|
fixes #5494: style invalid fields as invalid regardless of required-ness
|
2012-11-04 18:26:25 -08:00 |
|
Mark Otto
|
51f293ba4c
|
Fixes #5662: white-space: nowrap; on code element
|
2012-11-04 13:30:36 -08:00 |
|
Mark Otto
|
075e320a83
|
remove unnecessary bg declarations in buttons per #5684
|
2012-11-04 13:26:03 -08:00 |
|
Mark Otto
|
21957a3d9e
|
set background size for docs jumbotron for retina
|
2012-11-04 13:24:06 -08:00 |
|
Mark Otto
|
953dc3a6f2
|
higher res docs illustrations
|
2012-11-04 13:23:08 -08:00 |
|
Mark Otto
|
fb51efcbd4
|
Fixes #5113: increase .typeahead z-index for proper use with modals
|
2012-11-04 13:01:31 -08:00 |
|
Mark Otto
|
2320a09898
|
fix modals display in docs on tablet view
|
2012-11-04 12:58:57 -08:00 |
|
Mark Otto
|
1af0021014
|
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
less/type.less
|
2012-11-04 12:42:00 -08:00 |
|
Mark Otto
|
22d1506d23
|
remove margin on .inline lists
|
2012-11-04 12:39:27 -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
|
05a2d37559
|
run make after removing responsive css file
|
2012-11-04 00:37:49 -07:00 |
|
Mark Otto
|
25fded1ff4
|
responsive images, updated shadows on navbars, remove responsive file from docs
|
2012-11-04 00:31:43 -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
|
a12eb2b9f5
|
rgba() tooltip bg
|
2012-11-03 13:44:55 -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
|
2c93190283
|
Fixes #5776: Reside white-space for popovers
|
2012-11-03 13:42:08 -07:00 |
|
Mark Otto
|
a8b9342aea
|
Fixes #5739: Port in HTML5 BP print styles
|
2012-11-03 13:37:34 -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 |
|
Mark Otto
|
2f39f86bd7
|
Merge pull request #5777 from bradly/change-example-emails-in-docs
Change example email addresses to use RFC 2606 reserved example domain.
|
2012-11-03 13:12:02 -07:00 |
|
Bradly Feeley
|
381d967ec8
|
Change example email addresses to use RFC 2606 reserved example domain.
|
2012-11-03 12:15:01 -06:00 |
|