2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
Commit Graph

353 Commits

Author SHA1 Message Date
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
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
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
Mark Otto 67cab7fa05 Fixes #10516: Use auto positioning for dropdowns in justified nav to fix Firefox rendering 2013-10-28 20:51:39 -07:00
Zlatan Vasović f9eec5b60a Add -moz-osx-font-smoothing 2013-10-28 09:59:24 +01:00
Mark Otto 4cfe307abe Fixes #11206: remove left padding on first inline list item 2013-10-26 14:13:34 +01:00
Zlatan Vasović aff291e1ca Add .animation() mixin 2013-10-26 14:11:59 +02:00
Zlatan Vasović 20cba845c2 Add another newline to improve final code readability
This divides banner from code.
2013-10-26 10:57:09 +02:00
Mark Otto eed53d7811 Fixes #10601: Use overflow-y: auto; for navbar collapse instead of visible to better enable scrolling on Android 4.x 2013-10-21 01:53:41 -07:00
Mark Otto 2eec3f919e Merge branch 'master' into pr/10656
Conflicts:
	dist/css/bootstrap.min.css
2013-10-20 22:55:45 -07:00
Mark Otto 76baacf2c9 Remove default z-index on navbar and only set on static and fixed variants 2013-10-20 21:12:09 -07:00
Mark Otto e486bb4f39 Fixes #10433: Navbar z-index refactor
* Resets the default navbar z-index to auto at a certain breakpoint
* Adds fixed navbar z-index var to fixed bottom navbar (previously only on fixed top navbar)
2013-10-20 20:30:16 -07:00
Mark Otto 5aa4c5cb0c fixes #11139: add position: relative; to .modal-dialog so that z-index takes effect 2013-10-20 20:04:10 -07:00
Mark Otto 369f5ba760 Merge branch 'master' of https://github.com/jeonghwan-kim/bootstrap into jeonghwan-kim-master
Conflicts:
	dist/css/bootstrap.min.css
2013-10-20 19:55:56 -07:00
Mark Otto dd34102cb6 Fixes #10522: Enable use of form validation class on .radio, .checkbox, .radio-inline, and .checkbox-inline 2013-10-20 19:54:22 -07:00
Mark Otto 23a85d6a7a fixes #11126: remove box-shadow from open dropdown toggle with .btn-link 2013-10-20 17:59:15 -07:00
Mark Otto bc76be5dcf Merge branch 'master' into carousel_indicators_ie
Conflicts:
	dist/css/bootstrap.min.css
2013-10-20 17:45:07 -07:00
Mark Otto f45c05a97a fixes #11151: remove unused h5bp class from print CSS 2013-10-20 17:40:19 -07:00
Mark Otto 291fd9828c run grunt dist 2013-10-20 16:48:42 -07:00