mirror of https://github.com/twbs/bootstrap.git
				
				
				
			Merge branch 'master' of https://github.com/twbs/bootstrap
Conflicts: dist/css/bootstrap.css.map
This commit is contained in:
		
						commit
						b615bd938b
					
				
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| 
						 | 
				
			
			@ -33,7 +33,7 @@
 | 
			
		|||
<div class="row">
 | 
			
		||||
  <div class="col-xs-6 col-md-3">
 | 
			
		||||
    <a href="#" class="thumbnail">
 | 
			
		||||
      <img data-src="holder.js/100%x180" alt="...">
 | 
			
		||||
      <img src="..." alt="...">
 | 
			
		||||
    </a>
 | 
			
		||||
  </div>
 | 
			
		||||
  ...
 | 
			
		||||
| 
						 | 
				
			
			@ -80,7 +80,7 @@
 | 
			
		|||
<div class="row">
 | 
			
		||||
  <div class="col-sm-6 col-md-4">
 | 
			
		||||
    <div class="thumbnail">
 | 
			
		||||
      <img data-src="holder.js/300x300" alt="...">
 | 
			
		||||
      <img src="..." alt="...">
 | 
			
		||||
      <div class="caption">
 | 
			
		||||
        <h3>Thumbnail label</h3>
 | 
			
		||||
        <p>...</p>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -196,6 +196,7 @@
 | 
			
		|||
    // Internet Explorer 8-9 does not support clicks on elements without a set
 | 
			
		||||
    // `background-color`. We cannot use `filter` since that's not viewed as a
 | 
			
		||||
    // background color by the browser. Thus, a hack is needed.
 | 
			
		||||
    // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Internet_Explorer
 | 
			
		||||
    //
 | 
			
		||||
    // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
 | 
			
		||||
    // set alpha transparency for the best results possible.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,6 +23,7 @@
 | 
			
		|||
  // Additional properties for button version
 | 
			
		||||
  // iOS requires the button element instead of an anchor tag.
 | 
			
		||||
  // If you want the anchor version, it requires `href="#"`.
 | 
			
		||||
  // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
 | 
			
		||||
  button& {
 | 
			
		||||
    padding: 0;
 | 
			
		||||
    cursor: pointer;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -143,7 +143,7 @@ output {
 | 
			
		|||
  fieldset[disabled] & {
 | 
			
		||||
    cursor: @cursor-disabled;
 | 
			
		||||
    background-color: @input-bg-disabled;
 | 
			
		||||
    opacity: 1; // iOS fix for unreadable disabled content
 | 
			
		||||
    opacity: 1; // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  // Reset height for `textarea`s
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -102,7 +102,7 @@
 | 
			
		|||
  // Firefox
 | 
			
		||||
  &::-moz-placeholder {
 | 
			
		||||
    color: @color;
 | 
			
		||||
    opacity: 1; // See https://github.com/twbs/bootstrap/pull/11526
 | 
			
		||||
    opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526
 | 
			
		||||
  }
 | 
			
		||||
  &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+
 | 
			
		||||
  &::-webkit-input-placeholder  { color: @color; } // Safari and Chrome
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -133,7 +133,7 @@ th {
 | 
			
		|||
// Reset default table behavior
 | 
			
		||||
 | 
			
		||||
table col[class*="col-"] {
 | 
			
		||||
  position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
 | 
			
		||||
  position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623)
 | 
			
		||||
  float: none;
 | 
			
		||||
  display: table-column;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -141,7 +141,7 @@ table {
 | 
			
		|||
  td,
 | 
			
		||||
  th {
 | 
			
		||||
    &[class*="col-"] {
 | 
			
		||||
      position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
 | 
			
		||||
      position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623)
 | 
			
		||||
      float: none;
 | 
			
		||||
      display: table-cell;
 | 
			
		||||
    }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -36,7 +36,7 @@
 | 
			
		|||
// Mixin for generating new styles
 | 
			
		||||
.btn-styles(@btn-color: #555) {
 | 
			
		||||
  #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 12%));
 | 
			
		||||
  .reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners
 | 
			
		||||
  .reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners; see https://github.com/twbs/bootstrap/issues/10620
 | 
			
		||||
  background-repeat: repeat-x;
 | 
			
		||||
  border-color: darken(@btn-color, 14%);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -130,7 +130,7 @@
 | 
			
		|||
// Inverted navbar
 | 
			
		||||
.navbar-inverse {
 | 
			
		||||
  #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg);
 | 
			
		||||
  .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
 | 
			
		||||
  .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered; see https://github.com/twbs/bootstrap/issues/10257
 | 
			
		||||
 | 
			
		||||
  .navbar-nav > .open > a,
 | 
			
		||||
  .navbar-nav > .active > a {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue