summary refs log tree commit diff
path: root/webclient/app.css
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2014-08-22 01:33:34 +0100
committerMatthew Hodgson <matthew@matrix.org>2014-08-22 01:33:34 +0100
commitfd47f55e943dc6950a1a84414e0ed8a08fbc504c (patch)
tree59de3abb4ae971fbc56653bfdf3e66c09e26fcc5 /webclient/app.css
parentrename autoComplete directive as tabComplete to avoid confusion with the auto... (diff)
downloadsynapse-fd47f55e943dc6950a1a84414e0ed8a08fbc504c.tar.xz
sacrifice a goat or two to make wordwrap actually work properly
Diffstat (limited to '')
-rw-r--r--webclient/app.css45
1 files changed, 19 insertions, 26 deletions
diff --git a/webclient/app.css b/webclient/app.css
index a63b5db4d6..dfc919e4c0 100644
--- a/webclient/app.css
+++ b/webclient/app.css
@@ -145,6 +145,7 @@ h1 {
     max-width: 1280px;
     width: 100%;
     border-collapse: collapse;
+    table-layout: fixed;
 }
         
 #messageTable td {
@@ -190,25 +191,13 @@ h1 {
     object-fit: cover;
 }
         
-.text {
-    background-color: #eee;
-    border: 1px solid #d8d8d8;
-    height: 31px;
-    display: inline-table;
-    margin-top: -1px;
-    max-width: 90%;
-    font-size: 16px;
-    /* word-wrap: break-word; */
-    word-break: break-all;
-}
-
 .emote {
-    background-color: #fff ! important;
+    background-color: transparent ! important;
     border: 0px ! important;
 }
 
 .membership {
-    background-color: #fff ! important;
+    background-color: transparent ! important;
     border: 0px ! important;
 }
 
@@ -221,6 +210,13 @@ h1 {
 }
 
 .bubble {
+    background-color: #eee;
+    border: 1px solid #d8d8d8;
+    display: inline-block;
+    margin-bottom: -1px;
+    max-width: 90%;
+    font-size: 16px;
+    word-wrap: break-word;
     padding-top: 7px;
     padding-bottom: 5px;
     padding-left: 1em;
@@ -229,27 +225,24 @@ h1 {
 }
 
 .differentUser td {
-    padding-top: 5px ! important;
-    margin-top: 5px ! important;
+    padding-bottom: 5px ! important;
 }
 
 .mine {
     text-align: right;
 }
 
-.mine .text {
-    background-color: #f8f8ff ! important;    
-}
-
-.mine .emote {
-    background-color: #fff ! important;    
-}
-
-.mine .membership {
-    background-color: #fff ! important;
+.text.emote .bubble,
+.text.membership .bubble,
+.mine .text.emote .bubble,
+.mine .text.membership .bubble
+  {
+    background-color: transparent ! important;    
+    border: 0px ! important;
 }
 
 .mine .text .bubble {
+    background-color: #f8f8ff ! important;    
     text-align: left ! important;
 }