From beb9f11da1663d478ada50b7c92c1701fc4715ee Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 4 Oct 2015 15:49:48 +0200 Subject: [PATCH 1/2] Remove unused rtl code --- app/assets/stylesheets/rtl.scss | 188 -------------------------------- 1 file changed, 188 deletions(-) diff --git a/app/assets/stylesheets/rtl.scss b/app/assets/stylesheets/rtl.scss index 30f7f2afe..7e6f55643 100644 --- a/app/assets/stylesheets/rtl.scss +++ b/app/assets/stylesheets/rtl.scss @@ -1,68 +1,13 @@ -@import "colors"; - body { direction: rtl; text-align: right; } -#user_menu { - left: 0; - right: auto; -} - -.diaspora_header_logo { - float: right; - margin-left: 1em; - margin-right: 0; -} - -#global_search { - float: right; -} - -#notification_badge, #conversations_badge { - margin: 0 10px 0 -5px; -} - -#nav_badges { - left: auto; - right: 460px; - margin-right: -20px; -} - -#view_all_notifications { - float: left; - margin-right: 0; - margin-left: 3px; -} - -#notification_badge, #conversations_badge { - margin: 0 10px 0 -5px; -} - -#notification_badge a, #conversations_badge a { - right: 0; -} - -.append-2 { - padding-left: 80px; - padding-right: 0px; - float: right; -} - -footer ul#footer_nav { - float: left; -} - .right { left: 0; right: auto; } -.rightbar .right { - margin-right: 70px; -} - .stream .avatar { float: right; } @@ -72,74 +17,6 @@ footer ul#footer_nav { padding-left: 0; } -#publisher_textarea_wrapper textarea { - left: auto; -} - -#publisher_textarea_wrapper #file-upload, #publisher_textarea_wrapper #hide_publisher { - right: auto; - left: 0; - margin-left: 3px; -} - -#publisher .options_and_submit .public_toggle { - text-align: left; -} - -#publisher #click_to_share img { - right: 0; - left: auto; -} - -#publisher #click_to_share span { - margin-right: 12px; - margin-left: 0; -} - -#publisher_textarea_wrapper #photodropzone { - right: 5px; - left: auto; -} - -#publisher_textarea_wrapper #photodropzone li .circle { - left: -7px; - right: auto; -} - -#publisher_textarea_wrapper #photodropzone li .x { - left: -1px; - right: auto; -} - -#webSocketContainer { - left: auto !important; - right: -100px; -} - -header ul#user_menu { - padding: 5px 30px 5px 5px; - right: auto; - margin: -2px 0 0 -5px; -} - -header ul#user_menu .avatar { - left: auto; - right: 2px; -} - -header ul#user_menu a { - padding-left: 15px; -} - -header ul#user_menu .right { - right: auto; - left: 5px; -} - -#sort_by { - float: left; -} - .stream_element .right { left: 12px; right: auto; @@ -173,47 +50,21 @@ form p.checkbox_select label { left: auto; } -.prepend-5 { - float: right; - padding-right: 200px; - padding-left: 0; -} - #update_profile_form h4 textarea[placeholder] { right: -9999px; left: auto; } -.prepend-8 { - padding-right: 320px; - padding-left: 0; -} - -textarea.comment_box { - left: auto; - right: -9999px; -} - label { right: 0.48em; left: auto; } -ul#settings_nav { - right: 198px; - left: auto; -} - ul, ol { margin: 0 0 1.5em 1.5em; padding-right: 3.333em; } -ul#settings_nav > li { - margin-left: 1em; - margin-right: 0; -} - .last { margin-left: 0; } @@ -233,31 +84,6 @@ ul.comments li form p, ul.show_comments li form p, div.likes li form p, div.disl left: 20px; } -.aspect_list .name { - right: 1em; - left: auto; -} - -.aspect_list ul > li .right { - left: 1em; - right: auto; -} - -.share_with .add_aspect .right { - right: auto; - left: 1em; -} - -.share_with .done .right { - right: auto; - left: 1em; -} - -.share_with .add_aspect p { - padding-right: 1em; - padding-left: 0; -} - .stream_element.conversation .message-count { right: auto; left: 10px; @@ -268,20 +94,6 @@ ul.comments li form p, ul.show_comments li form p, div.likes li form p, div.disl left: 10px; } -ul.left_nav .item_count, ul.left_nav .edit { - float: left; -} - -.prepend-9 { - padding-left: 0; - padding-right: 361px; -} - -.stream_container { - border-left: 0; - border-right: 1px solid $border-grey; -} - div.content span.rtl { display: block; } From d3cb8f9c4c1b253b060a23d6e0a2cc866bbf7dda Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 4 Oct 2015 16:33:26 +0200 Subject: [PATCH 2/2] Fix participants count in RTL conversations view --- app/assets/stylesheets/rtl.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/assets/stylesheets/rtl.scss b/app/assets/stylesheets/rtl.scss index 7e6f55643..15a564872 100644 --- a/app/assets/stylesheets/rtl.scss +++ b/app/assets/stylesheets/rtl.scss @@ -8,10 +8,6 @@ body { right: auto; } -.stream .avatar { - float: right; -} - .stream_element .content { padding-right: 60px; padding-left: 0;