Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Milan
diaspora
Commits
3df47497
Unverified
Commit
3df47497
authored
Aug 30, 2017
by
Steffen van Bergerem
Committed by
Benjamin Neff
Aug 31, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace stream_container with stream-container
parent
b4e3f846
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
18 additions
and
18 deletions
+18
-18
app/assets/stylesheets/conversations.scss
app/assets/stylesheets/conversations.scss
+1
-1
app/assets/stylesheets/interactions.scss
app/assets/stylesheets/interactions.scss
+1
-1
app/assets/stylesheets/profile.scss
app/assets/stylesheets/profile.scss
+1
-1
app/assets/stylesheets/stream.scss
app/assets/stylesheets/stream.scss
+1
-1
app/views/conversations/index.haml
app/views/conversations/index.haml
+1
-1
app/views/people/contacts.haml
app/views/people/contacts.haml
+1
-1
app/views/people/show.html.haml
app/views/people/show.html.haml
+1
-1
app/views/streams/main_stream.html.haml
app/views/streams/main_stream.html.haml
+1
-1
app/views/tags/show.haml
app/views/tags/show.haml
+1
-1
features/desktop/conversations.feature
features/desktop/conversations.feature
+6
-6
features/step_definitions/aspects_steps.rb
features/step_definitions/aspects_steps.rb
+1
-1
features/step_definitions/oembed_steps.rb
features/step_definitions/oembed_steps.rb
+2
-2
No files found.
app/assets/stylesheets/conversations.scss
View file @
3df47497
...
...
@@ -148,7 +148,7 @@
}
}
.stream
_
container
.conversation-participants
{
.stream
-
container
.conversation-participants
{
margin-bottom
:
20px
;
.hide_conversation
,
.delete_conversation
{
...
...
app/assets/stylesheets/interactions.scss
View file @
3df47497
...
...
@@ -22,7 +22,7 @@
}
}
.stream
_
container
,
.stream
-
container
,
.single-post-interactions
{
.control-icons
{
float
:
right
;
...
...
app/assets/stylesheets/profile.scss
View file @
3df47497
...
...
@@ -137,7 +137,7 @@
}
.stream
_
container
>
.pagination
{
text-align
:
center
;
}
.stream
-
container
>
.pagination
{
text-align
:
center
;
}
#people_stream
{
background-color
:
$white
;
...
...
app/assets/stylesheets/stream.scss
View file @
3df47497
.stream
_
container
{
.stream
-
container
{
.stream-title
{
margin
:
12px
0
;
}
...
...
app/views/conversations/index.haml
View file @
3df47497
...
...
@@ -22,7 +22,7 @@
=
will_paginate
@visibilities
,
previous_label:
"«"
,
next_label:
"»"
,
inner_window:
1
,
renderer:
WillPaginate
::
ActionView
::
BootstrapLinkRenderer
.col-md-8
.conversations-form-container.stream
_
container
.conversations-form-container.stream
-
container
#conversation-show
{
class:
@conversation
?
""
:
"hidden"
}
-
if
@conversation
=
render
'conversations/show'
,
conversation:
@conversation
...
...
app/views/people/contacts.haml
View file @
3df47497
...
...
@@ -11,7 +11,7 @@
.profile_header
-# more JS
.stream
_
container
.stream
-
container
#people_stream
.stream
-
@hashes
.
each
do
|
hash
|
=
render
partial:
'people/person'
,
locals:
hash
...
...
app/views/people/show.html.haml
View file @
3df47497
...
...
@@ -18,7 +18,7 @@
.profile_header
-# more JS
.stream
_
container
.stream
-
container
-
if
user_signed_in?
&&
current_user
.
person
.
id
==
@person
.
id
&&
!
current_page?
(
person_photos_path
(
@person
))
=
render
'publisher/publisher'
,
publisher_aspects_for
(
nil
)
...
...
app/views/streams/main_stream.html.haml
View file @
3df47497
...
...
@@ -176,7 +176,7 @@
=
link_to
t
(
"layouts.application.powered_by"
),
"https://diasporafoundation.org"
.col-md-9
.stream
_
container
#aspect
_
stream
_
container
.stream
-
container
#aspect
-
stream
-
container
=
render
"aspects/aspect_stream"
,
stream:
@stream
%a
.entypo-chevron-up.back-to-top
#back-to-top
{
title:
"#{t('layouts.application.back_to_top')}"
,
href:
"#"
}
app/views/tags/show.haml
View file @
3df47497
...
...
@@ -20,7 +20,7 @@
=
render
partial:
"people/index"
,
locals:
{
people:
@stream
.
tagged_people
}
.col-md-9
.stream
_
container
.stream
-
container
#author_info
%h2
=
@stream
.
display_tag_name
...
...
features/desktop/conversations.feature
View file @
3df47497
...
...
@@ -24,12 +24,12 @@ Feature: private conversations
And
I should see
"less than a minute ago"
within
"#conversation-show"
And
I should see
"Alice Awesome"
as a participant
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"
Then
I should have 1 unread private message
And
I should have 1 email delivery
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
When
I sign in as
"bob@bob.bob"
...
...
@@ -37,9 +37,9 @@ Feature: private conversations
Then
I should see
"Greetings"
within
"#conversation-inbox"
And
I should see
"Greetings"
within
"#conversation-show"
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
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"
Then
I should have 2 unread private messages
And
I should have 2 email delivery
...
...
@@ -54,7 +54,7 @@ Feature: private conversations
Then
I should see
"Greetings"
within
"#conversation-inbox"
And
I should see
"Greetings"
within
"#conversation-show"
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
When
I sign in as
"bob@bob.bob"
...
...
@@ -66,7 +66,7 @@ Feature: private conversations
Then
I should have 1 unread private message
And
I should have 1 email delivery
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"
Then
I should have 1 email delivery
And
I should have no unread private messages
features/step_definitions/aspects_steps.rb
View file @
3df47497
...
...
@@ -46,7 +46,7 @@ end
When
/^I select only "([^"]*)" aspect$/
do
|
aspect_name
|
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
all
(
".selected"
).
each
do
|
node
|
aspect_item
=
node
.
find
(
:xpath
,
".."
)
...
...
features/step_definitions/oembed_steps.rb
View file @
3df47497
...
...
@@ -125,10 +125,10 @@ end
Then
/^I should see a video player$/
do
visit
aspects_path
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
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment