Merge pull request #342 from mattermost/release-0.6.0

Release 0.6.0

2 files changed, 27 insertions, 2 deletions

diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss
index ddc5e98bb..22e2f44c5 100644
--- a/web/sass-files/sass/partials/_files.scss
+++ b/web/sass-files/sass/partials/_files.scss
@@ -114,8 +114,7 @@
   height: 100px;
   float: left;
   margin: 5px 10px 5px 0;
-  @include display-flex;
-  display: -ms-flexbox;
+  display: table;
   border: 1px solid lightgrey;
   .post__load {
     height: 100%;
@@ -137,10 +136,14 @@
     }
   }
   .post-image__thumbnail {
+    display: table-cell;
+    vertical-align: top;
     width: 50%;
     height: 100%;
   }
   .post-image__details {
+    display: table-cell;
+    vertical-align: top;
     width: 50%;
     height: 100%;
     background: white;
diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss
index 4b6ee79a1..3a6f73316 100644
--- a/web/sass-files/sass/partials/_signup.scss
+++ b/web/sass-files/sass/partials/_signup.scss
@@ -54,6 +54,28 @@
         margin-bottom: 1em;
     }
 
+    .input-group {
+        &.input-group--limit {
+            table-layout: fixed;
+            width: 100%;
+            .tooltip-inner {
+                word-wrap: break-word;
+            }
+            .form-control {
+                text-align: left;
+                display: table-cell;
+                width: 100%;
+            }
+            .input-group-addon {
+                text-align: left;
+                width: 50%;
+                display: table-cell;
+                overflow: hidden;
+                text-overflow: ellipsis;
+            }
+        }
+    }
+
     .inner__content {
         padding: 0 15px;
         margin: 30px 0 20px;