mirror of https://github.com/twbs/bootstrap.git
				
				
				
			run grunt
This commit is contained in:
		
							parent
							
								
									a28d9539c7
								
							
						
					
					
						commit
						b05a287eb6
					
				| 
						 | 
					@ -2583,7 +2583,7 @@ input[type="button"].btn-block {
 | 
				
			||||||
@font-face {
 | 
					@font-face {
 | 
				
			||||||
  font-family: 'Glyphicons Halflings';
 | 
					  font-family: 'Glyphicons Halflings';
 | 
				
			||||||
  src: url('../fonts/glyphicons-halflings-regular.eot');
 | 
					  src: url('../fonts/glyphicons-halflings-regular.eot');
 | 
				
			||||||
  src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
 | 
					  src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.glyphicon {
 | 
					.glyphicon {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| 
						 | 
					@ -1769,7 +1769,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 | 
				
			||||||
  Tab.prototype.show = function () {
 | 
					  Tab.prototype.show = function () {
 | 
				
			||||||
    var $this    = this.element
 | 
					    var $this    = this.element
 | 
				
			||||||
    var $ul      = $this.closest('ul:not(.dropdown-menu)')
 | 
					    var $ul      = $this.closest('ul:not(.dropdown-menu)')
 | 
				
			||||||
    var selector = $this.attr('data-target')
 | 
					    var selector = $this.data('target')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (!selector) {
 | 
					    if (!selector) {
 | 
				
			||||||
      selector = $this.attr('href')
 | 
					      selector = $this.attr('href')
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
		Loading…
	
		Reference in New Issue