diff --git a/.rubocop.yml b/.rubocop.yml index fae72b1a6..2ebb26cff 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -6,6 +6,10 @@ AllCops: Rails: Enabled: true +# Disable for rails 4 +Rails/HttpPositionalArguments: + Enabled: false + # Commonly used screens these days easily fit more than 80 characters. Metrics/LineLength: Max: 120 diff --git a/Changelog.md b/Changelog.md index e32666734..293e08f69 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,27 @@ +# 0.6.5.0 + +## Refactor +* Remove unused setPreload function [#7354](https://github.com/diaspora/diaspora/pull/7354) +* Remove jQuery deprecations [#7356](https://github.com/diaspora/diaspora/pull/7356) +* Use empty selector where "#" was used as a selector before (prepare jQuery 3 upgrade) [#7372](https://github.com/diaspora/diaspora/pull/7372) +* Increase maximal height of large thumbnail on mobile [#7383](https://github.com/diaspora/diaspora/pull/7383) +* Reduce conversation recipient size [#7376](https://github.com/diaspora/diaspora/pull/7376) +* Cleanup rtl css [#7374](https://github.com/diaspora/diaspora/pull/7374) +* Increase visual spacing between list items [#7401](https://github.com/diaspora/diaspora/pull/7401) +* Remove unused gem and cucumber step [#7410](https://github.com/diaspora/diaspora/pull/7410) +* Disable CSP header when `report_only` and no `report_uri` is set [#7367](https://github.com/diaspora/diaspora/pull/7367) + +## Bug fixes +* Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379) +* Disable autocomplete for the conversation form recipient input [#7375](https://github.com/diaspora/diaspora/pull/7375) +* Fix sharing indicator on profile page for blocked users [#7382](https://github.com/diaspora/diaspora/pull/7382) +* Remove post only after a successful deletion on the server [#7385](https://github.com/diaspora/diaspora/pull/7385) +* Fix an issue where pod admins could get logged out when using sidekiq-web [#7395](https://github.com/diaspora/diaspora/pull/7395) +* Add avatar fallback for typeahead and conversations [#7414](https://github.com/diaspora/diaspora/pull/7414) + +## Features +* Add links to liked and commented pages [#5502](https://github.com/diaspora/diaspora/pull/5502) + # 0.6.4.1 Fixes a possible Remote Code Execution ([CVE-2016-4658](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-4658)) and a possible DoS ([CVE-2016-5131](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-5131)) by updating Nokogiri, which in turn updates libxml2. diff --git a/Gemfile b/Gemfile index 6db6ec2c8..1fb74a0e1 100644 --- a/Gemfile +++ b/Gemfile @@ -288,7 +288,6 @@ group :test do gem "poltergeist", "1.13.0" gem "cucumber-api-steps", "0.13", require: false - gem "json_spec", "1.1.4" # General helpers diff --git a/Gemfile.lock b/Gemfile.lock index 880e2415f..3241688a5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -344,9 +344,6 @@ GEM url_safe_base64 json-schema (2.8.0) addressable (>= 2.4) - json_spec (1.1.4) - multi_json (~> 1.0) - rspec (>= 2.0, < 4.0) jsonpath (0.5.8) multi_json jwt (1.5.6) @@ -837,7 +834,6 @@ DEPENDENCIES js_image_paths (= 0.1.0) json (= 1.8.6) json-schema (= 2.8.0) - json_spec (= 1.1.4) leaflet-rails (= 0.7.7) logging-rails (= 0.5.0) markerb (= 1.1.0) diff --git a/README.md b/README.md index c91fc94fe..ef9585d16 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,7 @@ [Project site](https://diasporafoundation.org) | [Wiki](https://wiki.diasporafoundation.org) | [Bugtracker](https://github.com/diaspora/diaspora/issues) | -[Discussions](https://www.loomio.org/groups/194) | -[Mailing lists](https://wiki.diasporafoundation.org/How_We_Communicate#Mailing_Lists) | +[Discussions and Support](https://discourse.diasporafoundation.org/) | [License](/COPYRIGHT) | [Authors](https://github.com/diaspora/diaspora/contributors) @@ -31,9 +30,9 @@ Still haven't found an answer? Talk to us! Read [how we communicate](https://wik ## Contribute -To keep diaspora* growing and improving we need all help we can get. Whether you can contribute [code](https://wiki.diasporafoundation.org/Getting_started_with_contributing), [ideas](https://wiki.diasporafoundation.org/How_we_communicate#Loomio), [translations](https://wiki.diasporafoundation.org/Contribute_translations), [bug reports](https://wiki.diasporafoundation.org/How_to_report_a_bug) or simply extend the community as a [helpful user](https://wiki.diasporafoundation.org/Welcoming_committee) or [pod administrator](https://wiki.diasporafoundation.org/Installation), your help is welcome! +To keep diaspora\* growing and improving we need all help we can get. Whether you can contribute [code](https://wiki.diasporafoundation.org/Getting_started_with_contributing), [ideas](https://wiki.diasporafoundation.org/How_we_communicate#Discourse), [translations](https://wiki.diasporafoundation.org/Contribute_translations), [bug reports](https://wiki.diasporafoundation.org/How_to_report_a_bug) or simply extend the community as a [helpful user](https://wiki.diasporafoundation.org/Welcoming_committee) or [pod administrator](https://wiki.diasporafoundation.org/Installation), your help is welcome! -Everyone interacting in diaspora’s codebases, issue trackers, chat rooms, mailing lists, the wiki, and the Loomio group is expected to follow the diaspora\* [code of conduct](/CODE_OF_CONDUCT.md). +Everyone interacting in diaspora’s codebases, issue trackers, chat rooms, the wiki, and the Discourse is expected to follow the diaspora\* [code of conduct](/CODE_OF_CONDUCT.md). ## Security diff --git a/app/assets/javascripts/api/authorization_page.js b/app/assets/javascripts/api/authorization_page.js index d61b941ec..84b0f31b8 100644 --- a/app/assets/javascripts/api/authorization_page.js +++ b/app/assets/javascripts/api/authorization_page.js @@ -1,5 +1,5 @@ $(document).ready(function() { - $("#js-app-logo").error(function () { + $("#js-app-logo").on("error", function() { $(this).attr("src", ImagePaths.get("user/default.png")); }); }); diff --git a/app/assets/javascripts/app/app.js b/app/assets/javascripts/app/app.js index d95852882..57066f68d 100644 --- a/app/assets/javascripts/app/app.js +++ b/app/assets/javascripts/app/app.js @@ -60,11 +60,6 @@ var app = { return !!(window.gon.preloads && window.gon.preloads[prop]); //returning boolean variable so that parsePreloads, which cleans up properly is used instead }, - setPreload : function(prop, val) { - window.gon.preloads = window.gon.preloads || {}; - window.gon.preloads[prop] = val; - }, - parsePreload : function(prop) { if(!app.hasPreload(prop)) { return; } diff --git a/app/assets/javascripts/app/helpers/text_formatter.js b/app/assets/javascripts/app/helpers/text_formatter.js index a9ea53d3a..b8f46f7ef 100644 --- a/app/assets/javascripts/app/helpers/text_formatter.js +++ b/app/assets/javascripts/app/helpers/text_formatter.js @@ -45,7 +45,7 @@ "_" + "\\-" + "]+|<3", - // compare tag_strings in lib/diaspora/taggabe.rb + // compare tag_strings in lib/diaspora/taggable.rb preceding: "^|\\s" }); diff --git a/app/assets/javascripts/app/models/person.js b/app/assets/javascripts/app/models/person.js index 4d70fada4..0f548798b 100644 --- a/app/assets/javascripts/app/models/person.js +++ b/app/assets/javascripts/app/models/person.js @@ -30,7 +30,7 @@ app.models.Person = Backbone.Model.extend({ }, isBlocked: function() { - return (this.get('relationship') === 'blocked'); + return (this.get("block") !== false); }, block: function() { diff --git a/app/assets/javascripts/app/router.js b/app/assets/javascripts/app/router.js index ed8ec9d9a..b189cad86 100644 --- a/app/assets/javascripts/app/router.js +++ b/app/assets/javascripts/app/router.js @@ -217,6 +217,7 @@ app.Router = Backbone.Router.extend({ app.shortcuts = app.shortcuts || new app.views.StreamShortcuts({el: $(document)}); if ($("#publisher").length !== 0) { app.publisher = app.publisher || new app.views.Publisher({collection: app.stream.items}); + app.page.setupAvatarFallback($(".main-stream-publisher")); } $("#main_stream").html(app.page.render().el); diff --git a/app/assets/javascripts/app/views.js b/app/assets/javascripts/app/views.js index ebd8901a9..1249d3d3a 100644 --- a/app/assets/javascripts/app/views.js +++ b/app/assets/javascripts/app/views.js @@ -55,8 +55,7 @@ app.views.Base = Backbone.View.extend({ .html(this.template(presenter)) .attr("data-template", _.last(this.templateName.split("/"))); - // add avatar fallback if it can't be loaded - this.$el.find(this.avatars.selector).error(this.avatars.fallback); + this.setupAvatarFallback(this.$el); // add placeholder support for old browsers this.$("input, textarea").placeholder(); @@ -132,19 +131,20 @@ app.views.Base = Backbone.View.extend({ destroyModel: function(evt) { evt && evt.preventDefault(); - var self = this; var url = this.model.urlRoot + "/" + this.model.id; if( confirm(_.result(this, "destroyConfirmMsg")) ) { this.$el.addClass("deleting"); - this.model.destroy({ url: url }) - .done(function() { - self.remove(); - }) - .fail(function() { - self.$el.removeClass("deleting"); + this.model.destroy({ + url: url, + success: function() { + this.remove(); + }.bind(this), + error: function() { + this.$el.removeClass("deleting"); app.flashMessages.error(Diaspora.I18n.t("failed_to_remove")); - }); + }.bind(this) + }); } }, @@ -153,6 +153,10 @@ app.views.Base = Backbone.View.extend({ $(this).attr("src", ImagePaths.get("user/default.png")); }, selector: "img.avatar" + }, + + setupAvatarFallback: function(el) { + el.find(this.avatars.selector).on("error", this.avatars.fallback); } }); diff --git a/app/assets/javascripts/app/views/contact_stream_view.js b/app/assets/javascripts/app/views/contact_stream_view.js index cbc254c37..0fe60155e 100644 --- a/app/assets/javascripts/app/views/contact_stream_view.js +++ b/app/assets/javascripts/app/views/contact_stream_view.js @@ -18,7 +18,7 @@ app.views.ContactStream = Backbone.View.extend({ $("#paginate .loader").removeClass("hidden"); $.ajax(this._fetchUrl(), { context: this - }).success(function(response) { + }).done(function(response) { if (response.length === 0) { this.onEmptyResponse(); } else { diff --git a/app/assets/javascripts/app/views/content_view.js b/app/assets/javascripts/app/views/content_view.js index 485fca01c..7027ea97c 100644 --- a/app/assets/javascripts/app/views/content_view.js +++ b/app/assets/javascripts/app/views/content_view.js @@ -10,7 +10,6 @@ app.views.Content = app.views.Base.extend({ text : app.helpers.textFormatter(this.model.get("text"), this.model.get("mentioned_people")), largePhoto : this.largePhoto(), smallPhotos : this.smallPhotos(), - location: this.location(), isReshare : this.model.get("post_type") === "Reshare" }); }, @@ -38,11 +37,6 @@ app.views.Content = app.views.Base.extend({ $(evt.currentTarget).hide(); }, - location: function(){ - var location = this.model.get("location")? this.model.get("location") : ""; - return location; - }, - collapseOversized : function() { var collHeight = 200 , elem = this.$(".collapsible") diff --git a/app/assets/javascripts/app/views/conversations_form_view.js b/app/assets/javascripts/app/views/conversations_form_view.js index 74f848de3..e3b553b7a 100644 --- a/app/assets/javascripts/app/views/conversations_form_view.js +++ b/app/assets/javascripts/app/views/conversations_form_view.js @@ -1,6 +1,6 @@ // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later -app.views.ConversationsForm = Backbone.View.extend({ +app.views.ConversationsForm = app.views.Base.extend({ el: ".conversations-form-container", events: { @@ -39,8 +39,9 @@ app.views.ConversationsForm = Backbone.View.extend({ this.conversationRecipients.push(person); this.updateContactIdsListInput(); /* eslint-disable camelcase */ - this.tagListElement.append(HandlebarsTemplates.conversation_recipient_tag_tpl(person)); + var personEl = $(HandlebarsTemplates.conversation_recipient_tag_tpl(person)).appendTo(this.tagListElement); /* eslint-enable camelcase */ + this.setupAvatarFallback(personEl); }, prefill: function(handles) { diff --git a/app/assets/javascripts/app/views/conversations_inbox_view.js b/app/assets/javascripts/app/views/conversations_inbox_view.js index 4e301a8a0..67292cc75 100644 --- a/app/assets/javascripts/app/views/conversations_inbox_view.js +++ b/app/assets/javascripts/app/views/conversations_inbox_view.js @@ -1,6 +1,6 @@ // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later -app.views.ConversationsInbox = Backbone.View.extend({ +app.views.ConversationsInbox = app.views.Base.extend({ el: "#conversations-container", events: { @@ -46,6 +46,7 @@ app.views.ConversationsInbox = Backbone.View.extend({ setupConversation: function() { app.helpers.timeago($(this.el)); $(".control-icons a").tooltip({placement: "bottom"}); + this.setupAvatarFallback(this.$el); var conv = $(".conversation-wrapper .stream-element.selected"), cBadge = $("#conversations-link .badge"); diff --git a/app/assets/javascripts/app/views/location_stream.js b/app/assets/javascripts/app/views/location_stream.js index 925ee1f2f..8b3238c30 100644 --- a/app/assets/javascripts/app/views/location_stream.js +++ b/app/assets/javascripts/app/views/location_stream.js @@ -1,6 +1,6 @@ // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later -app.views.LocationStream = app.views.Content.extend({ +app.views.LocationStream = app.views.Base.extend({ events: { "click .near-from": "toggleMap" }, diff --git a/app/assets/javascripts/app/views/notification_dropdown_view.js b/app/assets/javascripts/app/views/notification_dropdown_view.js index c3f8f1911..c33287787 100644 --- a/app/assets/javascripts/app/views/notification_dropdown_view.js +++ b/app/assets/javascripts/app/views/notification_dropdown_view.js @@ -96,7 +96,7 @@ app.views.NotificationDropdown = app.views.Base.extend({ afterNotificationChanges: function(node) { node.find(".unread-toggle .entypo-eye").tooltip("destroy").tooltip(); - node.find(this.avatars.selector).error(this.avatars.fallback); + this.setupAvatarFallback(node); }, finishLoading: function() { diff --git a/app/assets/javascripts/app/views/post_controls_view.js b/app/assets/javascripts/app/views/post_controls_view.js index 78c0ee3df..879d4d623 100644 --- a/app/assets/javascripts/app/views/post_controls_view.js +++ b/app/assets/javascripts/app/views/post_controls_view.js @@ -76,6 +76,10 @@ app.views.PostControls = app.views.Base.extend({ $.post(Routes.postParticipation(this.model.get("id")), {_method: "delete"}, function() { this.model.set({participation: false}); }.bind(this)); + }, + + destroyModel: function() { + this.post.destroyModel(); } }); // @license-end diff --git a/app/assets/javascripts/app/views/profile_header_view.js b/app/assets/javascripts/app/views/profile_header_view.js index 1522b71e4..1fb6e0e1d 100644 --- a/app/assets/javascripts/app/views/profile_header_view.js +++ b/app/assets/javascripts/app/views/profile_header_view.js @@ -69,8 +69,8 @@ app.views.ProfileHeader = app.views.Base.extend({ $("#mentionModal").modal("hide"); app.publisher.clear(); app.publisher.remove(); - location.reload(); - }); + app.flashMessages.success(Diaspora.I18n.t("publisher.mention_success", {names: this.model.get("name")})); + }.bind(this)); }, mentionModalHidden: function() { diff --git a/app/assets/javascripts/app/views/publisher/uploader_view.js b/app/assets/javascripts/app/views/publisher/uploader_view.js index 775cf69bb..841952112 100644 --- a/app/assets/javascripts/app/views/publisher/uploader_view.js +++ b/app/assets/javascripts/app/views/publisher/uploader_view.js @@ -149,7 +149,7 @@ app.views.PublisherUploader = Backbone.View.extend({ dataType: "json", type: "DELETE", success: function() { - $.when(photo.fadeOut(400)).then(function(){ + photo.fadeOut(400, function() { photo.remove(); if( self.publisher.$(".publisher_photo").length === 0 ) { diff --git a/app/assets/javascripts/app/views/publisher_view.js b/app/assets/javascripts/app/views/publisher_view.js index de9245027..a80ef3555 100644 --- a/app/assets/javascripts/app/views/publisher_view.js +++ b/app/assets/javascripts/app/views/publisher_view.js @@ -44,7 +44,7 @@ app.views.Publisher = Backbone.View.extend({ // if there is data in the publisher we ask for a confirmation // before the user is able to leave the page $(window).on("beforeunload", _.bind(this._beforeUnload, this)); - $(window).unload(this.clear.bind(this)); + $(window).on("unload", this.clear.bind(this)); // sync textarea content if( this.hiddenInputEl.val() === "" ) { diff --git a/app/assets/javascripts/app/views/search_base_view.js b/app/assets/javascripts/app/views/search_base_view.js index eb00aaeaa..0d119938a 100644 --- a/app/assets/javascripts/app/views/search_base_view.js +++ b/app/assets/javascripts/app/views/search_base_view.js @@ -7,6 +7,7 @@ app.views.SearchBase = app.views.Base.extend({ if(options.customSearch) { this.setupCustomSearch(); } this.setupTypeahead(); if(options.autoselect) { this.setupAutoselect(); } + this.setupTypeaheadAvatarFallback(); }, bloodhoundTokenizer: function(str) { @@ -110,6 +111,12 @@ app.views.SearchBase = app.views.Base.extend({ }); }, + setupTypeaheadAvatarFallback: function() { + this.typeaheadInput.on("typeahead:render", function() { + this.setupAvatarFallback(this.$el); + }.bind(this)); + }, + ignorePersonForSuggestions: function(person) { if(person.handle) { this.ignoreDiasporaIds.push(person.handle); } } diff --git a/app/assets/javascripts/app/views/stream_post_views.js b/app/assets/javascripts/app/views/stream_post_views.js index 31746783c..c723d514b 100644 --- a/app/assets/javascripts/app/views/stream_post_views.js +++ b/app/assets/javascripts/app/views/stream_post_views.js @@ -28,10 +28,11 @@ app.views.StreamPost = app.views.Post.extend({ ".permalink"].join(", "), initialize : function(){ - var personId = this.model.get("author").id; - app.events.on("person:block:"+personId, this.remove, this); - - this.model.on("remove", this.remove, this); + // If we are on a user page, we don't want to remove posts on block + if (!app.page.model.has("profile")) { + var personId = this.model.get("author").id; + app.events.on("person:block:" + personId, this.remove, this); + } //subviews this.commentStreamView = new app.views.CommentStream({model : this.model}); this.oEmbedView = new app.views.OEmbed({model : this.model}); diff --git a/app/assets/javascripts/app/views/stream_view.js b/app/assets/javascripts/app/views/stream_view.js index 45e2091ff..687822595 100644 --- a/app/assets/javascripts/app/views/stream_view.js +++ b/app/assets/javascripts/app/views/stream_view.js @@ -28,6 +28,12 @@ app.views.Stream = app.views.InfScroll.extend({ var streamSelection = $("#stream_selection"); streamSelection.find("[data-stream]").removeClass("selected"); streamSelection.find("[data-stream='" + activeStream + "']").addClass("selected"); + + var activityContainer = streamSelection.find(".my-activity"); + activityContainer.removeClass("activity-stream-selected"); + if (activeStream === "activity" || activeStream === "liked" || activeStream === "commented") { + activityContainer.addClass("activity-stream-selected"); + } }, initInvitationModal : function() { diff --git a/app/assets/javascripts/app/views/tags_view.js b/app/assets/javascripts/app/views/tags_view.js index 9b70df1e6..8d25c9800 100644 --- a/app/assets/javascripts/app/views/tags_view.js +++ b/app/assets/javascripts/app/views/tags_view.js @@ -1,12 +1,12 @@ // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later -app.views.Tags = Backbone.View.extend({ +app.views.Tags = app.views.Base.extend({ initialize: function(opts) { if(app.publisher) { app.publisher.setText("#"+ opts.hashtagName + " "); } // add avatar fallback if it can't be loaded - $(app.views.Base.prototype.avatars.selector).error(app.views.Base.prototype.avatars.fallback); + this.setupAvatarFallback($("#tags_show")); } }); // @license-end diff --git a/app/assets/javascripts/helpers/markdown_editor.js b/app/assets/javascripts/helpers/markdown_editor.js index 55df13480..5706888a1 100644 --- a/app/assets/javascripts/helpers/markdown_editor.js +++ b/app/assets/javascripts/helpers/markdown_editor.js @@ -65,7 +65,7 @@ Diaspora.MarkdownEditor.prototype = { var tabElement = $(""); var writeTab = $(""); - this.writeLink = $("") + this.writeLink = $("") .attr("title", Diaspora.I18n.t("publisher.markdown_editor.tooltips.write")); this.writeLink.append($("")); @@ -80,7 +80,7 @@ Diaspora.MarkdownEditor.prototype = { writeTab.append(this.writeLink); var previewTab = $(""); - this.previewLink = $("") + this.previewLink = $("") .attr("title", Diaspora.I18n.t("publisher.markdown_editor.tooltips.preview")); this.previewLink.append($("")); diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 87f9d1cba..e8840b6dc 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -10,8 +10,6 @@ //= require charcount //= require jquery-placeholder //= require rails-timeago -//= require jquery.events.input -//= require jquery.infinitescroll-custom //= require jquery-ui/core //= require jquery-ui/widget //= require jquery-ui/mouse diff --git a/app/assets/stylesheets/conversations.scss b/app/assets/stylesheets/conversations.scss index 2c5b7b7e7..7c0bf90c5 100644 --- a/app/assets/stylesheets/conversations.scss +++ b/app/assets/stylesheets/conversations.scss @@ -197,16 +197,14 @@ } .recipients-tag-list { + margin: 0 -2px $form-group-margin-bottom; + .conversation-recipient-tag { background-color: $brand-primary; border-radius: $btn-border-radius-base; display: inline-flex; - margin: 0 2px $form-group-margin-bottom; - padding: 8px; - - &:first-child { margin-left: 0; } - - &:last-child { margin-right: 0; } + margin: 0 2px; + padding: $btn-border-radius-base; div { align-self: center; @@ -215,9 +213,9 @@ } .avatar { - height: 40px; + height: 35px; margin-right: 8px; - width: 40px; + width: 35px; } .name-and-handle { diff --git a/app/assets/stylesheets/markdown-content.scss b/app/assets/stylesheets/markdown-content.scss index 316907fb1..6b092dbdb 100644 --- a/app/assets/stylesheets/markdown-content.scss +++ b/app/assets/stylesheets/markdown-content.scss @@ -3,8 +3,9 @@ p:last-child { margin-bottom: 0; } ul, ol { - margin-top:0.8em; - margin-bottom:0.8em; + margin-bottom: .8em; + margin-top: .8em; + li { margin-bottom: .5em; } &:first-child { margin-top: 0; } &:last-child { margin-bottom: 0; } } diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss index e48c64596..54d01870e 100644 --- a/app/assets/stylesheets/mobile/mobile.scss +++ b/app/assets/stylesheets/mobile/mobile.scss @@ -625,20 +625,6 @@ h1.session { font-weight: 200; } -form p.checkbox_select { - position: relative; - label { - left: 25px; - top: 4px; - position: absolute; - font-size: 1em; - } - img { - position: relative; - top: 6px; - } -} - #profile_photo_upload { margin-top: 5px; min-height: 100px; diff --git a/app/assets/stylesheets/navbar_left.scss b/app/assets/stylesheets/navbar_left.scss index 56134c3bf..498b4fde5 100644 --- a/app/assets/stylesheets/navbar_left.scss +++ b/app/assets/stylesheets/navbar_left.scss @@ -30,16 +30,14 @@ } } - .all-aspects .hoverable.selected, - .followed-tags-sidebar .hoverable.selected, + .nested-list .hoverable.selected, .selected > .hoverable { color: $white; background: $gray; border-color: $gray; } - .all-aspects ul, - .followed-tags-sidebar ul { + .nested-list ul { background: $left-navbar-drawer-background; li { padding: 0; } .entypo-check { visibility: hidden; } @@ -59,6 +57,16 @@ .hoverable:hover > .action { visibility: visible; } } + .my-activity { + ul { + display: none; + } + + &.activity-stream-selected ul { + display: block; + } + } + #tags_list { #new_tag_following { padding: 10px 20px 10px 30px; diff --git a/app/assets/stylesheets/rtl.scss b/app/assets/stylesheets/rtl.scss index bec248686..bc260b9b5 100644 --- a/app/assets/stylesheets/rtl.scss +++ b/app/assets/stylesheets/rtl.scss @@ -3,21 +3,6 @@ body { text-align: right; } -.right { - left: 0; - right: auto; -} - -.stream-element .content { - padding-right: 60px; - padding-left: 0; -} - -.stream-element .right { - left: 12px; - right: auto; -} - ul.as-selections li { float: right; } @@ -31,65 +16,11 @@ ul.as-selections li.as-selection-item { padding: 3px 6px 3px 0; } -#profile_photo_upload img { - left: auto; - right: 0; -} - -#profile_photo_upload { - padding-left: 0; - padding-right: 120px; -} - -form p.checkbox_select label { - right: 20px; - left: auto; -} - -#update_profile_form h4 textarea[placeholder] { - right: -9999px; - left: auto; -} - -label { - right: 0.48em; - left: auto; -} - ul, ol { margin: 0 0 1.5em 1.5em; padding-right: 3.333em; } -.last { - margin-left: 0; -} - -ul.comments li .content, ul.show_comments li .content, div.likes li .content, div.dislikes li .content { - padding-left: 10px; - padding-right: 36px; -} - -ul.comments li form p, ul.show_comments li form p, div.likes li form p, div.dislikes li form p { - left: auto; - right: 35px; -} - -.stream .stream-element time { - right: auto; - left: 20px; -} - -.stream-element.conversation .message-count { - right: auto; - left: 10px; -} - -.stream-element.conversation .timestamp { - right: auto; - left: 10px; -} - div.content span.rtl { display: block; } diff --git a/app/assets/stylesheets/stream_element.scss b/app/assets/stylesheets/stream_element.scss index 0cf1c6067..2ef09f3e0 100644 --- a/app/assets/stylesheets/stream_element.scss +++ b/app/assets/stylesheets/stream_element.scss @@ -4,7 +4,8 @@ margin: 0px; } &.deleting { - > .media { opacity: 0.3; } + opacity: .3; + .control-icons { display: none !important; } } } diff --git a/app/assets/templates/header_tpl.jst.hbs b/app/assets/templates/header_tpl.jst.hbs index ab8a27a95..ee9eb0fb7 100644 --- a/app/assets/templates/header_tpl.jst.hbs +++ b/app/assets/templates/header_tpl.jst.hbs @@ -43,7 +43,7 @@