clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-25 12:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,802 Commits 116 Branches 89 Tags 628 MiB
9ed9fba460
Commit Graph

245 Commits

Author SHA1 Message Date
Mark Otto
9ed9fba460 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-01 19:49:49 -07:00
Mark Otto
526d1399c5 Merge pull request #8348 from Rowno/compiled-font-shorthand 
Prevent the font shorthand from getting compiled as division
 2013-07-01 19:43:15 -07:00
Mark Otto
08b3515fd7 fixes #8345: use inline-block on .img-responsive 2013-07-01 19:42:43 -07:00
Mark Otto
9da90adb4c fixes #8068: add .help-block to form field state mixin 2013-07-01 18:21:19 -07:00
Roland Warmerdam
2e8752b26f Prevent the font shorthand from getting compiled as division 2013-07-01 10:51:08 +12:00
Mark Otto
0682068929 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-27 20:17:59 -07:00
Mark Otto
69b7c5a2af Merge pull request #7995 from hrach/patch-3 
Fixed mixin btn-pseudo-state background for [disabled] buttons
 2013-06-27 20:17:48 -07:00
Mark Otto
5156234c23 update grid col mixin to use latest css from grid cols 2013-06-27 19:54:30 -07:00
Mark Otto
327a951ca3 Move mixin to mixins.less 2013-06-25 13:32:21 -07:00
William Ghelfi
df5ddeb7cc Set validation states also for addons 2013-06-06 21:00:32 -04:00
Mark Otto
19d0726609 Grid updates 
- Removed mixins for generating grid classes
- Thus, we manually declare every grid class, from 1-11 (12th unit is
excluded as that's the same as no grid columns)
- No more need for `.col` base class (yay!)
- Negative indent the rows at tablets and above once again (ugh, still
working through this part)
- Add support for `.col-md` for tablet-specific grid columns
- Still need to figure out offsets, pushes, and pulls on other
devices—right now only available on desktop
 2013-06-02 13:38:45 -07:00
Jan Škrášek
33b5c32c8c Fixed mixin btn-pseudo-state background for [disabled] buttons 2013-05-26 18:14:25 +02:00
Mark Otto
60575dfb46 Gradients refactor 
* Add start and end support to the horizontal gradient as well
* Change all variables from camelCase to use-dashes
* Better comments in the gradients mixins area
* Update current uses of gradients in dropdowns and carousel to specify only two values by direct assignment of variables
 2013-05-25 13:16:15 -07:00
Chad Smith
c47d9932cb Found editor spacing issues with tabs instead of spaces, formatting to fit the entrance criteria 2013-05-21 16:29:35 -04:00
Chad Smith
230d6de88a Vertical gradients now can have percentages passed in as arguments to allow finer control over the backgrounds it produces 2013-05-21 16:25:59 -04:00
Mark Otto
5dd6dbd624 Nuke rem font-size mixin 2013-05-16 20:18:03 -07:00
Mark Otto
1983ca03ec Form validation and horizontal row update 
* changed .row-label to .control-label as used elsewhere already
* changed .formFieldState mixin to .form-field-validation
 2013-05-16 20:17:42 -07:00
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