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

2321 Commits

Author SHA1 Message Date
Mark Otto 324f6ca562 buttons should be more mixin friendly 2013-12-18 14:29:33 -08:00
Mark Otto ab740f0f0f navbars need to use prefixed nav class or they won't work as expected 2013-12-18 14:28:03 -08:00
Mark Otto 3416e87a97 restore inline block on breadcrumbs and ensure proper code formatting for readibility 2013-12-18 14:27:21 -08:00
Julian Thilo 2b312bf3c1 Revert commits 
Bootstrap is being relicensed from Apache 2.0 to MIT so that more of our community can use the free and open source software we lovely create together. As commits are copyright their original authors, the commits of any individual not agreeing to relicense their contributions are being removed to be later rewritten by the @twbs/team.

This undoes the changes introduced by the following commits:
7ea34ae0ef , 7376eef378 , 303ba1326b , 7d1c8c2a0c , 11319f6da9 , 110fc88601 , ced08f6935
 2013-12-18 22:58:13 +01:00
Mark Otto d15218a09c Fixes #11899: Ensure proper margins and .small/small usage for heading tags (e.g., .h1-.h6) 2013-12-18 09:49:05 -08:00
Sebastian Podjasek ae640d4f1c Fix handling of btn-group placed inside input-group-btn (used for mixing dropdowns with normal buttons) 2013-12-16 22:56:28 +01:00
Chris Rebert 637b20f6d5 minor refactoring of 4ee93c9f85 2013-12-15 20:56:23 -08:00
Chris Rebert be508e043c copyediting 2013-12-15 18:13:50 -08:00
Mark Otto 4ee93c9f85 Fixes #10492 again, this time for last row's corners on striped tables 2013-12-15 17:22:55 -08:00
Mark Otto 2979e4bcea Add new form feedback states, clean up existing form styles 
New stuff:

