Ver Fonte

Merge pull request #405 from thierrytiti/css-fix

Css fixes
JC Brand há 10 anos atrás
pai
commit
b08b225308
3 ficheiros alterados com 14 adições e 7 exclusões
  1. 7 4
      css/converse.css
  2. 2 0
      docs/CHANGES.rst
  3. 5 3
      sass/converse.scss

+ 7 - 4
css/converse.css

@@ -1,3 +1,4 @@
+@charset "UTF-8";
 /*!
  * Converse.js (Web-based XMPP instant messaging client)
  * http://conversejs.org
@@ -32,11 +33,12 @@
   bottom: 0;
   direction: ltr;
   height: 35px;
-  left: 0;
+  left: auto;
   position: fixed;
-  right: 0;
+  right: 30px;
   z-index: 30;
   display: block;
+  width: auto;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
@@ -762,7 +764,8 @@
     display: block;
     margin-left: 5px; }
   #conversejs div.room-info {
-    clear: left; }
+    clear: left;
+    width: 100%; }
   #conversejs p.room-info {
     margin: 0;
     padding: 0;
@@ -793,7 +796,7 @@
     #conversejs dd.available-chatroom:hover {
       background-color: #E3C9C1; }
       #conversejs dd.available-chatroom:hover .room-info {
-        display: inline-block;
+        display: block;
         font-size: 14px; }
   #conversejs #converse-roster dd {
     border: none;

+ 2 - 0
docs/CHANGES.rst

@@ -11,6 +11,8 @@ Changelog
 * #389 Allow login panel placeholders and roster item 'Name' translations. [gbonvehi]
 * Add placeholder for "Insert a smiley" translation [thierrytiti]
 * Updated French translation [thierrytiti]
+* CSS fix: position and width of the div #conversejs [thierrytiti]
+* CSS fix: room-info bug on hover after room description loaded [thierrytiti]
 
 0.9.3 (2015-05-01)
 ------------------

+ 5 - 3
sass/converse.scss

@@ -46,11 +46,12 @@
   bottom: 0;
   direction: ltr;
   height: $bottom-gutter-height;
-  left: 0;
+  left: auto;
   position: fixed;
-  right: 0;
+  right: 30px;
   z-index: 30;
   display: block;
+  width: auto;
 
   @include box-sizing(border-box);
   *, *:before, *:after {
@@ -856,6 +857,7 @@
 
   div.room-info {
     clear: left;
+	width: 100%;
   }
 
   p.room-info {
@@ -896,7 +898,7 @@
     &:hover {
       background-color: $highlight-color;
       .room-info {
-        display: inline-block;
+        display: block;
         font-size: 14px;
       }
     }