Unverified Commit 3df47497 authored by Steffen van Bergerem's avatar Steffen van Bergerem Committed by Benjamin Neff

Replace stream_container with stream-container

parent b4e3f846
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
} }
} }
.stream_container .conversation-participants { .stream-container .conversation-participants {
margin-bottom: 20px; margin-bottom: 20px;
.hide_conversation, .delete_conversation { .hide_conversation, .delete_conversation {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
} }
} }
.stream_container, .stream-container,
.single-post-interactions { .single-post-interactions {
.control-icons { .control-icons {
float: right; float: right;
......
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
} }
.stream_container > .pagination { text-align: center; } .stream-container > .pagination { text-align: center; }
#people_stream { #people_stream {
background-color: $white; background-color: $white;
......
.stream_container { .stream-container {
.stream-title { .stream-title {
margin: 12px 0; margin: 12px 0;
} }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
= will_paginate @visibilities, previous_label: "«", next_label: "»", inner_window: 1, = will_paginate @visibilities, previous_label: "«", next_label: "»", inner_window: 1,
renderer: WillPaginate::ActionView::BootstrapLinkRenderer renderer: WillPaginate::ActionView::BootstrapLinkRenderer
.col-md-8 .col-md-8
.conversations-form-container.stream_container .conversations-form-container.stream-container
#conversation-show{class: @conversation ? "" : "hidden"} #conversation-show{class: @conversation ? "" : "hidden"}
- if @conversation - if @conversation
= render 'conversations/show', conversation: @conversation = render 'conversations/show', conversation: @conversation
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.profile_header .profile_header
-# more JS -# more JS
.stream_container .stream-container
#people_stream.stream #people_stream.stream
- @hashes.each do |hash| - @hashes.each do |hash|
= render partial: 'people/person', locals: hash = render partial: 'people/person', locals: hash
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
.profile_header .profile_header
-# more JS -# more JS
.stream_container .stream-container
- if user_signed_in? && current_user.person.id == @person.id && !current_page?(person_photos_path(@person)) - if user_signed_in? && current_user.person.id == @person.id && !current_page?(person_photos_path(@person))
= render 'publisher/publisher', publisher_aspects_for(nil) = render 'publisher/publisher', publisher_aspects_for(nil)
......
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
= link_to t("layouts.application.powered_by"), "https://diasporafoundation.org" = link_to t("layouts.application.powered_by"), "https://diasporafoundation.org"
.col-md-9 .col-md-9
.stream_container#aspect_stream_container .stream-container#aspect-stream-container
= render "aspects/aspect_stream", stream: @stream = render "aspects/aspect_stream", stream: @stream
%a.entypo-chevron-up.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"} %a.entypo-chevron-up.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
= render partial: "people/index", locals: {people: @stream.tagged_people} = render partial: "people/index", locals: {people: @stream.tagged_people}
.col-md-9 .col-md-9
.stream_container .stream-container
#author_info #author_info
%h2 %h2
= @stream.display_tag_name = @stream.display_tag_name
......
...@@ -24,12 +24,12 @@ Feature: private conversations ...@@ -24,12 +24,12 @@ Feature: private conversations
And I should see "less than a minute ago" within "#conversation-show" And I should see "less than a minute ago" within "#conversation-show"
And I should see "Alice Awesome" as a participant And I should see "Alice Awesome" as a participant
And "Alice Awesome" should be part of active conversation And "Alice Awesome" should be part of active conversation
And I should see "hello, alice!" within ".stream_container" And I should see "hello, alice!" within ".stream-container"
When I sign in as "alice@alice.alice" When I sign in as "alice@alice.alice"
Then I should have 1 unread private message Then I should have 1 unread private message
And I should have 1 email delivery And I should have 1 email delivery
When I reply with "hey, how you doing?" When I reply with "hey, how you doing?"
Then I should see "hey, how you doing?" within ".stream_container" Then I should see "hey, how you doing?" within ".stream-container"
Scenario: send a message using keyboard shortcuts Scenario: send a message using keyboard shortcuts
When I sign in as "bob@bob.bob" When I sign in as "bob@bob.bob"
...@@ -37,9 +37,9 @@ Feature: private conversations ...@@ -37,9 +37,9 @@ Feature: private conversations
Then I should see "Greetings" within "#conversation-inbox" Then I should see "Greetings" within "#conversation-inbox"
And I should see "Greetings" within "#conversation-show" And I should see "Greetings" within "#conversation-show"
And "Alice Awesome" should be part of active conversation And "Alice Awesome" should be part of active conversation
And I should see "hello, alice!" within ".stream_container" And I should see "hello, alice!" within ".stream-container"
When I reply with "hey, how you doing?" using keyboard shortcuts When I reply with "hey, how you doing?" using keyboard shortcuts
Then I should see "hey, how you doing?" within ".stream_container" Then I should see "hey, how you doing?" within ".stream-container"
When I sign in as "alice@alice.alice" When I sign in as "alice@alice.alice"
Then I should have 2 unread private messages Then I should have 2 unread private messages
And I should have 2 email delivery And I should have 2 email delivery
...@@ -54,7 +54,7 @@ Feature: private conversations ...@@ -54,7 +54,7 @@ Feature: private conversations
Then I should see "Greetings" within "#conversation-inbox" Then I should see "Greetings" within "#conversation-inbox"
And I should see "Greetings" within "#conversation-show" And I should see "Greetings" within "#conversation-show"
And "Alice Awesome" should be part of active conversation And "Alice Awesome" should be part of active conversation
And I should see "hello, alice!" within ".stream_container" And I should see "hello, alice!" within ".stream-container"
Scenario: delete a conversation Scenario: delete a conversation
When I sign in as "bob@bob.bob" When I sign in as "bob@bob.bob"
...@@ -66,7 +66,7 @@ Feature: private conversations ...@@ -66,7 +66,7 @@ Feature: private conversations
Then I should have 1 unread private message Then I should have 1 unread private message
And I should have 1 email delivery And I should have 1 email delivery
When I reply with "hey, how you doing?" When I reply with "hey, how you doing?"
Then I should see "hey, how you doing?" within ".stream_container" Then I should see "hey, how you doing?" within ".stream-container"
When I sign in as "bob@bob.bob" When I sign in as "bob@bob.bob"
Then I should have 1 email delivery Then I should have 1 email delivery
And I should have no unread private messages And I should have no unread private messages
...@@ -46,7 +46,7 @@ end ...@@ -46,7 +46,7 @@ end
When /^I select only "([^"]*)" aspect$/ do |aspect_name| When /^I select only "([^"]*)" aspect$/ do |aspect_name|
click_link "My aspects" click_link "My aspects"
expect(find("#aspect_stream_container")).to have_css(".loader.hidden", visible: false) expect(find("#aspect-stream-container")).to have_css(".loader.hidden", visible: false)
within("#aspects_list") do within("#aspects_list") do
all(".selected").each do |node| all(".selected").each do |node|
aspect_item = node.find(:xpath, "..") aspect_item = node.find(:xpath, "..")
......
...@@ -125,10 +125,10 @@ end ...@@ -125,10 +125,10 @@ end
Then /^I should see a video player$/ do Then /^I should see a video player$/ do
visit aspects_path visit aspects_path
find('.post-content .oembed') find('.post-content .oembed')
find('.stream_container').should have_css('.post-content .oembed img') find('.stream-container').should have_css('.post-content .oembed img')
end end
Then /^I should not see a video player$/ do Then /^I should not see a video player$/ do
find('.stream_container').should_not have_css('.post-content .oembed img') find('.stream-container').should_not have_css('.post-content .oembed img')
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment