Commit eddfa7cb authored by Steffen van Bergerem's avatar Steffen van Bergerem
Browse files

Merge pull request #6309 from AugierLe42e/left-navbar-polishing 

Left and right navbar polishing
parents e54208d3 450bf4f4

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure. 
* Remove unused header icons and an unused favicon  [#6283](https://github.com/diaspora/diaspora/pull/6283)

* Replace mobile icons for post interactions with Entypo icons [#6291](https://github.com/diaspora/diaspora/pull/6291)

* Replace jquery.autocomplete with typeahead.js [#6293](https://github.com/diaspora/diaspora/pull/6293)

* Redesign sidebars on stream pages [#6309](https://github.com/diaspora/diaspora/pull/6309)



## Bug fixes

* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)

app/assets/javascripts/app/views/aspect_view.js

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ app.views.Aspect = app.views.Base.extend({ 
  className: 'hoverable',



  events: {

    "click .entypo-check+a": "toggleAspect"

    "click .aspect-item": "toggleAspect"

  },



  toggleAspect: function(evt) {

app/assets/javascripts/app/views/aspects_list_view.js

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ app.views.AspectsList = app.views.Base.extend({ 
  },



  appendAspect: function(aspect) {

    $("#aspects_list > *:last").before(new app.views.Aspect({

    $("#aspects_list > .hoverable:last").before(new app.views.Aspect({

      model: aspect, attributes: {'data-aspect_id': aspect.get('id')}

    }).render().el);

  },

app/assets/javascripts/app/views/sidebar.js

+2 −2
Original line number Diff line number Diff line 
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later



app.views.Sidebar = app.views.Base.extend({

  el: '.rightBar',

  el: ".rightbar",



  events: {

    'click input#invite_code': 'selectInputText'

    "click input#invite_code": "selectInputText"

  },



  selectInputText: function(event) {

app/assets/javascripts/app/views/tag_following_view.js

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ app.views.TagFollowing = app.views.Base.extend({ 
  tagName: "li",



  events : {

    "click .delete_tag_following": "destroyModel"

    "click .delete-tag-following": "destroyModel"

  },



  initialize : function(){