0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-28 20:52:21 +01:00

fix search form, mostly in navbar

This commit is contained in:
Mark Otto 2012-07-24 01:44:12 -07:00
parent 394922a1bf
commit 7590e65f6f
4 changed files with 15 additions and 11 deletions

View File

@ -1533,9 +1533,9 @@ select:focus:required:invalid:focus {
/* IE7-8 doesn't have border-radius, so don't indent the padding */
margin-bottom: 0;
-webkit-border-radius: 14px;
-moz-border-radius: 14px;
border-radius: 14px;
-webkit-border-radius: 15px;
-moz-border-radius: 15px;
border-radius: 15px;
}
/* Allow for input prepend/append in search forms */
@ -4034,12 +4034,12 @@ input[type="submit"].btn.btn-mini {
.navbar-search {
position: relative;
float: left;
margin-top: 6px;
margin-top: 5px;
margin-bottom: 0;
}
.navbar-search .search-query {
padding: 4px 9px;
padding: 4px 14px;
margin-bottom: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
@ -4048,6 +4048,9 @@ input[type="submit"].btn.btn-mini {
color: #ffffff;
background-color: #515151;
border: 1px solid #040404;
-webkit-border-radius: 15px;
-moz-border-radius: 15px;
border-radius: 15px;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
@ -4071,7 +4074,7 @@ input[type="submit"].btn.btn-mini {
.navbar-search .search-query:focus,
.navbar-search .search-query.focused {
padding: 5px 10px;
padding: 5px 15px;
color: #333333;
text-shadow: 0 1px 0 #ffffff;
background-color: #ffffff;

View File

@ -892,7 +892,7 @@ form.bs-docs-example {
}
.bs-docs-sidenav {
width: 218px;
margin-top: 40px;
margin-top: 30px;
padding: 0;
margin-right: 10px;
background-color: #fff;

View File

@ -495,7 +495,7 @@ select:focus:required:invalid {
padding-left: 14px;
padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */
margin-bottom: 0; // Remove the default margin on all inputs
.border-radius(14px);
.border-radius(15px);
}
/* Allow for input prepend/append in search forms */

View File

@ -114,15 +114,16 @@
.navbar-search {
position: relative;
float: left;
.navbarVerticalAlign(28px); // Vertically center in navbar
.navbarVerticalAlign(30px); // Vertically center in navbar
margin-bottom: 0;
.search-query {
margin-bottom: 0;
padding: 4px 9px;
padding: 4px 14px;
#font > .sans-serif(13px, normal, 1);
color: @white;
background-color: @navbarSearchBackground;
border: 1px solid @navbarSearchBorder;
.border-radius(15px); // redeclare because of specificity of the type attribute
.box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)");
.transition(none);
@ -131,7 +132,7 @@
// Focus states (we use .focused since IE7-8 and down doesn't support :focus)
&:focus,
&.focused {
padding: 5px 10px;
padding: 5px 15px;
color: @grayDark;
text-shadow: 0 1px 0 @white;
background-color: @navbarSearchBackgroundFocus;