Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Milan
diaspora
Commits
7457f254
Unverified
Commit
7457f254
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 last_author with last-author
parent
9fa032e4
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
app/assets/stylesheets/conversations.scss
app/assets/stylesheets/conversations.scss
+3
-3
app/assets/stylesheets/mobile/mobile.scss
app/assets/stylesheets/mobile/mobile.scss
+1
-1
app/views/conversations/_conversation.haml
app/views/conversations/_conversation.haml
+1
-1
app/views/conversations/_conversation.mobile.haml
app/views/conversations/_conversation.mobile.haml
+1
-1
No files found.
app/assets/stylesheets/conversations.scss
View file @
7457f254
...
...
@@ -65,7 +65,7 @@
&
:hover:not
(
.selected
),
&
.selected
{
.subject
,
.last
_
author
,
.last
-
author
,
.last_message
{
color
:
$white
;
}
...
...
@@ -86,14 +86,14 @@
&
.unread
{
background-color
:
$background-grey
;
}
&
.selected
{
background-color
:
$brand-primary
;
}
.last
_
author
,
.last_message
{
.last
-
author
,
.last_message
{
font-size
:
12px
;
line-height
:
15px
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
.last
_
author
{
color
:
$text-dark-grey
;
}
.last
-
author
{
color
:
$text-dark-grey
;
}
.message-count
,
.unread-message-count
{
margin-left
:
3px
;
...
...
app/assets/stylesheets/mobile/mobile.scss
View file @
7457f254
...
...
@@ -486,7 +486,7 @@ select {
margin-bottom
:
5px
;
}
.last
_
author
{
.last
-
author
{
position
:
relative
;
margin
:
10px
10px
2px
;
float
:
right
;
...
...
app/views/conversations/_conversation.haml
View file @
7457f254
...
...
@@ -26,7 +26,7 @@
=
conversation
.
subject
.timestamp
=
timeago
(
conversation
.
updated_at
)
.last
_
author
.last
-
author
-
if
conversation
.
last_author
.
present?
=
conversation
.
last_author
.
name
.last_message
...
...
app/views/conversations/_conversation.mobile.haml
View file @
7457f254
...
...
@@ -9,7 +9,7 @@
=
render
partial:
"conversation_subject"
,
locals:
{
conversation:
conversation
,
unread_count:
visibility
.
unread
}
.last
_
author
.last
-
author
.timestamp
=
timeago
(
conversation
.
updated_at
)
...
...
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