Merge branch 'msg' into staging

2017-07-10 11:48:22 +02:00
parent 8e2e8b1653 1c531ccd47
commit 159d72f33b
27 changed files with 1341 additions and 21 deletions
--- a/www/profile/main.less
+++ b/www/profile/main.less
@@ -58,7 +58,7 @@
                min-height: 100%;
                max-width: none;
                max-height: none;
-                flex-shrink: 0;
+                flex: 1;
            }
        }
        button {
@@ -96,6 +96,15 @@
            line-height: 40px;
        }
    }
+
+    // I tried using flexbox but messed with how the pencil icon was displayed
+    #inviteButton {
+        float: right;
+    }
+    #viewProfileButton {
+        margin-bottom: 20px;
+        float: right;
+    }
    #description {
        position: relative;
        font-size: 16px;