mirror of https://github.com/twbs/bootstrap.git
				
				
				
			Fixes #14814: Use the link active bg variables for theme navbar gradients
This commit is contained in:
		
							parent
							
								
									38217ee405
								
							
						
					
					
						commit
						41a26ced24
					
				| 
						 | 
				
			
			@ -225,11 +225,11 @@
 | 
			
		|||
}
 | 
			
		||||
.navbar-default .navbar-nav > .open > a,
 | 
			
		||||
.navbar-default .navbar-nav > .active > a {
 | 
			
		||||
  background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
 | 
			
		||||
  background-image:      -o-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
 | 
			
		||||
  background-image: -webkit-gradient(linear, left top, left bottom, from(#ebebeb), to(#f3f3f3));
 | 
			
		||||
  background-image:         linear-gradient(to bottom, #ebebeb 0%, #f3f3f3 100%);
 | 
			
		||||
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);
 | 
			
		||||
  background-image: -webkit-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
 | 
			
		||||
  background-image:      -o-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
 | 
			
		||||
  background-image: -webkit-gradient(linear, left top, left bottom, from(#dbdbdb), to(#e2e2e2));
 | 
			
		||||
  background-image:         linear-gradient(to bottom, #dbdbdb 0%, #e2e2e2 100%);
 | 
			
		||||
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);
 | 
			
		||||
  background-repeat: repeat-x;
 | 
			
		||||
  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
 | 
			
		||||
          box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
 | 
			
		||||
| 
						 | 
				
			
			@ -249,11 +249,11 @@
 | 
			
		|||
}
 | 
			
		||||
.navbar-inverse .navbar-nav > .open > a,
 | 
			
		||||
.navbar-inverse .navbar-nav > .active > a {
 | 
			
		||||
  background-image: -webkit-linear-gradient(top, #222 0%, #282828 100%);
 | 
			
		||||
  background-image:      -o-linear-gradient(top, #222 0%, #282828 100%);
 | 
			
		||||
  background-image: -webkit-gradient(linear, left top, left bottom, from(#222), to(#282828));
 | 
			
		||||
  background-image:         linear-gradient(to bottom, #222 0%, #282828 100%);
 | 
			
		||||
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);
 | 
			
		||||
  background-image: -webkit-linear-gradient(top, #080808 0%, #0f0f0f 100%);
 | 
			
		||||
  background-image:      -o-linear-gradient(top, #080808 0%, #0f0f0f 100%);
 | 
			
		||||
  background-image: -webkit-gradient(linear, left top, left bottom, from(#080808), to(#0f0f0f));
 | 
			
		||||
  background-image:         linear-gradient(to bottom, #080808 0%, #0f0f0f 100%);
 | 
			
		||||
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);
 | 
			
		||||
  background-repeat: repeat-x;
 | 
			
		||||
  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
 | 
			
		||||
          box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| 
						 | 
				
			
			@ -225,11 +225,11 @@
 | 
			
		|||
}
 | 
			
		||||
.navbar-default .navbar-nav > .open > a,
 | 
			
		||||
.navbar-default .navbar-nav > .active > a {
 | 
			
		||||
  background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
 | 
			
		||||
  background-image:      -o-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
 | 
			
		||||
  background-image: -webkit-gradient(linear, left top, left bottom, from(#ebebeb), to(#f3f3f3));
 | 
			
		||||
  background-image:         linear-gradient(to bottom, #ebebeb 0%, #f3f3f3 100%);
 | 
			
		||||
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);
 | 
			
		||||
  background-image: -webkit-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
 | 
			
		||||
  background-image:      -o-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
 | 
			
		||||
  background-image: -webkit-gradient(linear, left top, left bottom, from(#dbdbdb), to(#e2e2e2));
 | 
			
		||||
  background-image:         linear-gradient(to bottom, #dbdbdb 0%, #e2e2e2 100%);
 | 
			
		||||
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);
 | 
			
		||||
  background-repeat: repeat-x;
 | 
			
		||||
  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
 | 
			
		||||
          box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
 | 
			
		||||
| 
						 | 
				
			
			@ -249,11 +249,11 @@
 | 
			
		|||
}
 | 
			
		||||
.navbar-inverse .navbar-nav > .open > a,
 | 
			
		||||
.navbar-inverse .navbar-nav > .active > a {
 | 
			
		||||
  background-image: -webkit-linear-gradient(top, #222 0%, #282828 100%);
 | 
			
		||||
  background-image:      -o-linear-gradient(top, #222 0%, #282828 100%);
 | 
			
		||||
  background-image: -webkit-gradient(linear, left top, left bottom, from(#222), to(#282828));
 | 
			
		||||
  background-image:         linear-gradient(to bottom, #222 0%, #282828 100%);
 | 
			
		||||
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);
 | 
			
		||||
  background-image: -webkit-linear-gradient(top, #080808 0%, #0f0f0f 100%);
 | 
			
		||||
  background-image:      -o-linear-gradient(top, #080808 0%, #0f0f0f 100%);
 | 
			
		||||
  background-image: -webkit-gradient(linear, left top, left bottom, from(#080808), to(#0f0f0f));
 | 
			
		||||
  background-image:         linear-gradient(to bottom, #080808 0%, #0f0f0f 100%);
 | 
			
		||||
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);
 | 
			
		||||
  background-repeat: repeat-x;
 | 
			
		||||
  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
 | 
			
		||||
          box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| 
						 | 
				
			
			@ -118,7 +118,7 @@
 | 
			
		|||
 | 
			
		||||
  .navbar-nav > .open > a,
 | 
			
		||||
  .navbar-nav > .active > a {
 | 
			
		||||
    #gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%));
 | 
			
		||||
    #gradient > .vertical(@start-color: darken(@navbar-default-link-active-bg, 5%); @end-color: darken(@navbar-default-link-active-bg, 2%));
 | 
			
		||||
    .box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -134,7 +134,7 @@
 | 
			
		|||
 | 
			
		||||
  .navbar-nav > .open > a,
 | 
			
		||||
  .navbar-nav > .active > a {
 | 
			
		||||
    #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%));
 | 
			
		||||
    #gradient > .vertical(@start-color: @navbar-inverse-link-active-bg; @end-color: lighten(@navbar-inverse-link-active-bg, 2.5%));
 | 
			
		||||
    .box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue