Commit b08b2253 authored by JC Brand's avatar JC Brand

Merge pull request #405 from thierrytiti/css-fix

Css fixes
parents 44b13c1d 7fb4ad30
@charset "UTF-8";
/*! /*!
* Converse.js (Web-based XMPP instant messaging client) * Converse.js (Web-based XMPP instant messaging client)
* http://conversejs.org * http://conversejs.org
...@@ -32,11 +33,12 @@ ...@@ -32,11 +33,12 @@
bottom: 0; bottom: 0;
direction: ltr; direction: ltr;
height: 35px; height: 35px;
left: 0; left: auto;
position: fixed; position: fixed;
right: 0; right: 30px;
z-index: 30; z-index: 30;
display: block; display: block;
width: auto;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
...@@ -762,7 +764,8 @@ ...@@ -762,7 +764,8 @@
display: block; display: block;
margin-left: 5px; } margin-left: 5px; }
#conversejs div.room-info { #conversejs div.room-info {
clear: left; } clear: left;
width: 100%; }
#conversejs p.room-info { #conversejs p.room-info {
margin: 0; margin: 0;
padding: 0; padding: 0;
...@@ -793,7 +796,7 @@ ...@@ -793,7 +796,7 @@
#conversejs dd.available-chatroom:hover { #conversejs dd.available-chatroom:hover {
background-color: #E3C9C1; } background-color: #E3C9C1; }
#conversejs dd.available-chatroom:hover .room-info { #conversejs dd.available-chatroom:hover .room-info {
display: inline-block; display: block;
font-size: 14px; } font-size: 14px; }
#conversejs #converse-roster dd { #conversejs #converse-roster dd {
border: none; border: none;
......
...@@ -11,6 +11,8 @@ Changelog ...@@ -11,6 +11,8 @@ Changelog
* #389 Allow login panel placeholders and roster item 'Name' translations. [gbonvehi] * #389 Allow login panel placeholders and roster item 'Name' translations. [gbonvehi]
* Add placeholder for "Insert a smiley" translation [thierrytiti] * Add placeholder for "Insert a smiley" translation [thierrytiti]
* Updated French 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) 0.9.3 (2015-05-01)
------------------ ------------------
......
...@@ -46,11 +46,12 @@ ...@@ -46,11 +46,12 @@
bottom: 0; bottom: 0;
direction: ltr; direction: ltr;
height: $bottom-gutter-height; height: $bottom-gutter-height;
left: 0; left: auto;
position: fixed; position: fixed;
right: 0; right: 30px;
z-index: 30; z-index: 30;
display: block; display: block;
width: auto;
@include box-sizing(border-box); @include box-sizing(border-box);
*, *:before, *:after { *, *:before, *:after {
...@@ -856,6 +857,7 @@ ...@@ -856,6 +857,7 @@
div.room-info { div.room-info {
clear: left; clear: left;
width: 100%;
} }
p.room-info { p.room-info {
...@@ -896,7 +898,7 @@ ...@@ -896,7 +898,7 @@
&:hover { &:hover {
background-color: $highlight-color; background-color: $highlight-color;
.room-info { .room-info {
display: inline-block; display: block;
font-size: 14px; font-size: 14px;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment