Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
b0df2eb5c6b4
Commit
f1d74ccc
authored
May 30, 2016
by
Fatih Acet
Committed by
Z.J. van de Weg
Jun 06, 2016
Browse files
Some design related tweaks.
parent
cf0fd177a09b
Changes
6
Hide whitespace changes
Inline
Side-by-side
app/assets/javascripts/awards_handler.coffee
View file @
b0df2eb5
...
...
@@ -39,7 +39,7 @@ class @AwardsHandler
$menu
=
$
'.emoji-menu'
if
$addBtn
.
hasClass
'note-emoji
-button
'
if
$addBtn
.
hasClass
'
js-
note-emoji'
$addBtn
.
parents
(
'.note'
).
find
(
'.js-awards-block'
).
addClass
'current'
else
$addBtn
.
closest
(
'.js-awards-block'
).
addClass
'current'
...
...
app/assets/stylesheets/framework/timeline.scss
View file @
b0df2eb5
...
...
@@ -5,7 +5,7 @@
padding
:
0
;
.timeline-entry
{
padding
:
$gl-padding
$gl-btn-padding
;
padding
:
$gl-padding
$gl-btn-padding
11px
$gl-btn-padding
;
border-color
:
$table-border-color
;
color
:
$gl-gray
;
border-bottom
:
1px
solid
$border-white-light
;
...
...
app/assets/stylesheets/pages/awards.scss
View file @
b0df2eb5
...
...
@@ -95,6 +95,7 @@
.award-control
{
margin-right
:
5px
;
margin-bottom
:
5px
;
padding-left
:
5px
;
padding-right
:
5px
;
line-height
:
20px
;
...
...
app/assets/stylesheets/pages/notes.scss
View file @
b0df2eb5
...
...
@@ -69,6 +69,10 @@ ul.notes {
.note-edit-form
{
display
:
block
;
&
.current-note-edit-form
+
.note-awards
{
display
:
none
;
}
}
}
...
...
@@ -116,6 +120,18 @@ ul.notes {
}
}
.note-awards
{
.js-awards-block
{
padding
:
2px
0
;
margin-top
:
10px
;
}
.award-control
{
font-size
:
13px
;
padding
:
2px
5px
;
}
}
.note-header
{
padding-bottom
:
3px
;
}
...
...
app/views/projects/issues/show.html.haml
View file @
b0df2eb5
...
...
@@ -68,9 +68,9 @@
#related-branches
{
data:
{
url:
related_branches_namespace_project_issue_url
(
@project
.
namespace
,
@project
,
@issue
)
}
}
// This element is filled in using JavaScript.
.content-block.content-block-small
=
render
'new_branch'
=
render
'award_emoji/awards_block'
,
awardable:
@issue
,
inline:
true
.content-block.content-block-small
=
render
'new_branch'
=
render
'award_emoji/awards_block'
,
awardable:
@issue
,
inline:
true
%section
.issuable-discussion
=
render
'projects/issues/discussion'
...
...
app/views/projects/notes/_note.html.haml
View file @
b0df2eb5
...
...
@@ -22,7 +22,7 @@
%span
.note-role
=
access
-
if
note_editable
=
link_to
'#'
,
title:
'Award Emoji'
,
class:
'note-emoji-button js-add-award js-note-emoji'
,
data:
{
position:
'right'
}
do
=
link_to
'#'
,
title:
'Award Emoji'
,
class:
'
note-action-button
note-emoji-button js-add-award js-note-emoji'
,
data:
{
position:
'right'
}
do
=
icon
(
'spinner spin'
)
=
icon
(
'smile-o'
)
=
link_to
'#'
,
title:
'Edit comment'
,
class:
'note-action-button js-note-edit'
do
...
...
@@ -33,11 +33,11 @@
.note-text
=
preserve
do
=
markdown
(
note
.
note
,
pipeline: :note
,
cache_key:
[
note
,
"note"
],
author:
note
.
author
)
=
edited_time_ago_with_tooltip
(
note
,
placement:
'bottom'
,
html_class:
'note_edited_ago'
,
include_author:
true
)
-
if
note_editable
=
render
'projects/notes/edit_form'
,
note:
note
.note-awards
=
render
'award_emoji/awards_block'
,
awardable:
note
,
inline:
false
=
edited_time_ago_with_tooltip
(
note
,
placement:
'bottom'
,
html_class:
'note_edited_ago'
,
include_author:
true
)
-
if
note
.
attachment
.
url
.note-attachment
...
...
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