From cdb243706e2fa4bedc359760f4955fd9fdd3fc0c Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Sun, 17 Nov 2013 23:07:28 +0100 Subject: Fix #11513: Don't always float navbar-text `navbar-text` should only float when the navbar is expanded on larger screens, otherwise the element might be (hidden) behind `navbar-nav`. Fixes #11513. X-Ref: #8820 #8815 --- less/navbar.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 987cde6b0..21cffc250 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -340,10 +340,10 @@ // Add a class to make any element properly align itself vertically within the navbars. .navbar-text { - float: left; .navbar-vertical-align(@line-height-computed); @media (min-width: @grid-float-breakpoint) { + float: left; margin-left: @navbar-padding-horizontal; margin-right: @navbar-padding-horizontal; } -- cgit v1.2.3 From 50578dda6072f104921ef1563d2928e5463f64cb Mon Sep 17 00:00:00 2001 From: Erik Flowers Date: Mon, 18 Nov 2013 11:58:14 -0700 Subject: - Firefox placeholder text is faded out and not the full color. Adding opacity:1 to it returns it to the proper color - (this is a re-commit since I messed up my branch last time and failed the travis build) --- less/mixins.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 3d24e668a..50ccafa7c 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -55,7 +55,7 @@ // Placeholder text .placeholder(@color: @input-color-placeholder) { &:-moz-placeholder { color: @color; } // Firefox 4-18 - &::-moz-placeholder { color: @color; } // Firefox 19+ + &::-moz-placeholder { color: @color; opacity:1; } // Firefox 19+ &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+ &::-webkit-input-placeholder { color: @color; } // Safari and Chrome } -- cgit v1.2.3 From 446f2325a6e4f730939e0fa3e12ba1f5fc53f27f Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 18 Nov 2013 14:22:17 -0800 Subject: add explanatory comment Re: #11526 --- less/mixins.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 50ccafa7c..e76d8d697 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -55,7 +55,8 @@ // Placeholder text .placeholder(@color: @input-color-placeholder) { &:-moz-placeholder { color: @color; } // Firefox 4-18 - &::-moz-placeholder { color: @color; opacity:1; } // Firefox 19+ + &::-moz-placeholder { color: @color; // Firefox 19+ + opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526 &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+ &::-webkit-input-placeholder { color: @color; } // Safari and Chrome } -- cgit v1.2.3