Merged r19393 and r19394 to 4.1-stable.

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19395 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 7e51238a045932ac3bf0bc95bf15276594b2d42b..3e0df1ee5c0843de1bb11fdc533773d2d40f1d6c 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -457,8 +457,8 @@ div.square {
 .splitcontenttop {flex: 2; flex-basis: 100%;}
 
 form {display: inline;}
-input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px; height: 24px; padding: 0 7px;}
-input, select, textarea { color: #333; background-color: #fff; border:1px solid #ccc; border-radius:3px; box-sizing: border-box;}
+input, select, button {vertical-align: middle; margin-top: 1px; margin-bottom: 1px; height: 24px; padding: 0 7px;}
+input, select, textarea, button { color: #333; background-color: #fff; border:1px solid #ccc; border-radius:3px; box-sizing: border-box;}
 select {
   -webkit-appearance: none;
   -moz-appearance: none;
@@ -472,7 +472,7 @@ select {
   padding-right: 20px;
 }
 input[type="file"] {border: 0; padding-left: 0; padding-right: 0; background-color: initial; }
-input[type="submit"] {
+input[type="submit"], button[type="submit"] {
   -webkit-appearance: button;
   cursor: pointer;
   background-color: #fff;
@@ -482,7 +482,7 @@ input[type="submit"] {
   -o-transition: background-color 100ms linear;
   transition: background-color 100ms linear;
 }
-input[type="submit"]:hover {
+input[type="submit"]:hover, button[type="submit"]:hover {
   background-color: #ddd;
 }