Commit 284644ad2e455a0691c89a58dbc987743225d1bc
1 parent
b49c12d4
Exists in
master
and in
39 other branches
Fixing style for Chrome and IE10
Showing
1 changed file
with
11 additions
and
9 deletions
Show diff stats
src/colab/static/css/screen.css
| @@ -299,9 +299,12 @@ form.sendXMPPMessage textarea { | @@ -299,9 +299,12 @@ form.sendXMPPMessage textarea { | ||
| 299 | top: -7.5px; | 299 | top: -7.5px; |
| 300 | } | 300 | } |
| 301 | 301 | ||
| 302 | -#collective-xmpp-chat-data .chatbox dl.dropdown { | ||
| 303 | - margin-bottom: 15px; | ||
| 304 | - margin-top: -10px; | 302 | +#collective-xmpp-chat-data .chatbox .oc-chat-content dt.fancy-dropdown { |
| 303 | + margin-top: 7px; | ||
| 304 | +} | ||
| 305 | + | ||
| 306 | +#collective-xmpp-chat-data .chatbox form.set-xmpp-status{ | ||
| 307 | + padding: 0; | ||
| 305 | } | 308 | } |
| 306 | 309 | ||
| 307 | .chatbox dl.dropdown { | 310 | .chatbox dl.dropdown { |
| @@ -316,11 +319,6 @@ form.sendXMPPMessage textarea { | @@ -316,11 +319,6 @@ form.sendXMPPMessage textarea { | ||
| 316 | padding: 0; | 319 | padding: 0; |
| 317 | } | 320 | } |
| 318 | 321 | ||
| 319 | -img.spinner { | ||
| 320 | - display: none; | ||
| 321 | - background: blue; | ||
| 322 | -} | ||
| 323 | - | ||
| 324 | #chatpanel #toggle-controlbox { | 322 | #chatpanel #toggle-controlbox { |
| 325 | font-size: 120%; | 323 | font-size: 120%; |
| 326 | padding: 0 4px 5px; | 324 | padding: 0 4px 5px; |
| @@ -354,7 +352,7 @@ form#set-custom-xmpp-status .custom-xmpp-status { | @@ -354,7 +352,7 @@ form#set-custom-xmpp-status .custom-xmpp-status { | ||
| 354 | } | 352 | } |
| 355 | 353 | ||
| 356 | #users #converse-roster { | 354 | #users #converse-roster { |
| 357 | - height: 197.5px; | 355 | + height: 215px; |
| 358 | } | 356 | } |
| 359 | 357 | ||
| 360 | #available-chatrooms .available-chatroom { | 358 | #available-chatrooms .available-chatroom { |
| @@ -376,3 +374,7 @@ form#set-custom-xmpp-status .custom-xmpp-status { | @@ -376,3 +374,7 @@ form#set-custom-xmpp-status .custom-xmpp-status { | ||
| 376 | .blog-post-item .tags { | 374 | .blog-post-item .tags { |
| 377 | margin-top: 1em; | 375 | margin-top: 1em; |
| 378 | } | 376 | } |
| 377 | + | ||
| 378 | +a.configure-chatroom-button, a.close-chatbox-button { | ||
| 379 | + background-color: #F6F6F6; | ||
| 380 | +} |