Merge branch 'rails3_chat' into rails3_stable

Victor Costa
2 parents ab1bc670 2542ec64
Showing 1 changed file with 4 additions and 0 deletions Show diff stats
public/stylesheets/chat.css
@@ -217,6 +217,9 @@
   display: inline-block;
   max-width: 70%;
 }
+.conversation .header .other-name {
+ color: rgb(238, 238, 238);
+}
 .conversation .header .back {
   float: right;
   margin: 6px;
@@ -231,6 +234,7 @@
   color: #257CAD;
   height: 23px;
   overflow: hidden;
+  vertical-align: top;
 }
 #chat #chat-window .history h5 {
   text-align: center;
...	...	@@ -217,6 +217,9 @@
217	217	display: inline-block;
218	218	max-width: 70%;
219	219	}
	220	+.conversation .header .other-name {
	221	+ color: rgb(238, 238, 238);
	222	+}
220	223	.conversation .header .back {
221	224	float: right;
222	225	margin: 6px;
...	...	@@ -231,6 +234,7 @@
231	234	color: #257CAD;
232	235	height: 23px;
233	236	overflow: hidden;
	237	+ vertical-align: top;
234	238	}
235	239	#chat #chat-window .history h5 {
236	240	text-align: center;
...	...