Unverified Commit b4e3f846 authored by Steffen van Bergerem's avatar Steffen van Bergerem Committed by Benjamin Neff
Browse files

Replace main_stream with main-stream

parent e31c5ff4

app/assets/javascripts/app/pages/profile.js

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ app.pages.Profile = app.views.Base.extend({ 
  subviews: {

    "#profile": "sidebarView",

    ".profile_header": "headerView",

    "#main_stream": "streamView"

    "#main-stream": "streamView"

  },



  tooltipSelector: ".profile_button .profile-header-icon, .sharing_message_container",

app/assets/javascripts/app/router.js

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ app.Router = Backbone.Router.extend({ 
      app.page.setupAvatarFallback($(".main-stream-publisher"));

    }



    $("#main_stream").html(app.page.render().el);

    $("#main-stream").html(app.page.render().el);

    this._hideInactiveStreamLists();

  },

app/assets/javascripts/app/views/photos_view.js

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ app.views.Photos = app.views.InfScroll.extend({ 
  },



  postRenderTemplate: function(){

    var photoAttachments = $("#main_stream > div");

    var photoAttachments = $("#main-stream > div");

    if(photoAttachments.length > 0) {

      new app.views.Gallery({ el: photoAttachments });

    }

app/assets/javascripts/app/views/publisher_view.js

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ app.views.Publisher = Backbone.View.extend({ 
    this.viewGettingStarted = new app.views.PublisherGettingStarted({

      firstMessageEl:  this.inputEl,

      visibilityEl: this.$(".public_toggle .aspect_dropdown > .dropdown-toggle"),

      streamEl:     $("#main_stream")

      streamEl:     $("#main-stream")

    });



    this.viewUploader = new app.views.PublisherUploader({

app/assets/stylesheets/color_themes/_color_theme_override_origwhite.scss

+1 −1
Original line number Diff line number Diff line 
body {

  #main_stream .stream-element {

  #main-stream .stream-element {

    border: 0;

    border-bottom: 1px solid $border-grey;

    margin-bottom: 10px;