* Adds `.has-feedback` and `.form-control-feedback` to show icon-based
form feedback to users. Fixes #11836.
* Removes the `width: 1em` on `.glyphicon` because it makes it
impractical to resize the width of all icons, even if they’re not
“empty” (e.g., a simple `.glyphicon { width: 30px; }` wouldn’t work,
nor would a class preceeded by a parent class.

Clean up:

* Sets `width: auto;` on all `.form-control`s within inline forms.
* Removes all the inline `select` menu `width` styles because all
inputs are now `auto`.
* Update form states docs to separate out sections better.
 2013-12-15 17:15:09 -08:00
Mark Otto d9345ff7d5 Fixes #11266: Apply a pixel-based line-height to date inputs for iOS 7 2013-12-15 15:27:46 -08:00
Mark Otto 4f22670c6e formatting and comment 2013-12-15 15:24:52 -08:00
Mark Otto d1f15baa71 Merge branch 'master' into pr/11817 
Conflicts:
	dist/css/bootstrap.min.css
	less/input-groups.less
 2013-12-15 15:07:38 -08:00
Mark Otto b04a1de9b0 Fixes #11402: Updated fix for select.form-control width in inline-forms 2013-12-15 14:52:49 -08:00
Mark Otto 6bc7126643 Merge pull request #11494 from blowsie/patch-2 
Fixed single dropdown-toggle in btn-group-veritcal not being rounded
 2013-12-15 14:28:49 -08:00
Mark Otto 393d523cdb Fixes #11660: Depcreate small and .small in blockquote in favor of footer 2013-12-15 14:23:55 -08:00
Mark Otto f5c13a3e1b revert an earlier change to move the component-animations.less file because it fubared modal backdrop .fade usage 2013-12-15 14:14:09 -08:00
Mark Otto 122245fe87 Merge branch 'master' into pr/11676 
Conflicts:
	less/modals.less
 2013-12-15 14:10:48 -08:00
Mark Otto f126411735 Merge pull request #11840 from ZDroid/pagination-boom 
Improve pager customization
 2013-12-15 13:46:11 -08:00
Mark Otto c7c9929c12 Fixes #11770: Move component-animations.less to the utility section of import list to match Customizer 2013-12-15 12:31:40 -08:00
Mark Otto a7029edc61 Restyle the blockquote to not thin text or change line-height 2013-12-15 11:29:58 -08:00
Mark Otto 2b86e05a61 Change variable 2013-12-15 11:09:03 -08:00
Mark Otto bc261ecc52 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-15 11:02:45 -08:00
Mark Otto a319ec5b7d Fixes #11829: Adds .make-xs-column mixins 2013-12-15 11:02:32 -08:00
Mark Otto 2ea370f93b Merge pull request #11861 from freeman/master 
Issue #11852 : create a new variable for the list group active item link...
 2013-12-15 10:59:23 -08:00
Mark Otto ad782ff89a comments and spacing 2013-12-15 10:53:53 -08:00
Mark Otto 82c52a7e9d Fixes #11801: use correct variables for grid containers 2013-12-15 10:38:54 -08:00
Mark Otto 168469f545 Fixes #11588: Scope font-size to only p elements in a .jumbotron and remove the supersized line-height from the base class 2013-12-14 21:50:47 -08:00
Mark Otto 647e9eb0f1 Fixes #11555: Add `@tooltip-opacity` variable 2013-12-14 21:43:08 -08:00
Mark Otto 072ccd4dda Fixes #11572: Add contextual background-color classes to match text classes; move both sets of classes to Helper Classes section of the CSS docs 2013-12-14 21:40:16 -08:00
Mark Otto 432b9f9cde Fixes #11561: Add float: left; to .form-control within input groups to prevent IE9 from screwing up placeholder text and select menu arrows 2013-12-14 20:04:12 -08:00
Mark Otto e98c2dc3ad Merge pull request #11326 from ZDroid/animations 
Add `.animation-*()` mixins
 2013-12-14 18:58:41 -08:00
Mark Otto 46c3d27468 Merge branch 'master' into pr/11435 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
 2013-12-14 16:56:56 -08:00
Mark Otto 4c64c1eecd Merge branch 'master' into pr/11302 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
 2013-12-14 16:46:40 -08:00
Mark Otto 323a40cc53 Merge branch 'master' into pr/11162 
Conflicts:
	less/modals.less
 2013-12-14 16:29:47 -08:00
Mark Otto 83c60ef3ee Merge branch 'master' into pr/11107 
Conflicts:
	docs-assets/js/raw-files.js
 2013-12-14 16:20:19 -08:00
Mark Otto 4afcebe0e7 Merge pull request #11286 from BBosman/well-border 
Add well-border variable
 2013-12-14 16:17:41 -08:00
Mark Otto 544b8ecab7 Fixes #10921: Add support for input groups within button toolbars 
* Floats any `.input-group` within a toolbar
* Simplifies the CSS to remove sibling selectors and instead use a
negative amrgin on the parent with only `margin-left`

See it in action: http://jsbin.com/aGEcUqAT/1/.
 2013-12-14 16:03:21 -08:00
Mark Otto a54dbfdf2a Merge branch 'master' into pr/10951 
Conflicts:
	dist/css/bootstrap.min.css
	less/modals.less
 2013-12-14 15:38:21 -08:00
Mark Otto 11c6ab767c Fixes #10370: Improved and deprecated dropdown menu alignment options 
* Removes an old pair of selectors that didn’t properly target the
right-aligned navbar alignment of dropdown menus.
* Deprecates the `.pull-right` alignment in favor of a more specific
and unique class name.
* Adds `.dropdown-menu-right` as the new alignment class. This is then
mixin-ed into the `.navbar-right.navbar-nav` dropdown menus for
auto-alignment.
* To override that auto-alignment, use `.dropdown-menu-left` as needed.
 2013-12-14 13:22:56 -08:00
Mark Otto 914f5e6a1d Fixes #11867: Add `@panel-body-padding` variable 2013-12-14 11:44:54 -08:00
Mark Otto ecc6f4e6bc Merge branch 'master' into pr/11868 
Conflicts:
	dist/css/bootstrap.min.css
 2013-12-14 11:36:54 -08:00
Mark Otto 22820d7151 Fixes #10495: Float Glyphicon and set margins in .navbar-brand to ensure there is no added height because wtf even is CSS 2013-12-13 23:06:04 -08:00
Chris Rebert de6b9e9df1 Merge pull request #11874 from ZDroid/hotfix 
';' isn't needed
 2013-12-13 14:31:15 -08:00
Zlatan Vasović e3d799fca3 ';' isn't needed 2013-12-13 23:15:02 +01:00
Tobias Lindig b7bf212995 use @zindex-modal for .modal and @zindex-modal-background for .modal-backdrop. 
removed z-index for .modal-dialog, it was not necessary because the parent element (.modal) already has a z-index.
 2013-12-13 12:24:20 +01:00
Mark Otto 5f9ecc7351 -ms-transform is for IE9 only, IE10+ don't require it 2013-12-12 23:01:11 -08:00
Mark Otto 0e6d34f24f Merge pull request #11819 from janpanschab/ms-transform-origin 
Transform-origin mixin for IE
 2013-12-12 22:59:08 -08:00
mrasscha ce39cbe6fa Issue #11852 : create a new variable for the list group active item link text. 2013-12-12 20:48:08 +01:00
dzwillia 4b47c60835 Added @dropdown-caret-color variable back to variables.less (deprecated) 2013-12-12 12:53:59 -05:00