Merge remote-tracking branch 'origin/develop' into develop

2018-03-12 18:06:05 +00:00 · 2018-03-12 18:06:05 +00:00 · a3c80b7178
commit a3c80b7178
parent 3d6984e8e3 74b45322b2
1 changed files with 3 additions and 1 deletions
--- a/src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss
@ -34,10 +34,12 @@ limitations under the License.

    display: flex;
    justify-content: center;
-    align-items: center;
+    align-items: flex-start;
 }

 .mx_TagPanel .mx_TagPanel_clearButton object {
+    /* Same as .mx_SearchBox padding-top */
+    margin-top: 24px;
    pointer-events: none;
 }