mirror of
				https://github.com/twbs/bootstrap.git
				synced 2025-10-31 00:04:27 -04:00 
			
		
		
		
	Upgrade to Normalize v3-rc1 in prep for v3 final
This commit is contained in:
		
							parent
							
								
									45ea456468
								
							
						
					
					
						commit
						6a0a139cda
					
				
							
								
								
									
										2
									
								
								dist/css/bootstrap-theme.css.map
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/css/bootstrap-theme.css.map
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										108
									
								
								dist/css/bootstrap.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										108
									
								
								dist/css/bootstrap.css
									
									
									
									
										vendored
									
									
								
							| @ -4,7 +4,15 @@ | ||||
|  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) | ||||
|  */ | ||||
| 
 | ||||
| /*! normalize.css v2.1.3 | MIT License | git.io/normalize */ | ||||
| /*! normalize.css v3.0.0-rc.1 | MIT License | git.io/normalize */ | ||||
| html { | ||||
|   font-family: sans-serif; | ||||
|   -webkit-text-size-adjust: 100%; | ||||
|       -ms-text-size-adjust: 100%; | ||||
| } | ||||
| body { | ||||
|   margin: 0; | ||||
| } | ||||
| article, | ||||
| aside, | ||||
| details, | ||||
| @ -21,8 +29,10 @@ summary { | ||||
| } | ||||
| audio, | ||||
| canvas, | ||||
| progress, | ||||
| video { | ||||
|   display: inline-block; | ||||
|   vertical-align: baseline; | ||||
| } | ||||
| audio:not([controls]) { | ||||
|   display: none; | ||||
| @ -32,29 +42,13 @@ audio:not([controls]) { | ||||
| template { | ||||
|   display: none; | ||||
| } | ||||
| html { | ||||
|   font-family: sans-serif; | ||||
| 
 | ||||
|       -ms-text-size-adjust: 100%; | ||||
|   -webkit-text-size-adjust: 100%; | ||||
| } | ||||
| body { | ||||
|   margin: 0; | ||||
| } | ||||
| a { | ||||
|   background: transparent; | ||||
| } | ||||
| a:focus { | ||||
|   outline: thin dotted; | ||||
| } | ||||
| a:active, | ||||
| a:hover { | ||||
|   outline: 0; | ||||
| } | ||||
| h1 { | ||||
|   margin: .67em 0; | ||||
|   font-size: 2em; | ||||
| } | ||||
| abbr[title] { | ||||
|   border-bottom: 1px dotted; | ||||
| } | ||||
| @ -65,28 +59,14 @@ strong { | ||||
| dfn { | ||||
|   font-style: italic; | ||||
| } | ||||
| hr { | ||||
|   height: 0; | ||||
|   -moz-box-sizing: content-box; | ||||
|        box-sizing: content-box; | ||||
| h1 { | ||||
|   margin: .67em 0; | ||||
|   font-size: 2em; | ||||
| } | ||||
| mark { | ||||
|   color: #000; | ||||
|   background: #ff0; | ||||
| } | ||||
| code, | ||||
| kbd, | ||||
| pre, | ||||
| samp { | ||||
|   font-family: monospace, serif; | ||||
|   font-size: 1em; | ||||
| } | ||||
| pre { | ||||
|   white-space: pre-wrap; | ||||
| } | ||||
| q { | ||||
|   quotes: "\201C" "\201D" "\2018" "\2019"; | ||||
| } | ||||
| small { | ||||
|   font-size: 80%; | ||||
| } | ||||
| @ -110,28 +90,34 @@ svg:not(:root) { | ||||
|   overflow: hidden; | ||||
| } | ||||
| figure { | ||||
|   margin: 0; | ||||
|   margin: 1em 40px; | ||||
| } | ||||
| fieldset { | ||||
|   padding: .35em .625em .75em; | ||||
|   margin: 0 2px; | ||||
|   border: 1px solid #c0c0c0; | ||||
| hr { | ||||
|   height: 0; | ||||
|   -moz-box-sizing: content-box; | ||||
|        box-sizing: content-box; | ||||
| } | ||||
| legend { | ||||
|   padding: 0; | ||||
|   border: 0; | ||||
| pre { | ||||
|   overflow: auto; | ||||
| } | ||||
| code, | ||||
| kbd, | ||||
| pre, | ||||
| samp { | ||||
|   font-family: monospace, monospace; | ||||
|   font-size: 1em; | ||||
| } | ||||
| button, | ||||
| input, | ||||
| optgroup, | ||||
| select, | ||||
| textarea { | ||||
|   margin: 0; | ||||
|   font-family: inherit; | ||||
|   font-size: 100%; | ||||
|   font: inherit; | ||||
|   color: inherit; | ||||
| } | ||||
| button, | ||||
| input { | ||||
|   line-height: normal; | ||||
| button { | ||||
|   overflow: visible; | ||||
| } | ||||
| button, | ||||
| select { | ||||
| @ -148,11 +134,23 @@ button[disabled], | ||||
| html input[disabled] { | ||||
|   cursor: default; | ||||
| } | ||||
| button::-moz-focus-inner, | ||||
| input::-moz-focus-inner { | ||||
|   padding: 0; | ||||
|   border: 0; | ||||
| } | ||||
| input { | ||||
|   line-height: normal; | ||||
| } | ||||
| input[type="checkbox"], | ||||
| input[type="radio"] { | ||||
|   box-sizing: border-box; | ||||
|   padding: 0; | ||||
| } | ||||
| input[type="number"]::-webkit-inner-spin-button, | ||||
| input[type="number"]::-webkit-outer-spin-button { | ||||
|   height: auto; | ||||
| } | ||||
| input[type="search"] { | ||||
|   -webkit-box-sizing: content-box; | ||||
|      -moz-box-sizing: content-box; | ||||
| @ -163,19 +161,29 @@ input[type="search"]::-webkit-search-cancel-button, | ||||
| input[type="search"]::-webkit-search-decoration { | ||||
|   -webkit-appearance: none; | ||||
| } | ||||
| button::-moz-focus-inner, | ||||
| input::-moz-focus-inner { | ||||
| fieldset { | ||||
|   padding: .35em .625em .75em; | ||||
|   margin: 0 2px; | ||||
|   border: 1px solid #c0c0c0; | ||||
| } | ||||
| legend { | ||||
|   padding: 0; | ||||
|   border: 0; | ||||
| } | ||||
| textarea { | ||||
|   overflow: auto; | ||||
|   vertical-align: top; | ||||
| } | ||||
| optgroup { | ||||
|   font-weight: bold; | ||||
| } | ||||
| table { | ||||
|   border-spacing: 0; | ||||
|   border-collapse: collapse; | ||||
| } | ||||
| td, | ||||
| th { | ||||
|   padding: 0; | ||||
| } | ||||
| @media print { | ||||
|   * { | ||||
|     color: #000 !important; | ||||
|  | ||||
							
								
								
									
										2
									
								
								dist/css/bootstrap.css.map
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/css/bootstrap.css.map
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										2
									
								
								dist/css/bootstrap.min.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/css/bootstrap.min.css
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										6
									
								
								docs/assets/js/customize.min.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								docs/assets/js/customize.min.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										2
									
								
								docs/dist/css/bootstrap-theme.css.map
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								docs/dist/css/bootstrap-theme.css.map
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										2
									
								
								docs/dist/css/bootstrap.css.map
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								docs/dist/css/bootstrap.css.map
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										2
									
								
								docs/dist/css/bootstrap.min.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								docs/dist/css/bootstrap.min.css
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @ -91,6 +91,8 @@ | ||||
|       "text-shadow", | ||||
|       "text-transform", | ||||
|       "text-wrap", | ||||
|       "-webkit-text-size-adjust", | ||||
|       "-ms-text-size-adjust", | ||||
|       "letter-spacing", | ||||
|       "-ms-word-break", | ||||
|       "word-break", | ||||
|  | ||||
							
								
								
									
										271
									
								
								less/normalize.less
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										271
									
								
								less/normalize.less
									
									
									
									
										vendored
									
									
								
							| @ -1,6 +1,25 @@ | ||||
| /*! normalize.css v2.1.3 | MIT License | git.io/normalize */ | ||||
| /*! normalize.css v3.0.0-rc.1 | MIT License | git.io/normalize */ | ||||
| 
 | ||||
| // | ||||
| // 1. Set default font family to sans-serif. | ||||
| // 2. Prevent iOS text size adjust after orientation change, without disabling | ||||
| //    user zoom. | ||||
| // | ||||
| 
 | ||||
| html { | ||||
|   font-family: sans-serif; // 1 | ||||
|   -ms-text-size-adjust: 100%; // 2 | ||||
|   -webkit-text-size-adjust: 100%; // 2 | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Remove default margin. | ||||
| // | ||||
| 
 | ||||
| body { | ||||
|   margin: 0; | ||||
| } | ||||
| 
 | ||||
| // ========================================================================== | ||||
| // HTML5 display definitions | ||||
| // ========================================================================== | ||||
| 
 | ||||
| @ -24,13 +43,16 @@ summary { | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Correct `inline-block` display not defined in IE 8/9. | ||||
| // 1. Correct `inline-block` display not defined in IE 8/9. | ||||
| // 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. | ||||
| // | ||||
| 
 | ||||
| audio, | ||||
| canvas, | ||||
| progress, | ||||
| video { | ||||
|   display: inline-block; | ||||
|   display: inline-block; // 1 | ||||
|   vertical-align: baseline; // 2 | ||||
| } | ||||
| 
 | ||||
| // | ||||
| @ -53,31 +75,6 @@ template { | ||||
|   display: none; | ||||
| } | ||||
| 
 | ||||
| // ========================================================================== | ||||
| // Base | ||||
| // ========================================================================== | ||||
| 
 | ||||
| // | ||||
| // 1. Set default font family to sans-serif. | ||||
| // 2. Prevent iOS text size adjust after orientation change, without disabling | ||||
| //    user zoom. | ||||
| // | ||||
| 
 | ||||
| html { | ||||
|   font-family: sans-serif; // 1 | ||||
|   -ms-text-size-adjust: 100%; // 2 | ||||
|   -webkit-text-size-adjust: 100%; // 2 | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Remove default margin. | ||||
| // | ||||
| 
 | ||||
| body { | ||||
|   margin: 0; | ||||
| } | ||||
| 
 | ||||
| // ========================================================================== | ||||
| // Links | ||||
| // ========================================================================== | ||||
| 
 | ||||
| @ -89,14 +86,6 @@ a { | ||||
|   background: transparent; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Address `outline` inconsistency between Chrome and other browsers. | ||||
| // | ||||
| 
 | ||||
| a:focus { | ||||
|   outline: thin dotted; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Improve readability when focused and also mouse hovered in all browsers. | ||||
| // | ||||
| @ -106,19 +95,8 @@ a:hover { | ||||
|   outline: 0; | ||||
| } | ||||
| 
 | ||||
| // Text-level semantics | ||||
| // ========================================================================== | ||||
| // Typography | ||||
| // ========================================================================== | ||||
| 
 | ||||
| // | ||||
| // Address variable `h1` font-size and margin within `section` and `article` | ||||
| // contexts in Firefox 4+, Safari 5, and Chrome. | ||||
| // | ||||
| 
 | ||||
| h1 { | ||||
|   font-size: 2em; | ||||
|   margin: 0.67em 0; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Address styling not present in IE 8/9, Safari 5, and Chrome. | ||||
| @ -146,13 +124,13 @@ dfn { | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Address differences between Firefox and other browsers. | ||||
| // Address variable `h1` font-size and margin within `section` and `article` | ||||
| // contexts in Firefox 4+, Safari 5, and Chrome. | ||||
| // | ||||
| 
 | ||||
| hr { | ||||
|   -moz-box-sizing: content-box; | ||||
|   box-sizing: content-box; | ||||
|   height: 0; | ||||
| h1 { | ||||
|   font-size: 2em; | ||||
|   margin: 0.67em 0; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| @ -164,34 +142,6 @@ mark { | ||||
|   color: #000; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Correct font family set oddly in Safari 5 and Chrome. | ||||
| // | ||||
| 
 | ||||
| code, | ||||
| kbd, | ||||
| pre, | ||||
| samp { | ||||
|   font-family: monospace, serif; | ||||
|   font-size: 1em; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Improve readability of pre-formatted text in all browsers. | ||||
| // | ||||
| 
 | ||||
| pre { | ||||
|   white-space: pre-wrap; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Set consistent quote types. | ||||
| // | ||||
| 
 | ||||
| q { | ||||
|   quotes: "\201C" "\201D" "\2018" "\2019"; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Address inconsistent and variable font size in all browsers. | ||||
| // | ||||
| @ -220,7 +170,6 @@ sub { | ||||
|   bottom: -0.25em; | ||||
| } | ||||
| 
 | ||||
| // ========================================================================== | ||||
| // Embedded content | ||||
| // ========================================================================== | ||||
| 
 | ||||
| @ -240,8 +189,7 @@ svg:not(:root) { | ||||
|   overflow: hidden; | ||||
| } | ||||
| 
 | ||||
| // ========================================================================== | ||||
| // Figures | ||||
| // Grouping content | ||||
| // ========================================================================== | ||||
| 
 | ||||
| // | ||||
| @ -249,63 +197,77 @@ svg:not(:root) { | ||||
| // | ||||
| 
 | ||||
| figure { | ||||
|   margin: 0; | ||||
|   margin: 1em 40px; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Address differences between Firefox and other browsers. | ||||
| // | ||||
| 
 | ||||
| hr { | ||||
|   -moz-box-sizing: content-box; | ||||
|   box-sizing: content-box; | ||||
|   height: 0; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Contain overflow in all browsers. | ||||
| // | ||||
| 
 | ||||
| pre { | ||||
|   overflow: auto; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Address odd `em`-unit font size rendering in all browsers. | ||||
| // | ||||
| 
 | ||||
| code, | ||||
| kbd, | ||||
| pre, | ||||
| samp { | ||||
|   font-family: monospace, monospace; | ||||
|   font-size: 1em; | ||||
| } | ||||
| 
 | ||||
| // ========================================================================== | ||||
| // Forms | ||||
| // ========================================================================== | ||||
| 
 | ||||
| // | ||||
| // Define consistent border, margin, and padding. | ||||
| // Known limitation: by default, Chrome and Safari on OS X allow very limited | ||||
| // styling of `select`, unless a `border` property is set. | ||||
| // | ||||
| 
 | ||||
| fieldset { | ||||
|   border: 1px solid #c0c0c0; | ||||
|   margin: 0 2px; | ||||
|   padding: 0.35em 0.625em 0.75em; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // 1. Correct `color` not being inherited in IE 8/9. | ||||
| // 2. Remove padding so people aren't caught out if they zero out fieldsets. | ||||
| // | ||||
| 
 | ||||
| legend { | ||||
|   border: 0; // 1 | ||||
|   padding: 0; // 2 | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // 1. Correct font family not being inherited in all browsers. | ||||
| // 2. Correct font size not being inherited in all browsers. | ||||
| // 1. Correct color not being inherited. | ||||
| //    Known issue: affects color of disabled elements. | ||||
| // 2. Correct font properties not being inherited. | ||||
| // 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome. | ||||
| // | ||||
| 
 | ||||
| button, | ||||
| input, | ||||
| optgroup, | ||||
| select, | ||||
| textarea { | ||||
|   font-family: inherit; // 1 | ||||
|   font-size: 100%; // 2 | ||||
|   color: inherit; // 1 | ||||
|   font: inherit; // 2 | ||||
|   margin: 0; // 3 | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Address Firefox 4+ setting `line-height` on `input` using `!important` in | ||||
| // the UA stylesheet. | ||||
| // Address `overflow` set to `hidden` in IE 8/9/10. | ||||
| // | ||||
| 
 | ||||
| button, | ||||
| input { | ||||
|   line-height: normal; | ||||
| button { | ||||
|   overflow: visible; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Address inconsistent `text-transform` inheritance for `button` and `select`. | ||||
| // All other form control elements do not inherit `text-transform` values. | ||||
| // Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+. | ||||
| // Correct `select` style inheritance in Firefox 4+ and Opera. | ||||
| // Correct `button` style inheritance in Firefox, IE 8+, and Opera | ||||
| // Correct `select` style inheritance in Firefox. | ||||
| // | ||||
| 
 | ||||
| button, | ||||
| @ -338,6 +300,28 @@ html input[disabled] { | ||||
|   cursor: default; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Remove inner padding and border in Firefox 4+. | ||||
| // | ||||
| 
 | ||||
| button::-moz-focus-inner, | ||||
| input::-moz-focus-inner { | ||||
|   border: 0; | ||||
|   padding: 0; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Address Firefox 4+ setting `line-height` on `input` using `!important` in | ||||
| // the UA stylesheet. | ||||
| // | ||||
| 
 | ||||
| input { | ||||
|   line-height: normal; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // It's recommended that you don't attempt to style these elements. | ||||
| // Firefox's implementation doesn't respect box-sizing, padding, or width. | ||||
| // | ||||
| // 1. Address box sizing set to `content-box` in IE 8/9/10. | ||||
| // 2. Remove excess padding in IE 8/9/10. | ||||
| @ -349,6 +333,17 @@ input[type="radio"] { | ||||
|   padding: 0; // 2 | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Fix the cursor style for Chrome's increment/decrement buttons. For certain | ||||
| // `font-size` values of the `input`, it causes the cursor style of the | ||||
| // decrement button to change from `default` to `text`. | ||||
| // | ||||
| 
 | ||||
| input[type="number"]::-webkit-inner-spin-button, | ||||
| input[type="number"]::-webkit-outer-spin-button { | ||||
|   height: auto; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome. | ||||
| // 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome | ||||
| @ -363,8 +358,9 @@ input[type="search"] { | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Remove inner padding and search cancel button in Safari 5 and Chrome | ||||
| // on OS X. | ||||
| // Remove inner padding and search cancel button in Safari and Chrome on OS X. | ||||
| // Safari (but not Chrome) clips the cancel button when the search input has | ||||
| // padding (and `textfield` appearance). | ||||
| // | ||||
| 
 | ||||
| input[type="search"]::-webkit-search-cancel-button, | ||||
| @ -373,26 +369,42 @@ input[type="search"]::-webkit-search-decoration { | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Remove inner padding and border in Firefox 4+. | ||||
| // Define consistent border, margin, and padding. | ||||
| // | ||||
| 
 | ||||
| button::-moz-focus-inner, | ||||
| input::-moz-focus-inner { | ||||
|   border: 0; | ||||
|   padding: 0; | ||||
| fieldset { | ||||
|   border: 1px solid #c0c0c0; | ||||
|   margin: 0 2px; | ||||
|   padding: 0.35em 0.625em 0.75em; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // 1. Remove default vertical scrollbar in IE 8/9. | ||||
| // 2. Improve readability and alignment in all browsers. | ||||
| // 1. Correct `color` not being inherited in IE 8/9. | ||||
| // 2. Remove padding so people aren't caught out if they zero out fieldsets. | ||||
| // | ||||
| 
 | ||||
| legend { | ||||
|   border: 0; // 1 | ||||
|   padding: 0; // 2 | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Remove default vertical scrollbar in IE 8/9. | ||||
| // | ||||
| 
 | ||||
| textarea { | ||||
|   overflow: auto; // 1 | ||||
|   vertical-align: top; // 2 | ||||
|   overflow: auto; | ||||
| } | ||||
| 
 | ||||
| // | ||||
| // Don't inherit the `font-weight` (applied by a rule above). | ||||
| // NOTE: the default cannot safely be changed in Chrome and Safari on OS X. | ||||
| // | ||||
| 
 | ||||
| optgroup { | ||||
|   font-weight: bold; | ||||
| } | ||||
| 
 | ||||
| // ========================================================================== | ||||
| // Tables | ||||
| // ========================================================================== | ||||
| 
 | ||||
| @ -404,3 +416,8 @@ table { | ||||
|   border-collapse: collapse; | ||||
|   border-spacing: 0; | ||||
| } | ||||
| 
 | ||||
| td, | ||||
| th { | ||||
|   padding: 0; | ||||
| } | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user