Download as
Browse Code »

Commit c843fcb5fbc11af754b5d1653ef3cf0dd282d3c4

Authored by Rodrigo Souto
1 parent 68128c90
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

chat: right arrow on chat-label to toggle close

Showing 2 changed files with 24 additions and 4 deletions   Show diff stats
app/views/shared/logged_in/xmpp_chat.html.erb
  Diff comments   View file @c843fcb
... ... @@ -14,7 +14,8 @@
14 14  
15 15  
16 16 <div id="chat-label" class="opened">
17   - <span><%= _('Chat') %></span>
  17 + <span class="right-arrow">&gt;</span>
  18 + <span class="title"><%= _('Chat') %></span>
18 19 <br clear="both" />
19 20 <div class="icon-big-chat"></div>
20 21 </div>
... ...
public/stylesheets/chat.css
  Diff comments   View file @c843fcb
... ... @@ -4,7 +4,7 @@
4 4 position: fixed;
5 5 right: 0;
6 6 top: 0;
7   - z-index: 900;
  7 + z-index: 10;
8 8 background-color: #FFF;
9 9 box-shadow: -3px 0px 5px #888;
10 10 transition: width 0.3s ease-in;
... ... @@ -487,7 +487,7 @@ div.occupants &gt; a.up {
487 487 right: 350px;
488 488 cursor: pointer;
489 489 text-align: center;
490   - z-index: 7;
  490 + z-index: 11;
491 491 transition: background-color 0.2s linear, right 0.3s ease-in, width 0.3s ease-in;
492 492 border-top-left-radius: 10px;
493 493 border-bottom-left-radius: 10px;
... ... @@ -512,15 +512,34 @@ div.occupants &gt; a.up {
512 512  
513 513 #chat-label span {
514 514 color: white;
  515 +}
  516 +
  517 +#chat-label span.title {
515 518 font-size: 18px;
516 519 line-height: 24px;
  520 +}
  521 +
  522 +#chat-label span.right-arrow {
  523 + font-size: 24px;
  524 + line-height: 77px;
  525 +}
  526 +
  527 +#chat-label .title {
517 528 display: none;
518 529 }
519 530  
520   -#chat-label.opened span {
  531 +#chat-label.opened .title {
521 532 display: inline;
522 533 }
523 534  
  535 +#chat-label .right-arrow {
  536 + display: inline;
  537 +}
  538 +
  539 +#chat-label.opened .right-arrow {
  540 + display: none;
  541 +}
  542 +
524 543 #chat-label div {
525 544 width: 64px;
526 545 height: 64px;
... ...