Mark Otto
43da258bd9
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/examples/hero.html
less/buttons.less
less/carousel.less
less/close.less
less/dropdowns.less
less/labels-badges.less
less/mixins.less
less/navbar.less
less/navs.less
less/pagination.less
less/responsive-navbar.less
less/scaffolding.less
less/sprites.less
less/thumbnails.less
less/type.less
2013-02-05 19:53:44 -08:00
Mark Otto
15c7e73abd
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
2013-02-05 19:39:49 -08:00
Mark Otto
74c8a5611d
Increase margins and line-height on h3; overhaul button dropdown docs
2013-02-05 00:49:54 -08:00
Nikhil Dabas
b7b2e4f8a1
Fixing inline lists for IE7
2013-02-02 02:04:30 +05:30
Mark Otto
d30f47efb2
Tighten up badges docs; less bottom margin on h3
2013-01-19 18:53:41 -08:00
Mark Otto
d9b35c2602
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/css.html
docs/customize.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/scaffolding.html
docs/templates/layout.mustache
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
less/navbar.less
2013-01-17 20:23:33 -08:00
Mark Otto
0df7411362
Derp on type styles a bit more; bring back and fix up more more docs styles
2013-01-16 11:38:34 -08:00
Mark Otto
cb0691d92f
mo betta type margins for headings
2013-01-16 10:57:00 -08:00
Mark Otto
85db846b65
mobile-first navs, navbar, grids, and type
2013-01-15 17:55:14 -08:00
Mark Otto
c34ef69100
add text alignment classes from 3.0
2013-01-15 10:15:02 -08:00
Mark Otto
7d8d5c7838
Merge branch '2.3.0-wip' 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/components.html
docs/css.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/extend.mustache
docs/templates/pages/getting-started.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/buttons.less
less/forms.less
less/navbar.less
less/popovers.less
less/responsive-767px-max.less
less/responsive.less
less/tables.less
less/tooltip.less
less/type.less
less/variables.less
package.json
2013-01-13 04:26:52 -08:00
Mark Otto
4de3a77a64
Fixes #6547 : Make blockquotes use multiple of @baseFontSize
2013-01-11 20:55:09 -08:00
Mark Otto
91dd77939b
Add text alignment utility classes
2013-01-09 18:56:08 -08:00
Patrick H. Lauke
848ca6e315
Basic keyboard accessibility CSS tweaks
...
Mostly doubling-up :hover styles to also cover :focus, as a first step
to making the framework more keyboard-friendly.
Additionally, fixed two small markup issues in the docs/examples to
make the "Learn more" large primary button-styled links
keyboard-focusable (as without href they're treated as non-tabable
anchors).
2013-01-02 22:39:21 +00:00
Mark Otto
d0baa99aed
Remove .text-info and .info form validation states
2012-12-26 14:59:58 -06:00
Mark Otto
e324a1beb0
Simplify syntax of nesting with inline lists
2012-12-10 10:28:18 -08:00
Mark Otto
e34b3730b7
form state vars
2012-11-30 15:38:31 -08:00
Mark Otto
a09cea44ae
more vars changed
2012-11-30 15:27:13 -08:00
Mark Otto
9239bfbc7b
more vars changed, remove @white var
2012-11-30 15:05:23 -08:00
Mark Otto
b0e2b5813d
more consistent variable naming patterns
2012-11-30 14:45:25 -08:00
Mark Otto
7a3d15eb21
Part 1 of unCamelCasing variables
2012-11-30 14:37:24 -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
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
64326322b4
fixes #5725 : hover state for a.muted; also reformatted CSS
2012-10-31 10:46:04 -07:00
Andreas Cederström
233e050adf
Adding .inline for ul and ol
2012-10-26 09:47:55 +02:00
Mark Otto
11ee1633b4
fixes #5257 : add data-original-title attribute selector to abbr element
2012-10-03 09:36:45 -07:00
Mark Otto
3934e55254
remove dupe ff3/4 button fixes; also remove headingscolor var
2012-09-30 23:46:48 -07:00
Mark Otto
a4bf6ef0a0
match decimal placements in type.less
2012-09-23 15:16:13 -07:00
Mark Otto
af871d57c9
fixes #5216 : calculate heading sizes via math rather than fixed pixel amounts
2012-09-22 22:16:12 -07:00
Mark Otto
6c3cd6fd9d
fixes #5212 : text emphasis classes only get hover with links
2012-09-20 09:06:43 -07:00
Mark Otto
3b3def4898
fixes #5087 : add hover states to text emphasis classes for links
2012-09-17 23:19:52 -07:00
Mark Otto
9d5f9eca85
fixes #4909 : add color utility classes .text-warning, etc and document them
2012-09-03 00:47:48 -07:00
Mark Otto
3737904859
fixes #4922 : use basefontsize for realz on .lead
2012-09-02 13:25:03 -07:00
Mark Otto
02f6bd65f5
fixes #4910 : use @baseLineHeight * 1.5 for .lead font-size
2012-09-01 12:00:13 -07:00
Mark Otto
e27b1355b5
fixes #4771 : widen .form-horizontal labels and .dl-horizontal terms given larger font-size of 2.1.0
2012-08-28 10:12:04 -07:00
Mark Otto
f15eb7b499
fixes #4506 : clearfix added to .dl-horizontal to account for empty dd elements
2012-08-26 23:06:56 -07:00
Mark Otto
887f11d47f
fixes #4455 : improve small styles and add to docs
2012-08-19 13:12:43 -07:00
Mark Otto
478396fd4e
remove list-type declarations from ul and ol elements since those should just use browser defaults
2012-07-17 19:11:41 -07:00
Mark Otto
e20d2dfe9d
docs cleanup and blockquote cleanup for .pull-right option
2012-07-15 16:13:25 -07:00
Mark Otto
20676ddd4d
adding getting started page based on Bootstrap University from awhile back, testing out side nav on docs instead of subnav bar
2012-07-08 01:47:36 -07:00
Mark Otto
7cc916d137
Merge branch '21jumpst' into 2.1.0-wip
2012-07-07 00:48:15 -07:00
Mark Otto
19ea4668e5
prevent small tags from increasing height of headings
2012-07-06 10:35:08 -07:00
Mark Otto
3c07eaa251
updates to type scale
2012-07-05 15:11:54 -07:00
Mark Otto
cd2d82150c
standardize top level file comments
2012-06-28 21:46:45 -07:00
Mark Otto
78849cf52e
remove jank fix for dt bold text
2012-06-25 15:09:39 -07:00
