merge master into input-simplify

diff --cc apps/files/css/files.css
index 89cadbc83370ec12b9e67e410c0dbde1ca1ae4e3,138b15db04fff6c8fb950738e1a62209155b38cb..f10e26a97712d1605c9c3307180308cfea23de01
--- 1/apps/files/css/files.css
--- 2/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@@ -7,16 -7,34 +7,35 @@@
  .actions input, .actions button, .actions .button { margin:0; float:left; }
  .actions .button a { color: #555; }
  .actions .button a:hover, .actions .button a:active { color: #333; }
- #new {
-       height: 17px;
++
+ #new, #trash {
        z-index: 1010;
        float: left;
+       padding: 0 !important; /* override default control bar button padding */
+ }
+ #trash {
+       margin: 0 1em;
+       float: right;
+ }
+ #new>a, #trash>a {
+       padding: 14px 10px;
+       position: relative;
+       top: 7px;
+ }
+ #new.active {
+       border-bottom-left-radius: 0;
+       border-bottom-right-radius: 0;
+       border-bottom: none;
  }
- #new.active { border-bottom-left-radius:0; border-bottom-right-radius:0; border-bottom:none; }
- #new>a { padding:.5em 1.2em .3em; }
  #new>ul {
-       display:none; position:fixed; min-width:7em; z-index:10;
-       padding:.5em; padding-bottom:0; margin-top:.075em; margin-left:-.5em;
+       display: none;
+       position: fixed;
+       min-width: 7em;
+       z-index: 10;
+       padding: .5em;
+       padding-bottom: 0;
+       margin-top: 14px;
+       margin-left: -1px;
        text-align:left;
        background: #f8f8f8;
        border: 1px solid #ddd;

diff --cc core/css/styles.css
Simple merge

diff --cc settings/css/settings.css
Simple merge