Merge branch 'master' into routing

[rails.git] / app / assets / stylesheets / common.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.scss
similarity index 99%
rename from app/assets/stylesheets/common.css.scss
rename to app/assets/stylesheets/common.scss
index 8d40bbe39dfc2e460d288d5474d48a25b345eb9a..ff16ad66b3a78371d922f3ecabb44871cd5b813a 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1954,6 +1954,10 @@ tr.turn:hover {
   display: block;
 }
 
   display: block;
 }
 

+select {
+  padding: 2px;
+}
+

 input[type="checkbox"],
 input[type="radio"] {
     margin-right: 5px;
 input[type="checkbox"],
 input[type="radio"] {
     margin-right: 5px;


@@ -1964,6 +1968,7 @@ input[type="email"],
 input[type="url"],
 input[type="password"],
 textarea {
 input[type="url"],
 input[type="password"],
 textarea {

+  background-color: #fff;

   border: 1px solid #ccc;
   padding: 2px 5px;
   margin: 0;
   border: 1px solid #ccc;
   padding: 2px 5px;
   margin: 0;