mirror of https://github.com/twbs/bootstrap.git
				
				
				
			Remove $line-height-computed
We have it set to `1` right now just to avoid compilation errors, but it’s been replaced everywhere with our new spacer classes anywho. We’ll likely want to remap that var to custom component vars though (e.g., `$pagination-margin` instead of `$spacer-y`).
This commit is contained in:
		
							parent
							
								
									7db7e59682
								
							
						
					
					
						commit
						ed89be1f44
					
				|  | @ -9,7 +9,7 @@ | |||
| 
 | ||||
| .alert { | ||||
|   padding: $alert-padding; | ||||
|   margin-bottom: $line-height-computed; | ||||
|   margin-bottom: $spacer-y; | ||||
|   border: 1px solid transparent; | ||||
|   @include border-radius($alert-border-radius); | ||||
| 
 | ||||
|  |  | |||
|  | @ -5,7 +5,7 @@ | |||
| 
 | ||||
| .breadcrumb { | ||||
|   padding: $breadcrumb-padding-vertical $breadcrumb-padding-horizontal; | ||||
|   margin-bottom: $line-height-computed; | ||||
|   margin-bottom: $spacer-y; | ||||
|   list-style: none; | ||||
|   background-color: $breadcrumb-bg; | ||||
|   @include border-radius($border-radius-base); | ||||
|  |  | |||
|  | @ -117,7 +117,7 @@ | |||
| // horizontal form layout. | ||||
| 
 | ||||
| .form-control-static { | ||||
|   min-height: ($line-height-computed + $font-size-base); | ||||
|   min-height: $input-height-base; | ||||
|   // Size it appropriately next to real form controls | ||||
|   padding-top: ($padding-base-vertical + $border-width); | ||||
|   padding-bottom: ($padding-base-vertical + $border-width); | ||||
|  |  | |||
|  | @ -103,7 +103,7 @@ | |||
|   margin-right: $spacer; | ||||
|   margin-bottom: 0; // For headings | ||||
|   font-size: $font-size-lg; | ||||
|   line-height: $line-height-computed; | ||||
|   line-height: 1; | ||||
|   background: none; | ||||
|   border: 0; | ||||
| 
 | ||||
|  |  | |||
|  | @ -5,7 +5,8 @@ | |||
| 
 | ||||
| .pager { | ||||
|   padding-left: 0; | ||||
|   margin: $line-height-computed 0; | ||||
|   margin-top: $spacer-y; | ||||
|   margin-bottom: $spacer-y; | ||||
|   text-align: center; | ||||
|   list-style: none; | ||||
|   @include clearfix(); | ||||
|  |  | |||
|  | @ -6,6 +6,8 @@ | |||
| .pagination { | ||||
|   display: inline-block; | ||||
|   padding-left: 0; | ||||
|   margin-top: $spacer-y; | ||||
|   margin-bottom: $spacer-y; | ||||
|   margin: $line-height-computed 0; | ||||
|   @include border-radius(); | ||||
| 
 | ||||
|  |  | |||
|  | @ -8,7 +8,7 @@ | |||
| // | ||||
| 
 | ||||
| @keyframes progress-bar-stripes { | ||||
|   from  { background-position: $line-height-computed 0; } | ||||
|   from  { background-position: $spacer-y 0; } | ||||
|   to    { background-position: 0 0; } | ||||
| } | ||||
| 
 | ||||
|  | @ -20,8 +20,8 @@ | |||
| .progress { | ||||
|   display: block; | ||||
|   width: 100%; | ||||
|   height: $line-height-computed; | ||||
|   margin-bottom: $line-height-computed; | ||||
|   height: $spacer-y; // todo: make a new var for this | ||||
|   margin-bottom: $spacer-y; | ||||
| } | ||||
| .progress[value] { | ||||
|   // IE10 uses `color` to set the bar background-color | ||||
|  | @ -85,7 +85,7 @@ | |||
|   } | ||||
|   .progress-bar { | ||||
|     display: inline-block; | ||||
|     height: $line-height-computed; | ||||
|     height: $spacer-y; | ||||
|     text-indent: -999rem; // Simulate hiding of value as in native `<progress>` | ||||
|     background-color: #0074d9; | ||||
|     border-top-left-radius: $border-radius-base; | ||||
|  | @ -110,16 +110,16 @@ | |||
| 
 | ||||
| .progress-striped[value]::-webkit-progress-value { | ||||
|   @include gradient-striped(); | ||||
|   background-size: $line-height-computed $line-height-computed; | ||||
|   background-size: $spacer-y $spacer-y; | ||||
| } | ||||
| .progress-striped[value]::-moz-progress-bar { | ||||
|   @include gradient-striped(); | ||||
|   background-size: $line-height-computed $line-height-computed; | ||||
|   background-size: $spacer-y $spacer-y; | ||||
| } | ||||
| @media screen and ("min-width:0\0") { | ||||
|   .progress-bar-striped { | ||||
|     @include gradient-striped(); | ||||
|     background-size: $line-height-computed $line-height-computed; | ||||
|     background-size: $spacer-y $spacer-y; | ||||
|   } | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -4,7 +4,7 @@ | |||
| 
 | ||||
| @mixin nav-divider($color: #e5e5e5) { | ||||
|   height: 1px; | ||||
|   margin: (($line-height-computed / 2) - 1) 0; | ||||
|   margin: ($spacer-y / 2) 0; | ||||
|   overflow: hidden; | ||||
|   background-color: $color; | ||||
| } | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue