Download as
Browse Code »

Commit b6b4412efdd2a5452838f80369c1b29c5b5624a7

Authored by Sergio Oliveira
2 parents 6739438d 96c8c4dd
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Merge branch 'xmpp' of github.com:TracyWebTech/colab into xmpp

Showing 1 changed file with 11 additions and 9 deletions   Show diff stats
src/colab/static/css/screen.css
  Diff comments   View file @b6b4412
... ... @@ -299,9 +299,12 @@ form.sendXMPPMessage textarea {
299 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 310 .chatbox dl.dropdown {
... ... @@ -316,11 +319,6 @@ form.sendXMPPMessage textarea {
316 319 padding: 0;
317 320 }
318 321  
319   -img.spinner {
320   - display: none;
321   - background: blue;
322   -}
323   -
324 322 #chatpanel #toggle-controlbox {
325 323 font-size: 120%;
326 324 padding: 0 4px 5px;
... ... @@ -354,7 +352,7 @@ form#set-custom-xmpp-status .custom-xmpp-status {
354 352 }
355 353  
356 354 #users #converse-roster {
357   - height: 197.5px;
  355 + height: 215px;
358 356 }
359 357  
360 358 #available-chatrooms .available-chatroom {
... ... @@ -376,3 +374,7 @@ form#set-custom-xmpp-status .custom-xmpp-status {
376 374 .blog-post-item .tags {
377 375 margin-top: 1em;
378 376 }
  377 +
  378 +a.configure-chatroom-button, a.close-chatbox-button {
  379 + background-color: #F6F6F6;
  380 +}
... ...