From 7590e65f6f4641d946d0bfec2f4a84bbd3f561cd Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 24 Jul 2012 01:44:12 -0700
Subject: [PATCH] fix search form, mostly in navbar
---
docs/assets/css/bootstrap.css | 15 +++++++++------
docs/assets/css/docs.css | 2 +-
less/forms.less | 2 +-
less/navbar.less | 7 ++++---
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b0c966d22d..2598d89d9f 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -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;
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index ff7d48ae4f..ec1cfc9ebf 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -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;
diff --git a/less/forms.less b/less/forms.less
index ddadab8ca3..1a469072cb 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -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 */
diff --git a/less/navbar.less b/less/navbar.less
index 8cb4274110..0a38ef56e9 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -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;
--
GitLab