0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Commit Graph

278 Commits

Author SHA1 Message Date
Mark Otto
76ecfdfdc1 Font-size and line-height tweaks
* Use 1.428 for line-height instead of 1.5
* Use  function for full pixel values instead of decimals
2013-05-10 10:33:35 -07:00
Aaron
94cc333553 Fix component margin and padding values to use @line-height-computed 2013-05-10 09:21:27 -06:00
Mark Otto
d7f84d1220 Require .btn-default for regular buttons
* Instead of , use  for standard, gray button
* Improves ability to customize buttons by encouraging folks to not override .btn and thus overriding all button modifier classes
* Updates docs to reflect the change
* Reorganize buttons CSS
2013-05-07 18:07:06 -07:00
Mark Otto
0f17f9b7f7 Fixes #7744: update grid mixin to use latest grid styles 2013-04-30 13:03:10 -07:00
Mark Otto
efd3b0c171 Back to two grid classes, .col and .col-lg-* 2013-04-26 23:59:51 -07:00
Chris Rebert
269b8aa761 Fixes #7661 2013-04-22 16:11:11 -07:00
Mark Otto
4b3a43e381 Fixes #7591: add .make-small-column() mixin 2013-04-20 15:54:44 -07:00
Mark Otto
a8391da414 Update mixins to remove Opera prefixes on gradients; reorder rules for consistency 2013-04-18 12:46:31 -07:00
Mark Otto
c2a35f1ec8 Merge pull request #7148 from retlehs/3.0.0-wip
Remove -webkit-backface-visibility on skew mixin
2013-04-07 23:01:28 -07:00
Mark Otto
eadfa59d92 Add small grid for phones and tablets 2013-04-02 19:40:43 -07:00
Mark Otto
2cd34a1a85 Fixes #7462: add radial-gradient spec to mixin 2013-04-02 14:48:45 -07:00
Mark Otto
eac987c0d2 only negative indent nested grid rows; add new grid example 2013-04-01 12:55:48 -07:00
Mark Otto
c5042e050e fix nav divider 2013-03-31 17:17:10 -07:00
Mark Otto
aee25786a7 fuck everything about .clear_float() -- restore .clearfix() as mixin 2013-03-30 13:23:18 -07:00
Mark Otto
8d8f4e0cdd Merge pull request #7375 from thomas-mcdonald/fix-filter-gradient
Fix horizontal-three-colors to a horizontal filter gradient
2013-03-30 13:17:45 -07:00
Mark Otto
ca31f060a8 New grid classes 2013-03-26 17:12:17 -07:00
Thomas McDonald
f8b9e428f0 Give horizontal-three-colors a horizontal filter gradient
Previously the filter had GradientType=0, which would render a vertical
gradient rather than the horizontal one implied by name
2013-03-23 19:21:37 +00:00
Mark Otto
4aba489cfd Remove all #font mixins; replace single instance of its use in Bootstrap with the @font-family-monospace variable 2013-03-17 11:34:27 -07: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
ef4898990f convert to preboot's retina mixin 2013-03-16 17:19:05 -07:00
Mark Otto
71d4b5b6e7 Merge branch '3.0.0-wip' of https://github.com/dannykeane/bootstrap into dannykeane-3.0.0-wip 2013-03-16 17:06:20 -07:00
Mark Otto
efbf8373a5 Use form elements in checkbox and radio button groups
* Uses .btn on label elements with nested checkbox and radio controls within
* Updated examples to reflect change in HTML and CSS
* Had to add .active all buttons for proper state highlighting (mimicing the :active pseudo state)
* Still needs JavaScript plugin updated by @fat
2013-03-16 12:34:07 -07:00
Mark Otto
bb38fa5286 Overhaul the grid system and its docs
* Add new grid mixins adapted from Preboot (http://github.com/mdo/preboot)
* Drop the @grid-row-width and @grid-column-width variables
* Add the @grid-float-breakpoint variable, as used in Preboot
* Add support for .push* and .pull* classes for column ordering manipulation
* Document all the things
2013-03-15 23:21:10 -07:00
Luke Page
5054c17ab8 make less files compile with strict maths in 1.4.0 2013-03-06 16:38:20 +00:00
Ben Word
ee5c7d7ece Remove -webkit-backface-visibility on skew mixin
Ref #5319 - This rule is causing pixelated edges on iOS. Removing
it makes everything smooth across all OS's, browsers, and devices.
2013-03-04 13:03:05 -06:00
Mark Otto
b19eb88b5a Fixes #6935: Use standard decimal points for .opacity() mixin 2013-02-28 19:46:49 -08:00
Danny Keane
e8dc036d25 Added retina image support mixin 2013-02-11 18:23:21 -08:00
Mark Otto
1b2b049ef8 Fixes #6841: Add new Firefox placeholder, comments 2013-02-08 08:32:29 -08:00
Mark Otto
421f9f67c4 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	js/bootstrap-popover.js
	less/mixins.less
	less/tooltip.less
2013-02-05 22:42:54 -08:00
fat-kun
042bb9b515 Merge pull request #6780 from agatronic/2.3.0-wip
less: Move to new selector interpolation, supported from 1.3.1
2013-02-05 21:29:59 -08:00
Mark Otto
28e1702052 nuke rogue conflict comment and remake 2013-02-05 19:59:02 -08: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
0a3e3a50fe Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
2013-02-04 11:12:09 -08:00
Mark Otto
9480eb89cb Revamp button mixins and pseudo states
* Remove .darken-button-states and .buttonBackground mixins (latter wasn't being used anyway)
* Create new .btn-pseudo-states mixin for setting button background and border colors for default and pseudo states
2013-02-02 19:16:15 -08:00
Luke Page
6b9bb547bf Move to new selector interpolation, supported from 1.3.1 2013-02-02 07:58:27 +00:00
Mark Otto
94e256c016 Refactor navbar dividers
* Instead of .divider-vertical, use .divider
* Makes use of .nav-divider mixin
* Dividers are horizontal to start, matching the default state of navbar nav links
* Dividers become vertical above 768px via media queries
2013-02-01 22:56:09 -08:00
Mark Otto
8f0bc9e79b Merge branch 'dospuntocero-master' into 2.3.0-wip 2013-02-01 21:41:13 -08:00
Francisco arenas
2428904b4b Update less/mixins.less
horizontal three color gradient added
2013-01-24 03:37:52 -02:00
Mark Otto
01b32f472d Simplify and bring back the grid mixin for generating spans and offsets 2013-01-17 10:49:10 -08:00
Mark Otto
9ba14cfb7c More navbar derping 2013-01-16 16:14:41 -08:00
Mark Otto
85db846b65 mobile-first navs, navbar, grids, and type 2013-01-15 17:55:14 -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
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
Tunghsiao Liu
3096a377a2 Add transition-duration mixin 2012-12-28 16:19:12 +08:00
Mark Otto
dc5c6d6be8 Simplify form validation states while enabling them to be applied to one field at a time. 2012-12-26 15:57:52 -06:00
Mark Otto
2ef4fde09f Drop .input-block-level modifier as inputs are already width: 100%; 2012-12-26 14:19:48 -06:00
Mark Otto
14844db862 Holy shit, buttons, button states, and input states updated 2012-12-19 23:37:33 -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
a27952efd0 Unfuck the fucked gradient with it's fucked mix() of background colors; nuke commented out code 2012-12-19 23:12:38 -08:00
Mark Otto
9b4e5746a4 More button tweaks 2012-12-19 22:54:04 -08:00
Mark Otto
c38b7206eb overhaul buttons 2012-12-19 22:25:56 -08:00
Mark Otto
840e47eabd Update clearfix mixin and class per @necolas's feedback 2012-12-19 17:49:20 -08:00
Chris Rebert
3b5d4f52a3 fixes #5605: style as disabled all form controls & btns under a disabled fieldset
this is a resubmission of #5875, but now against branch 3.0.0-wip
does not exclude elements under a fieldset's legend
issue #6058 is a duplicate of #5605
2012-12-09 23:42:05 -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
30d6a71ccd Revert vertical gradient spec to 'to bottom' as 'top' doesn't work in IE10 2012-12-02 20:40:24 -08:00
Mark Otto
19ee7999f4 remove single corner border-radius mixins 2012-12-01 14:25:28 -08:00
Mark Otto
adc2c779a0 grid vars updated 2012-11-30 15:43:07 -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
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
7313702cf3 Inputs now 100% width by default
* Includes text inputs, selects, and textareas
* Updated docs to include .span* sizes wherever possible
* Commented out responsive 1200px inputs grid
* Still some derp to be done to improve more, but this is a decent first stab
2012-11-30 00:53:07 -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
dc10e6bbf8 Fixes #5935: Updated vertical gradient mixin 2012-11-28 00:19:35 -08:00
Mark Otto
7e56e2265d Merge branch '2.2.2-wip' into exploratory
Conflicts:
	less/button-groups.less
2012-11-22 22:04:21 -08:00
Mark Otto
88c2497368 Fixes #5912: User correct selector for form field states.
Previously, we were using a generic label selector, but as this was changed in the main forms awhile back, we need to change it here.
2012-11-16 01:16:27 -08:00
Mark Otto
34880e3ef5 Fixes #5596: switch vars in .size mixin 2012-11-04 19:59:50 -08: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
d36e37214b fixes #5319: add backface-visibility for webkit skewing 2012-10-01 15:26:17 -07:00
Mark Otto
8da78223ff reset input and button heights with updated padding 2012-10-01 00:19:29 -07:00
Mark Otto
ecf6077f48 remove table grid sizing, it can use the new default grid columns instead 2012-09-30 23:59:35 -07:00
Mark Otto
c82b9d1e7c remove gradientbar mixin 2012-09-30 23:54:35 -07:00
Mark Otto
3f2938948d remove more ie7 css hacks 2012-09-30 23:20:43 -07:00
Mark Otto
443b605246 remove -moz-box-shadow from .box-shadow() mixin, but keep -webkit since that's needed for most iOS and Android mobile browsers 2012-09-30 23:17:07 -07:00
Mark Otto
9872902e47 remove .border-radius mixin and replace with standard border-radius property, since -webkit-* and -moz-* are only needed for older versions 2012-09-30 23:11:54 -07:00
Mark Otto
0cd186183c add comment for filter opacity browser requirements 2012-09-30 22:54:44 -07:00
Mark Otto
840cad69af remove translucent bg mixin 2012-09-30 22:52:32 -07:00
Mark Otto
6b578ec8de move mixins that generate css to utilities.less with different class names, but the same mixins 2012-09-26 08:59:57 -07:00
Mark Otto
f0b4f05a27 remove ie7 support from mixins 2012-09-25 22:02:29 -07:00
Mark Otto
ce19e63d5b Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/base-css.html
	docs/templates/pages/base-css.mustache
	less/forms.less
	less/mixins.less
2012-09-25 22:00:41 -07:00
Mark Otto
527d01ce99 headway, cleanup, and tests 2012-09-25 15:01:03 -07:00
Mark Otto
c92a75999f fixes #5127: add @inputHeight to replace static instances of '30px' throughout forms 2012-09-20 11:45:59 -07:00
Mark Otto
67585bd34e fixes #5211 manually: spacing in mixins to match others 2012-09-20 09:07:48 -07:00
Mark Otto
6881c193ca fixes #5039: properly set .row-fluid margins for .controls-row 2012-09-17 16:09:36 -07:00
Mark Otto
537c5cc33d use local var for a few other .box-shadow mixins to fix CSS not compiling 2012-09-12 16:18:52 -07:00
Mark Otto
65d322958c add space 2012-09-12 16:11:03 -07:00
Mark Otto
38303dd997 revert the js evaluation in .box-shadow mixin, fix last mixin usages to escape if using >1 shadows 2012-09-12 15:53:29 -07:00
Mark Otto
7110b243f5 more tests and experiments 2012-09-10 10:11:02 -07:00
Mark Otto
dd1bce2611 latest tweaks to grid classes for forms 2012-09-08 12:50:37 -07:00
Mark Otto
7e29581210 Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts:
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache
2012-09-07 22:34:51 -07:00
Mark Otto
a1d2ee6542 fixes #4885: correct use of skew in .skew() mixin for FF 2012-09-04 11:08:08 -07:00
Mark Otto
f25129361b add comment to go with updated box-shadow mixin 2012-09-03 01:04:53 -07:00
Mark Otto
f46813a8c8 Merge pull request #4763 from Luis-TP/2.1.1-wip
Improve .box-shadow mixin by utilizing regex function to no longer require escaping
2012-09-03 01:03:37 -07:00
Mark Otto
0b122bc5c5 remake the box-size grid, nuke fluid grid docs, fix up examples, clean up form styles 2012-08-28 13:33:06 -07:00
Mark Otto
7d412b1e14 fixes #4741: undo previous version's attempt at firefox gradient changes and add gradient tests 2012-08-27 21:18:55 -07:00
Luis Aleman
96a1797af1 No longer need to write box-shadows in full when using lighten or other functions 2012-08-27 19:13:11 -04:00
Luis Aleman
1b7a3ca416 Changed box-shadow mixin to accept infinite, comma separated, shadows 2012-08-27 19:10:20 -04:00
Mark Otto
85dcbd0b34 add min-height: 1px; to .span* classes to prevent grid columns from collapsing 2012-08-27 15:12:22 -07:00