Commit Graph

106 Commits

Author SHA1 Message Date
Mark Otto 2b37d2b533 Update and document use of `small` in headings 2013-08-23 14:22:51 -07:00
Chris Rebert 9a4fbde461 add variables for heading font sizes; fixes #9921 2013-08-20 17:49:23 -07:00
Mark Otto e293873484 smaller h1 and h2 2013-08-18 21:49:05 -07:00
Mark Otto 96136dbb56 Merge branch 'pullright' of https://github.com/liuyl/bootstrap into liuyl-pullright
Conflicts:
	dist/css/bootstrap.min.css
2013-08-05 12:20:52 -07:00
Mark Otto 6af693d160 Fixes #8770: mobile-first (stacked by default) horizontal dls 2013-08-05 09:10:52 -07:00
liuyl efac0bf8d6 make pull-right !important 2013-07-28 14:05:47 +08:00
Mark Otto 8349236f8c Twerk lead font-size for mobile devices 2013-07-26 21:12:48 -07:00
syed 1b8ba0d159 move things around :)
Moved pager, pagination, popovers, tooltip, progress bars & type
properties to variables.less
2013-07-26 17:04:15 +05:00
Mark Otto 210ee63693 Fixes #8586: add addional color text classes to apply all of branch colors easily 2013-07-26 00:18:18 -07:00
Chris Rebert 90fb40b707 twbs ALL the links 2013-07-25 12:24:13 -07:00
Mark Otto 8aa3c375f0 No more left margin on dd elements, fixes #8567 2013-07-23 10:18:34 -07:00
Chris Rebert 86efc140e2 add comments to gloss Unicode codepoint hex 2013-07-18 11:49:39 -07:00
liuyl 0d5c3c2ecf simplify type.less 2013-07-09 09:22:36 +08:00
Mark Otto 61823dbff1 Move `hr` to scaffolding.less (out of type.less) and simplify styles 2013-07-05 14:21:05 -05:00
Mark Otto 2a47037ab0 Fixes #8266: remove unnecessary `strong` and `em` styles 2013-06-23 10:24:50 -07:00
Luis Hdez cd09f3213b Add heading font family variable 2013-06-20 12:50:30 +02:00
Mark Otto 37f4a25be4 Better clearing on `.dl-horizontal` for empty `dd` elements
Instead of clearing the entire `.dl-horizontal`, we've moved the
clearfix mixin to the `dd` level to solve two problems in one: empty
`dd`s mid-list, and empty `dd` as the last child.

Addresses a few old issues, including #2824, #3819, #3821, #4062,
#6707, and #7180.

Sorry that took so long :D.
2013-06-17 14:21:16 -07:00
Mark Otto 4436e727ed Properly unstyle the `.list-unstyled` class by switching from `margin` to `padding`
Also add better comments
2013-06-17 14:21:16 -07:00
Mark Otto 84c0dc13ba Remove explicit, unncessary `line-height` on `li` elements 2013-06-17 14:21:16 -07:00
Mark Otto 731cbb302e Better base `ul` and `ol` styles
Turns out we were nixing the default browser spacing for bullets and
numbers, so this reverts that and instead just twerks the top/bottom
`margin`.
2013-06-17 14:21:16 -07:00
Mark Otto 28a081cb20 Overhaul form control and button sizing, and some type styles
* New padding approach with separate horizontal and vertical padding
variables
* Improved sizing in large and small buttons and form controls
* Dropped the `.btn-mini` (since we have no `.input-mini` to match, and
holy fuck those were small buttons)
* Dropped the `.pagination-mini` as well because once again, to hell
with such small components
* Changed `@line-height-headings` to `@headings-line-height`
* Removed the `@headings-font-family` because it was honestly kind of
useless
2013-05-14 23:21:30 -07:00
Mark Otto 6fba68eb8b Unitless line-height
* Instead of 20px as @line-height-base, use 1.5
* Update typographic scale for headings to use unitless as well--required some twerking of decimals a bit and some rounding
* Introduce new @line-height-computed value, which takes base font-size and multiplies it by 1.5, for use in padding and margin on components
2013-05-09 17:20:46 -07:00
Mark Otto e0d60b1325 Fixes #7617: lowercase and dash gray color vars 2013-04-21 19:35:36 -07:00
Mark Otto afdab35aca Fixes #7640: only reset margin on last-child p within blockquotes 2013-04-20 12:09:08 -07:00
Mark Otto 8e59357bc5 Merge branch 'SBoudrias-patch-1' into 3.0.0-wip
Conflicts:
	less/type.less
2013-03-31 18:39:49 -07:00
Mark Otto 388a4c878d remove lingering rem 2013-03-31 13:20:54 -07:00
Mark Otto fc16e37aaa Remove the handful of rem font-sizes 2013-03-31 11:26:13 -07:00
Mark Otto 9fff2d3fb6 Change error to danger for all classes; add panels component 2013-03-30 14:15:18 -07:00
Mark Otto aee25786a7 fuck everything about .clear_float() -- restore .clearfix() as mixin 2013-03-30 13:23:18 -07:00
Mark Otto 601013ca04 drop .muted for .text-muted 2013-03-30 00:11:38 -07:00
Mark Otto f0f33eb9a3 Refactor .list-inline and .list-unstyled
* Instead of shared and separate CSS, isolate by class for easier mixin-ability
* .list-unstyled is now used as a mixin in .list-inline
2013-03-27 15:42:11 -07:00
Mark Otto ca31f060a8 New grid classes 2013-03-26 17:12:17 -07:00
Simon Boudrias cae90f3010 Remove `text-rendering` 2013-03-17 17:22:26 -03:00
Mark Otto 6012d8221b Exploring rems as font-size unit
* Added a new mixin to calculate rems and pixels for IE fallback
* Updated the body, p, and .lead elements to use the new .font-size() mixin
* New mixin has default value of 14px or 1.4rem
* Still needs exploration, and change this means lots of work rejiggering margins and line-heights
* Related, started to reorganize the mixins a bit to call out mixins that are used by the framework and not utilities or snippets
2013-03-17 11:33:07 -07:00
Mark Otto ecfdecea00 Use translucent box shadow on hr elements; colorize hr elements within alert components 2013-03-14 23:01:23 -07:00
Andrew Stilliard 706dd8c045 Additional heading font-size classes
This relates to changes in issue #7284
2013-03-15 02:11:37 +00:00
Luke Page 5054c17ab8 make less files compile with strict maths in 1.4.0 2013-03-06 16:38:20 +00:00
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