root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
7,469 Commits 132 Branches 94 Tags 672 MiB
Commit Graph

2256 Commits

Author SHA1 Message Date
Mark Otto 5283e518cc Merge pull request #11217 from ZDroid/nest 
Add quick fix to labels and badges in buttons
 2013-11-30 16:26:38 -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 6a2ca0ab3a Fixes #11444: Use @navbar-padding-vertical for nav links padding 2013-11-30 16:08:49 -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 5611320101 Merge branch 'master' of github.com:twbs/bootstrap 2013-11-30 12:52:45 -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 84f536e02a Merge pull request #11398 from thelukemcdonald/master 
Don't print .clearfix() comment references
 2013-11-30 12:47:07 -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 bb4a39d51c Merge branch 'master' into pr/11388 
Conflicts:
	dist/css/bootstrap.min.css
 2013-11-30 00:26:53 -08:00
Mark Otto 938d40fc20 Merge pull request #11432 from masterbee/WCAG2-color-contrast 
Corrected color contrast to WCAG 2.0 AA (Accessibility Tweak) - Forms and Alerts
 2013-11-30 00:21:47 -08:00
Mark Otto 5b137e5857 Merge pull request #11511 from ZDroid/fix-xs-comments 
Fix comments for extra small grid
 2013-11-29 23:46:35 -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 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ć 702ad4c302 Remove redundant comments 2013-11-29 11:37:06 +01: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 ec9d4708d2 Merge pull request #11551 from masterbee/outlinetweak 
removed color treatment of outline for easier integration
 2013-11-28 12:31:18 -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
Tobias Lindig ea78248608 removed all caret border color settings. 2013-11-28 17:41:43 +01:00
Jesse Mandel bff8ba2b79 Fix for Issue #11411 2013-11-25 15:19:11 -08:00
Jerri Christiansen bd44a4b5f3 Removed unnecessary semicolon 2013-11-25 20:41:00 +01:00
Mario Bonito 55af003669 removed color treatment of outline 2013-11-20 16:44:44 -05:00
aentan ba4c5dae9b add support for button dropdowns in justified button groups 2013-11-19 17:24:49 +08:00
Chris Rebert 446f2325a6 add explanatory comment Re: #11526 2013-11-18 14:22:17 -08:00
Julian Thilo 84a3aa3e0c Merge pull request #11514 from twbs/navbar-text-float-breakpoint 
Fix #11513: Don't always float navbar-text
 2013-11-18 14:02:17 -08:00
Erik Flowers 50578dda60 - Firefox placeholder text is faded out and not the full color. Adding opacity:1 to it returns it to the proper color 
- (this is a re-commit since I messed up my branch last time and failed the travis build)
 2013-11-18 11:58:14 -07:00
Julian Thilo cdb243706e Fix #11513: Don't always float navbar-text 
`navbar-text` should only float when the navbar is expanded on larger
screens, otherwise the element might be (hidden) behind `navbar-nav`.
Fixes #11513.
X-Ref: #8820 #8815
 2013-11-17 23:07:28 +01:00
Zlatan Vasović 283c86db38 There are xs-offsets, -pushes and -pulls! 2013-11-17 21:15:25 +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
Bass Jobsen fbd3cf5f52 Update navbar.less 
fix for issue #11243
 2013-11-16 12:03:50 +01:00
Sam Blowes 1f340023e2 Fixed button group button not being 100% width 
Example of issue here.
https://dl.dropboxusercontent.com/u/14037764/Development/stackoverflow/bootstrap/vertical-btn.PNG
 2013-11-15 16:17:40 +00:00
Zlatan Vasović c2a6e950d7 Remove unusual keyframes prefixes 2013-11-13 22:32:46 +01:00
Mario Bonito 4386650e60 Corrected color contrast to WCAG 2.0 AA 2013-11-09 13:03:21 -05:00
Zlatan Vasović 0da3901ed5 Add missing `.small` styles and docs 2013-11-08 10:33:22 +01:00
Luke McDonald 15fbc4bd06 Don't print .clearfix() comment references 2013-11-07 09:57:55 -06:00
Zlatan Vasović 96109d3138 Simplify table state styles 2013-11-07 09:53:33 +01:00
Chris Rebert 463343af63 more nesting in table.less 2013-11-06 18:38:27 -08:00
Chris Rebert 798e64cebf use nesting to make .table-striped & .table-hover mixin-able again; fixes #11387 2013-11-06 18:33:07 -08: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
Chris Rebert b6a083e77f Merge pull request #11327 from ZDroid/nestnail 
Use nesting for thumbnail styles
 2013-11-05 16:20:53 -08:00
