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
|
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
|
12916b06aa
|
Fix up display of dropdown submenu examples on responsive views
|
2012-12-04 18:25:16 -08:00 |
|
Mark Otto
|
fca35c0dba
|
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/alerts.less
less/button-groups.less
less/buttons.less
less/tests/css-tests.html
|
2012-11-30 00:13:30 -08:00 |
|
Mark Otto
|
acc037de15
|
add holder and replace placehold.it
|
2012-11-29 20:59:14 -08:00 |
|
Mark Otto
|
fa1c130552
|
Change important badges/labels to danger
|
2012-11-15 09:17:11 -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
|
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
|
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
|
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 |
|
Bradly Feeley
|
ed5c5994a7
|
Fixing typo in docs.
|
2012-10-13 18:31:41 -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 |
|
Mark Otto
|
1b814458c9
|
improve dropdown submenu docs; add docs for left submenu; remove all dupe css for left submenu
|
2012-10-01 16:41:13 -07:00 |
|
Mark Otto
|
86d5ed6f4f
|
fixes #5377: change selectors for navbar collapse to be unique so only one open/closes at a time
|
2012-10-01 13:52:50 -07:00 |
|
Mark Otto
|
eb555b7a9d
|
remove .nav-list, instead use .nav-stacked on .nav-tabs or .nav-pills from now on
|
2012-10-01 00:06:44 -07:00 |
|
Mark Otto
|
26386ad615
|
remove tabbable tabs on left, right, and bottom; instead, from here out use stacked pills or tabs
|
2012-10-01 00:05:18 -07:00 |
|
Mark Otto
|
ecbf1159a4
|
remove .dividers from breadcrumbs, instead use :after and content
|
2012-09-25 22:57:20 -07:00 |
|
Mark Otto
|
c59e5251e1
|
initial pass at removing navbar-inner from .navbar component
|
2012-09-25 22:48:02 -07:00 |
|
Mark Otto
|
f12946be5a
|
thumbnails cleanup: no more UL or LI elements needed, instead just use standard grid markup
|
2012-09-25 22:40:48 -07:00 |
|
Mark Otto
|
443c43f6c4
|
fixes #5102, #5166, #5194, #5205: add overflow: visible; to .nav-collapse.collapse so that dropdowns overflow correctly in the navbar in IE7-8
|
2012-09-20 10:28:27 -07:00 |
|
Mark Otto
|
2d90c816ac
|
add new vars for common border-radius, upping border-radius of inputs to 4px; add border-radius changes to -large, -small, -mini for buttons and paginations
|
2012-09-18 21:16:08 -07:00 |
|
Mark Otto
|
2769241aeb
|
add new vars for common font-sizes and paddings with large, small, and mini components; resize pagination and buttons to better match each other
|
2012-09-18 20:56:20 -07:00 |
|
Mark Otto
|
37460e58d3
|
Merge branch '2.1.2-wip' of https://github.com/uberspeck/bootstrap into uberspeck-2.1.2-wip
|
2012-09-18 14:58:39 -07:00 |
|
Mark Otto
|
26ca131a95
|
Merge branch 'wpbrains-media-component' into 2.1.2-wip
|
2012-09-17 18:15:44 -07:00 |
|
Mark Otto
|
143fef9f95
|
overhaul the docs and css to merge into 2.1.2 since this was against master
|
2012-09-17 18:15:39 -07:00 |
|
Martin Bean
|
2ead9a5bc3
|
Standardized spelling of 'JavaScript'; added icons to file trees
|
2012-09-14 14:06:15 +01:00 |
|
Brian Campbell
|
2c8eff0eec
|
Updated pagination to support .pagination-large, .pagination-small, .pagination-mini matching button sizes. Updated related docs.
|
2012-09-12 14:10:03 -06:00 |
|
Mark Otto
|
61332d727e
|
fixes #5020: submenu support in dropup
|
2012-09-07 11:34:05 -07:00 |
|
Mark Otto
|
1c9d5c43b0
|
fixes #4640: pagination span issues resolved by scoping selectors to appropriate children, not all children; clarify docs on use of spans for disabled and active links
|
2012-08-27 10:56:46 -07:00 |
|
Mark Otto
|
f744ad57fc
|
fixes #4676 manually: example html updated
|
2012-08-25 22:31:10 -07:00 |
|
Mark Otto
|
099cec1ca7
|
fixes #4493: typo in dimiss alerts docs
|
2012-08-21 13:00:40 -07:00 |
|
Mark Otto
|
6cf3752b9b
|
fix ie7 dropdowns examples in docs
|
2012-08-20 12:16:15 -07:00 |
|
Mark Otto
|
2fda6a45aa
|
bump up height of progress bars, give some extra depth with stacking bars, and then make the stacked bars actually work
|
2012-08-20 11:22:37 -07:00 |
|
Mark Otto
|
e4d4ef43b0
|
copy change for previous commit
|
2012-08-19 20:38:27 -07:00 |
|
Mark Otto
|
e71e2b4be2
|
fixes #4460 and #4461: copy change for opera animations support
|
2012-08-19 20:38:16 -07:00 |
|
Mark Otto
|
077577c7f3
|
fixes #4421: add static top navbar class
|
2012-08-17 11:46:23 -07:00 |
|
Mark Otto
|
b8715ddfd0
|
fixes #4417: proper height on thumbnail placeholder image
|
2012-08-17 11:27:11 -07:00 |
|
Jacob Thornton
|
dee57462e2
|
get affix actually working and update docs
|
2012-08-14 21:06:08 -07:00 |
|
Mark Otto
|
97a23ef2e6
|
fixes #4342: navbar vars not in use, render navbar dividers
|
2012-08-13 22:57:40 -07:00 |
|
Henning Hoefer
|
a74457a203
|
Fixed a typo in inverse navbar code sample
|
2012-08-14 02:10:07 +02:00 |
|
Ben Oakes
|
e31f06b857
|
Fix wording (presumed typo)
|
2012-08-13 13:22:08 -05:00 |
|
Mark Otto
|
9f8ce77751
|
running make on previous changes
|
2012-08-13 10:05:19 -07:00 |
|
Mark Otto
|
c2e899f2a0
|
remove the canvas slider doodad
|
2012-08-01 19:00:25 -07:00 |
|
Mark Otto
|
9795e9bbe6
|
place chevrons first in sidenav in docs, fix ie7 bugs for said sidenav
|
2012-07-30 23:48:26 -07:00 |
|