From e03b3243b0c544be524f4fe343d147db71155acb Mon Sep 17 00:00:00 2001
From: Thomas Park <thomas@thomaspark.me>
Date: Mon, 12 Mar 2012 18:33:03 -0400
Subject: amelia: bug fix on select padding (thanks bruno rocha)

---
 amelia/bootstrap.css     | 16 ++++++++--------
 amelia/bootstrap.min.css |  5 +++--
 amelia/bootswatch.less   | 11 ++++++++++-
 3 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'amelia')

diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css
index 27da523a..f20c597c 100644
--- a/amelia/bootstrap.css
+++ b/amelia/bootstrap.css
@@ -3613,10 +3613,6 @@ div.subnav .nav > li:first-child > a, div.subnav .nav > li:first-child > a:hover
   -moz-border-radius: 0;
   border-radius: 0;
 }
-div.subnav .nav > li:first-child > a:hover {
-  border-left-color: rgba(256, 256, 256, 0.4);
-  border-left-width: 1px;
-}
 div.subnav .nav > .active > a {
   background-color: transparent;
   border-color: transparent;
@@ -3630,6 +3626,10 @@ div.subnav .nav > .active > a:hover, div.subnav .nav > li > a:hover, div.subnav
   background-color: rgba(256, 256, 256, 0.4);
   color: rgba(256, 256, 256, 0.9);
 }
+div.subnav .nav > li:first-child > a:hover {
+  border-left-color: rgba(256, 256, 256, 0.4);
+  border-left-width: 1px;
+}
 div.subnav-fixed {
   top: 50px;
 }
@@ -3880,13 +3880,13 @@ label,
   color: rgba(256, 256, 256, 0.9);
   border: 0px solid transparent;
 }
-input,
-textarea,
-select,
-.uneditable-input {
+input, textarea, .uneditable-input {
   border: 0px solid transparent;
   padding: 10px;
 }
+select {
+  border: 0px solid transparent;
+}
 button {
   margin-left: 12px;
 }
diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css
index f15b3f05..f1da285a 100644
--- a/amelia/bootstrap.min.css
+++ b/amelia/bootstrap.min.css
@@ -649,9 +649,9 @@ footer.footer{border-top:1px solid rgba(256, 256, 256, 0.3);}
 div.subnav{background-color:rgba(42, 99, 105, 0.9);background-image:none;border:0px solid transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}div.subnav .nav>li.dropdown.open>a{border-color:transparent;background-color:rgba(256, 256, 256, 0.4);}
 div.subnav .nav>li>a{color:rgba(256, 256, 256, 0.9);border-color:transparent;}
 div.subnav .nav>li:first-child>a,div.subnav .nav>li:first-child>a:hover{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-div.subnav .nav>li:first-child>a:hover{border-left-color:rgba(256, 256, 256, 0.4);border-left-width:1px;}
 div.subnav .nav>.active>a{background-color:transparent;border-color:transparent;color:rgba(256, 256, 256, 0.9);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 div.subnav .nav>.active>a:hover,div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover{border-right-color:transparent;background-color:rgba(256, 256, 256, 0.4);color:rgba(256, 256, 256, 0.9);}
+div.subnav .nav>li:first-child>a:hover{border-left-color:rgba(256, 256, 256, 0.4);border-left-width:1px;}
 div.subnav-fixed{top:50px;}
 .navbar .nav-collapse.collapse li>a{color:rgba(256, 256, 256, 0.9);-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
 .navbar .nav-collapse.collapse li>a:hover{background-color:#d92432;}
@@ -693,7 +693,8 @@ div.subnav-fixed{top:50px;}
 .table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#1ebccb;}
 .table tbody tr:hover td,.table tbody tr:hover th{background-color:rgba(256, 256, 256, 0.4);}
 legend,label,.help-block,.input-file{color:rgba(256, 256, 256, 0.9);border:0px solid transparent;}
-input,textarea,select,.uneditable-input{border:0px solid transparent;padding:10px;}
+input,textarea,.uneditable-input{border:0px solid transparent;padding:10px;}
+select{border:0px solid transparent;}
 button{margin-left:12px;}
 input,textarea,.search-query,.uneditable-input,.input-append input,.input-append .uneditable-input,.input-prepend input,.input-prepend .uneditable-input{border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .form-actions{background-color:transparent;border-top:0px solid transparent;}
diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
index 90505cee..145114ba 100755
--- a/amelia/bootswatch.less
+++ b/amelia/bootswatch.less
@@ -140,6 +140,11 @@ div.subnav {
 	}
 }
 
+div.subnav .nav > li:first-child > a:hover {
+	border-left-color: rgba(256, 256, 256, 0.4);
+	border-left-width: 1px;
+}
+
 div.subnav-fixed {
 	top: 50px;
 }
@@ -326,11 +331,15 @@ legend, label, .help-block, .input-file {
 	border: 0px solid transparent;
 }
 
-input, textarea, select, .uneditable-input {
+input, textarea, .uneditable-input {
 	border: 0px solid transparent;
 	padding: 10px;
 }
 
+select {
+	border: 0px solid transparent;
+}
+
 button {
 	margin-left: 12px;
 }
-- 
cgit v1.2.3