2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-18 12:39:41 +03:00
Commit Graph

384 Commits

Author SHA1 Message Date
Mark Otto 556d6cef3e Fixes #10941: Fix Glyphicons path for those importing bootstrap.less from another directory 2013-12-01 00:20:47 -08:00
Mark Otto 53047fa587 Merge branch 'master' into pr/11536
Conflicts:
	dist/css/bootstrap.min.css
2013-11-30 23:35:56 -08:00
Mark Otto 48269dcd28 Fixes #11658: Increase min-height of .radio and .checkbox for horizontal forms to ensure alignment of content below 2013-11-30 23:17:43 -08:00
Mark Otto 841da88f3f Remove browser default top margin from dl elements 2013-11-30 23:08:41 -08:00
Mark Otto cf40b5db60 Fixes #11623: Reset position to static for grid columns within tables to unfuck borders in IE9/10 and Firefox 2013-11-30 23:04:55 -08:00
Mark Otto 22da6fcfb2 grunt 2013-11-30 21:17:53 -08:00
Mark Otto 6bc09dd949 Fixes #11268: Account for badges within buttons by matching background to text color and text color to background 2013-11-30 16:29:52 -08:00
Mark Otto 67d4e3323d Fixes #11277: Drop the abbr element from the .initialism selector 2013-11-30 16:18:07 -08:00
Mark Otto 7aa6b4190b Fixes #11402: Set width: auto; to select.form-control within .form-inline 2013-11-30 15:57:25 -08:00
Mark Otto d2f8b5327b Fixes #11515: Reorder the headings with body text and text emphasis classes 2013-11-30 14:58:35 -08:00
Mark Otto 21e2ae9489 Fixes #11544: Add color: inherit; to .panel-title to ensure proper text color when customizing @headings-color 2013-11-30 14:53:54 -08:00
Mark Otto 82bbccde9b Merge branch 'master' into pr/11648
Conflicts:
	dist/css/bootstrap.min.css
	less/grid.less
2013-11-30 13:09:55 -08:00
Mark Otto 853b69f2df Fixes #11351: Correct grid class reset on input groups by using attribute selector, not an old class from v3 betas 2013-11-30 12:52:08 -08:00
Mark Otto a52e528d27 Fix up new margins on modals by not setting auto until screen-sm-min 2013-11-30 11:56:06 -08:00
Mark Otto 080aa7f5c8 Merge branch 'master' into pr/11299
Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js
2013-11-30 00:55:00 -08:00
Mark Otto a7a9dcaeb2 Alternate fix for #11303: add link to site in banner and remove @mdo and @fat usernames from it 2013-11-30 00:42:36 -08:00
Mark Otto bb4a39d51c Merge branch 'master' into pr/11388
Conflicts:
	dist/css/bootstrap.min.css
2013-11-30 00:26:53 -08:00
Mark Otto 8674228521 Merge branch 'pr/11493'
Conflicts:
	dist/css/bootstrap.min.css
2013-11-29 23:30:26 -08:00
Mark Otto 9f0da54856 grunt to get dist files 2013-11-29 23:29:34 -08:00
Mark Otto e4848286c8 Fix #10979: Don't use .img-thumbnail as a mixin for .thumbnail to avoid dupe and unnecessary styles 2013-11-29 23:19:04 -08:00
Mark Otto bf9f39270c Fixes #11425: Use margin instead of padding on .modal-dialog to enable click-thru to .modal-backdrop 2013-11-29 22:03:49 -08:00
Mark Otto 36b82c37ec Implement #11174 to fix #10936: increase height of large inputs to fix Firefox inconsistencies 2013-11-29 21:59:28 -08:00
Mark Otto a4c54b5e5d Fixes #11390: Add max-width to containers within jumbotrons to avoid horizontal scrollbar 2013-11-29 18:33:59 -08:00
Mark Otto 09cd5289ab Fixes #11468: Prevent default gradient on in Firefox for Android 2013-11-29 17:47:27 -08:00
Zlatan Vasović 08e41d769a Add missing last column float 2013-11-29 08:37:54 +01:00
Mark Otto b5f9cc2057 Merge branch 'master' into pr/11414
Conflicts:
	dist/css/bootstrap.min.css
2013-11-28 15:55:17 -08:00
Mark Otto d654f90502 Fixes #10147: Remove outline from carousel controls on focus 2013-11-28 15:37:11 -08:00
Mark Otto 9d939080e6 Fixes #10483 and #10357: Make .container mixin-friendly by moving the width declarations within one class 2013-11-28 14:22:31 -08:00
Mark Otto c13524e7e0 Fixes #11553: Prevent double border on tables in panels without thead content 2013-11-28 12:49:51 -08:00
Mark Otto 9f68a5b241 Fixes #11516: Invert dropdown divider border in navbars 2013-11-28 12:39:39 -08:00
Mark Otto 9d485db721 run grunt after last merge 2013-11-28 12:34:42 -08:00
Mark Otto b7b72cc877 Merge branch 'master' into pr/11614
Conflicts:
	dist/css/bootstrap.min.css
2013-11-28 11:57:12 -08:00
Mark Otto 594d0c700d grunt after merge of last pr; unsure why, but this is rengerating the banners and spacing 2013-11-28 11:33:00 -08:00
Tobias Lindig 3d5e598e5c add builded files from dist/ 2013-11-28 18:40:15 +01:00
Mark Otto 9829c86f7c run grunt 2013-11-26 15:21:27 -08:00
Jesse Mandel bff8ba2b79 Fix for Issue #11411 2013-11-25 15:19:11 -08:00
aentan ba4c5dae9b add support for button dropdowns in justified button groups 2013-11-19 17:24:49 +08:00
Julian Thilo 8aec527614 Run grunt dist 2013-11-17 23:45:42 +01:00
Mark Otto ae4d5f21a9 fixes #11449: use menlo over monaco 2013-11-16 18:01:59 -08:00
Mark Otto a2c6daafd0 fixes #10744: back to solid borders on carets 2013-11-16 17:48:31 -08:00
Zlatan Vasović c2a6e950d7 Remove unusual keyframes prefixes 2013-11-13 22:32:46 +01:00
Zlatan Vasović 0da3901ed5 Add missing .small styles and docs 2013-11-08 10:33:22 +01:00
Zlatan Vasović 96109d3138 Simplify table state styles 2013-11-07 09:53:33 +01:00
Mark Otto 88a06640dd Fixes #11295: Restore offset, push, and pull zero classes (e.g., .col-md-offset-0) 2013-11-06 13:03:08 -08:00
Mark Otto 6a42305565 bump versions to v3.0.2 2013-11-06 12:57:28 -08:00
Zlatan Vasović f1bc840d43 Use nesting for .placeholder() 2013-11-02 09:35:51 +01:00
Kevin Locke 441f9d6717 Support .h1 in place of h1 inside .jumbotron
As in #7284, it can often be useful to style text like a heading in
places where using the heading tag would be either semantically
incorrect, less accessible, or otherwise invalid.

Support this in .jumbotron as in the rest of the document by allowing
elements with class .h1 to stand in for the h1 element.

Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
2013-10-31 10:48:55 -06:00
Mark Otto 867e2bef8d 3.0.1 2013-10-30 10:03:56 -07:00
Zlatan Vasović 688ca328c9 Combine multiple .thumbnail > img styles 2013-10-30 10:00:28 +01:00
Mark Otto c6e76d97ba Fixes #10341: don't change border color on contextual table classes 2013-10-28 21:19:48 -07:00