Mark Otto
acde2dc1ee
Nuke third lines form carousel examples
2012-12-20 00:20:00 -08:00
Mark Otto
72f13e2870
Merge branch '2.2.3' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/responsive.less
less/type.less
package.json
2012-12-20 00:02:52 -08:00
fat
bbe4625672
lol we dont' have affix(refresh)
2012-12-19 23:39:26 -08:00
Mark Otto
14844db862
Holy shit, buttons, button states, and input states updated
2012-12-19 23:37:33 -08:00
fat
7f9ff0ba5b
add js support for carousel indicators
2012-12-19 23:25:25 -08:00
Mark Otto
09dde5c84a
Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into cvrebert-3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
less/mixins.less
2012-12-19 23:18:02 -08:00
Mark Otto
afef81c0d7
remove commented out buttons css, update docs
2012-12-19 22:30:08 -08:00
Mark Otto
c38b7206eb
overhaul buttons
2012-12-19 22:25:56 -08:00
Mark Otto
a932476f80
Unfuck the fucked homepage
2012-12-19 22:07:11 -08:00
Mark Otto
65edc9cd6e
Change .jumbotron usage in docs layout to .bs-docs-jumbotron
2012-12-19 21:42:36 -08:00
Mark Otto
b6945a2168
Rename .hero-unit to .jumbotron becaue fuck dashes in filenames and sports metaphors are cooler than ad ones
2012-12-19 21:37:16 -08:00
Mark Otto
2011a0d50f
Drop labels from the docs
2012-12-19 21:29:57 -08:00
Mark Otto
85971ff3e8
Drop .form-search support
2012-12-19 21:12:37 -08:00
Mark Otto
51b1a027da
Merge branch 'bs3-input-groups' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-12-19 21:02:54 -08:00
Mark Otto
19a94d08d6
Remove support for multiple buttons in input groups because fuck that shit.
2012-12-19 19:33:14 -08:00
Mark Otto
529ecc5a77
Version bump
2012-12-10 18:31:04 -08:00
Mark Otto
9d985978a3
Escape HTML of section element
2012-12-10 10:55:42 -08:00
Chris Rebert
8c8a14ab59
document caveat regarding fieldset legend and #6199
2012-12-10 01:46:16 -08:00
Chris Rebert
48759eee94
document fieldset[disabled] styling added in #6199 ; per @mdo
2012-12-10 01:33:02 -08:00
Mark Otto
4245e8ebb5
Fix checkbox and radios example
2012-12-09 22:13:40 -08:00
Mark Otto
6e9bbe6232
Nested columns docs tweaks
2012-12-09 22:08:11 -08:00
Mark Otto
4c82dd3645
Refactor input groups
...
* Deprecate .input-append and .input-prepend
* Use new, single base class for component, .input-group
* Deprecate .addon for .input-group-addon
* For compatibility with all buttons, require .input-group-btn to wrap buttons and button dropdowns
* Still need to reimplement with segmented button dropdowns, but that's dependent on a refactor of those first
2012-12-09 21:46:14 -08:00
Mark Otto
6649918c7f
Merge conflicts
2012-12-08 22:45:39 -08:00
Mark Otto
b5ceca14db
Fix docs typos
2012-12-08 18:46:34 -08:00
Mark Otto
bc0b94a3fd
Merge branch 'master' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/javascript.mustache
less/breadcrumbs.less
less/tables.less
less/tests/css-tests.html
2012-12-08 17:40:42 -08:00
Quy Ton
3bd9a26c01
Apply code tag to data attribute on javascript page
2012-12-08 12:06:46 -08:00
fat
a7eb9c294a
add noConflict functionality to all bootstrap plugins
2012-12-07 17:06:01 -05:00
Mark Otto
be45a821bb
Fixes #6148 : Icons in mini buttons properly aligned
2012-12-07 09:51:01 -08:00
Quy Ton
81679981c5
Escape ×
2012-12-05 15:28:14 -08:00
Mark Otto
be5f31480b
Nuke all i18n tags from .mustache templates
2012-12-05 11:09:02 -08:00
Mark Otto
33e14fe5bf
Merge branch '2.2.2-wip' into 3.0.0-wip
...
Conflicts:
README.md
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/examples/fluid.html
docs/scaffolding.html
less/breadcrumbs.less
less/popovers.less
less/responsive.less
2012-12-05 11:05:10 -08:00
Mark Otto
b3019d7aab
add gallery page, fill with a few screenshots to start
2012-12-04 20:30:21 -08:00
Mark Otto
12916b06aa
Fix up display of dropdown submenu examples on responsive views
2012-12-04 18:25:16 -08:00
Mark Otto
e31c7fb8a5
correct link on index page to grid system
2012-12-04 09:49:18 -08:00
Mark Otto
0f2a423b8d
Once more, update all the favicons to retina
2012-12-03 13:25:56 -08:00
Mark Otto
15a4399015
Align the touch icons attributes
2012-12-03 13:22:10 -08:00
Mark Otto
dd11d0a3fa
move around social buttons
2012-12-01 13:47:07 -08:00
Mark Otto
98b0d475ae
version bump to 3.0
2012-11-30 22:30:50 -08:00
Mark Otto
0947105656
section title change
2012-11-30 17:43:20 -08:00
Mark Otto
51b4de8eec
docs content changed
2012-11-30 16:43:31 -08:00
Mark Otto
6961b284b6
remove responsive image from css docs page
2012-11-30 16:42:48 -08:00
Mark Otto
10c14e8955
first pass at nuking scaffolding
2012-11-30 16:29:30 -08:00
Mark Otto
0fabca01db
Remove more fluid grid stuff
...
* No more fluid layout
* No fluid grid overrides for tables.less
* No more fluid example page
2012-11-30 16:18:40 -08:00
Mark Otto
adc2c779a0
grid vars updated
2012-11-30 15:43:07 -08:00
Mark Otto
e34b3730b7
form state vars
2012-11-30 15:38:31 -08:00
Mark Otto
0a93bc143d
hero unit and pagination vars
2012-11-30 15:36:16 -08:00
Mark Otto
62a2220035
navbar vars
2012-11-30 15:33:56 -08:00
Mark Otto
a09cea44ae
more vars changed
2012-11-30 15:27:13 -08:00
Mark Otto
01421ecd62
remove sprites vars, change zindex vars
2012-11-30 15:23:13 -08:00
Mark Otto
12a00f62a9
remove color variables, swap others were appropro
2012-11-30 15:18:49 -08:00
