Commit ab1bc6701657bf82825f49b9b87bbdf2a15ebfd2
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
Merge branch 'rails3_chat' into rails3_stable
Conflicts: public/stylesheets/chat.css
Showing
1 changed file
with
18 additions
and
9 deletions
Show diff stats
public/stylesheets/chat.css
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | z-index: 900; | 8 | z-index: 900; |
| 9 | } | 9 | } |
| 10 | 10 | ||
| 11 | -#buddy-list { | 11 | +#chat #buddy-list { |
| 12 | background-color: #303030; | 12 | background-color: #303030; |
| 13 | width: 250px; | 13 | width: 250px; |
| 14 | height: 100%; | 14 | height: 100%; |
| @@ -29,26 +29,28 @@ | @@ -29,26 +29,28 @@ | ||
| 29 | #buddy-list .buddy-list li a, .occupant-list li a { | 29 | #buddy-list .buddy-list li a, .occupant-list li a { |
| 30 | background: none; | 30 | background: none; |
| 31 | display: block; | 31 | display: block; |
| 32 | - padding-left: 30px; | 32 | + padding-left: 20px; |
| 33 | padding-top: 10px; | 33 | padding-top: 10px; |
| 34 | text-decoration: none; | 34 | text-decoration: none; |
| 35 | color: rgb(238, 238, 238); | 35 | color: rgb(238, 238, 238); |
| 36 | + height: 44px; | ||
| 37 | + overflow: hidden; | ||
| 36 | } | 38 | } |
| 37 | #buddy-list .buddy-list li a .name, .occupant-list li a .name { | 39 | #buddy-list .buddy-list li a .name, .occupant-list li a .name { |
| 38 | vertical-align: top; | 40 | vertical-align: top; |
| 39 | margin-left: 5px; | 41 | margin-left: 5px; |
| 40 | } | 42 | } |
| 41 | #buddy-list .buddy-list li a img, .occupant-list li a img, #chat .avatar { | 43 | #buddy-list .buddy-list li a img, .occupant-list li a img, #chat .avatar { |
| 42 | - height: 32px; | ||
| 43 | - max-width: 32px; | ||
| 44 | border-radius: 5px; | 44 | border-radius: 5px; |
| 45 | + width: 32px; | ||
| 46 | + max-height: 40px; | ||
| 45 | } | 47 | } |
| 46 | #buddy-list .buddy-list li.offline, .occupant-list li.offline { | 48 | #buddy-list .buddy-list li.offline, .occupant-list li.offline { |
| 47 | display: none; | 49 | display: none; |
| 48 | } | 50 | } |
| 49 | #chat #buddy-list .toolbar { | 51 | #chat #buddy-list .toolbar { |
| 50 | border: 0; | 52 | border: 0; |
| 51 | - height: 40px; | 53 | + height: 45px; |
| 52 | background-color: rgb(39, 39, 39); | 54 | background-color: rgb(39, 39, 39); |
| 53 | border-bottom: 1px solid #383838; | 55 | border-bottom: 1px solid #383838; |
| 54 | } | 56 | } |
| @@ -116,7 +118,7 @@ | @@ -116,7 +118,7 @@ | ||
| 116 | background-position: 0; | 118 | background-position: 0; |
| 117 | } | 119 | } |
| 118 | #chat-window .history .message { | 120 | #chat-window .history .message { |
| 119 | - padding: 8px 8px 8px 6px; | 121 | + padding: 10px 8px 10px 6px; |
| 120 | } | 122 | } |
| 121 | #chat-window .history .message .time { | 123 | #chat-window .history .message .time { |
| 122 | float: right; | 124 | float: right; |
| @@ -207,11 +209,13 @@ | @@ -207,11 +209,13 @@ | ||
| 207 | top: 0; | 209 | top: 0; |
| 208 | right: 0; | 210 | right: 0; |
| 209 | width: 100%; | 211 | width: 100%; |
| 212 | + height: 40px; | ||
| 210 | background-color: rgb(39, 39, 39); | 213 | background-color: rgb(39, 39, 39); |
| 211 | } | 214 | } |
| 212 | .conversation .header .chat-target { | 215 | .conversation .header .chat-target { |
| 213 | - padding: 6px; | 216 | + padding: 6px 6px 0 6px; |
| 214 | display: inline-block; | 217 | display: inline-block; |
| 218 | + max-width: 70%; | ||
| 215 | } | 219 | } |
| 216 | .conversation .header .back { | 220 | .conversation .header .back { |
| 217 | float: right; | 221 | float: right; |
| @@ -225,6 +229,8 @@ | @@ -225,6 +229,8 @@ | ||
| 225 | } | 229 | } |
| 226 | #chat #chat-window .other-name, #chat #chat-window .history .self-name { | 230 | #chat #chat-window .other-name, #chat #chat-window .history .self-name { |
| 227 | color: #257CAD; | 231 | color: #257CAD; |
| 232 | + height: 23px; | ||
| 233 | + overflow: hidden; | ||
| 228 | } | 234 | } |
| 229 | #chat #chat-window .history h5 { | 235 | #chat #chat-window .history h5 { |
| 230 | text-align: center; | 236 | text-align: center; |
| @@ -237,7 +243,10 @@ | @@ -237,7 +243,10 @@ | ||
| 237 | background: #585858; | 243 | background: #585858; |
| 238 | border: 1px solid #6B6B6B; | 244 | border: 1px solid #6B6B6B; |
| 239 | } | 245 | } |
| 240 | -.user-status a { | 246 | +#chat #user-status { |
| 247 | + padding: 2px 4px; | ||
| 248 | +} | ||
| 249 | +#chat .user-status a { | ||
| 241 | color: rgb(224, 224, 224); | 250 | color: rgb(224, 224, 224); |
| 242 | } | 251 | } |
| 243 | #user-status .avatar { | 252 | #user-status .avatar { |
| @@ -253,7 +262,7 @@ | @@ -253,7 +262,7 @@ | ||
| 253 | } | 262 | } |
| 254 | 263 | ||
| 255 | .buddy-list span.name { | 264 | .buddy-list span.name { |
| 256 | - padding: 20px; | 265 | + padding: 20px 0 20px 20px; |
| 257 | position: relative; | 266 | position: relative; |
| 258 | left: -20px; | 267 | left: -20px; |
| 259 | } | 268 | } |