Zlatan Vasović f1bc840d43 Use nesting for .placeholder() 2013-11-02 09:35:51 +01:00
Gleb Mazovetskiy b75d5f5fc4 & > == > 2013-11-02 02:19:11 +01:00
Zlatan Vasović 3dc0ed35d1 Use nesting for thumbnail styles 2013-11-01 22:09:01 +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
Zlatan Vasović 688ca328c9 Combine multiple .thumbnail > img styles 2013-10-30 10:00:28 +01:00
Zlatan Vasović 8a881c78a1 Change tense to imperative 
Matches this comment with the commit messages and other comments.
 2013-10-29 20:06:45 +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 30127a4296 Merge pull request #11253 from ZDroid/ditch 
Ditch amp
 2013-10-27 20:50:23 -07:00
Zlatan Vasović 92f007157a Ditch amp 2013-10-27 13:43:51 +01:00
Geremia Taglialatela 58cb85be37 #fff of course 2013-10-26 21:52:38 +02:00
Geremia Taglialatela b09417fd75 Fixes #11245 2013-10-26 21:32:29 +02:00
Mark Otto 0365796375 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-26 14:22:33 +01:00
Mark Otto 1ef6caf44f Merge pull request #11200 from yokomizor/variable_way_to_set_caret_width_base 
Variable way to set caret width
 2013-10-26 06:15:33 -07: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
Chris Rebert a58c83a317 add missing space before open curly brace 2013-10-24 19:56:44 -07:00
Chris Rebert aafe3f90bd fix misspelling in comment 2013-10-24 19:50:08 -07:00
Chris Rebert f31aae469e fix misspelling in comment 2013-10-24 19:48:42 -07:00
Chris Rebert 3cd744fd5e remove ref to nonexistent branch 2013-10-24 19:42:48 -07:00
Chris Rebert c865a68e21 fix WebKit caps in comments 2013-10-24 19:20:08 -07:00
Zlatan Vasović 9a2d169762 Add quick fix to labels and badges in buttons 2013-10-23 22:14:34 +02:00
Chris Rebert bb3d17553c Merge pull request #11208 from ZDroid/codestyle_fix 
Put a space before `{` due to code style
 2013-10-22 10:53:25 -07:00
Zlatan Vasović b034362363 Put a space before { due to code style 2013-10-22 18:34:43 +02:00
Rogério Yokomizo 5f2bd59abb variable way to set @caret-width-base 2013-10-22 02:50:08 -02:00
Zlatan Vasović 214a78978d Change upper case to lower case 2013-10-21 16:34:18 +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 eef9d5ae7b Merge pull request #10893 from Shaun-Dychko/patch--webkit-linear-gradient 
remove comma separating the color and the color-stop in -webkit-linear-gradient in the #gradient .vertical mixin.
 2013-10-20 23:27:48 -07:00
Mark Otto 9a0849d818 more spacing 2013-10-20 22:56:29 -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 6585c5898a spacing 2013-10-20 22:46:21 -07:00
Mark Otto 6ecb5d6cf3 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-20 22:43:03 -07:00
Mark Otto d8fab5aa6e Fixes #10620: remove gradient on buttons for IE9 in theme.less due to bleed through with rounded corners 2013-10-20 22:41:57 -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 6a93a6b88a Fixes #10903 and #10457: IE8-9 don't support events on elements without background-color, so we have to hack it 2013-10-20 16:46:38 -07:00
Zlatan Vasović 5f79354dbe FIx invalid element selector 
`kbd` (keyboard) is right, not `kdb`. :P
 2013-10-17 21:25:08 +02:00
Max Edmands 693915d127 Active state overrides contextual list-item styles 2013-10-16 22:56:13 -07:00
Aaron Borden 0c2055ef38 Adding contextual styles to list-items 2013-10-16 19:02:04 -07:00
jeonghwan 976f6dfdad Fixes issue #11122 -- navbar-fixed-bottom border 
Enable border-top in .navbar-fixed-bottom
 2013-10-16 23:20:34 +09:00