Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
3d4d8e59
Commit
3d4d8e59
authored
Mar 31, 2016
by
Phil Hughes
Committed by
Fatih Acet
May 19, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed design of inline award picker to be similar to designs
# Conflicts: # app/views/votes/_votes_block.html.haml
parent
7d4f41ef
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
33 deletions
+14
-33
app/assets/stylesheets/pages/awards.scss
app/assets/stylesheets/pages/awards.scss
+0
-2
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+12
-0
app/views/projects/notes/_note.html.haml
app/views/projects/notes/_note.html.haml
+2
-1
app/views/votes/_votes_block.html.haml
app/views/votes/_votes_block.html.haml
+0
-30
No files found.
app/assets/stylesheets/pages/awards.scss
View file @
3d4d8e59
.awards
{
line-height
:
34px
;
.emoji-icon
{
width
:
20px
;
height
:
20px
;
...
...
app/assets/stylesheets/pages/notes.scss
View file @
3d4d8e59
...
...
@@ -309,3 +309,15 @@ ul.notes {
}
}
}
.note-awards
{
.awards
{
padding-top
:
10px
;
}
.award-control
{
padding-top
:
2px
;
padding-bottom
:
2px
;
font-size
:
13px
;
}
}
app/views/projects/notes/_note.html.haml
View file @
3d4d8e59
...
...
@@ -38,7 +38,8 @@
=
markdown
(
note
.
note
,
pipeline: :note
,
cache_key:
[
note
,
"note"
])
-
if
note_editable
=
render
'projects/notes/edit_form'
,
note:
note
=
render
'emoji_awards/awards_block'
,
awardable:
note
,
inline:
false
.note-awards
=
render
'emoji_awards/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
...
...
app/views/votes/_votes_block.html.haml
deleted
100644 → 0
View file @
7d4f41ef
.awards.votes-block
{
data:
{
toggle_url:
url_for
([
:toggle_award_emoji
,
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
awardable
])
}}
-
awards_sort
(
awardable
.
grouped_awards
).
each
do
|
emoji
,
awards
|
%button
.btn.award-control.js-emoji-btn.has-tooltip
{
class:
(
note_active_class
(
awards
,
current_user
)),
data:
{
placement:
"top"
,
original_title:
emoji_author_list
(
awards
,
current_user
)}}
=
emoji_icon
(
emoji
,
sprite:
false
)
%span
.award-control-text.js-counter
=
awards
.
count
-
if
current_user
%div
.award-menu-holder.js-award-holder
%a
.btn.award-control.js-add-award
{
"href"
=>
"#"
}
=
icon
(
'smile-o'
,
{
class:
"award-control-icon"
})
=
icon
(
'spinner spin'
,
{
class:
"award-control-icon award-control-icon-loading"
})
%span
.award-control-text
Add
-
if
current_user
:javascript
var
getEmojisUrl
=
"
#{
emojis_path
}
"
;
var
postEmojiUrl
=
"
#{
award_toggle_namespace_project_notes_path
(
@project
.
namespace
,
@project
)
}
"
;
var
noteableType
=
"
#{
votable
.
class
.
name
.
underscore
}
"
;
var
noteableId
=
"
#{
votable
.
id
}
"
;
var
unicodes
=
#{
AwardEmoji
.
unicode
.
to_json
}
;
window
.
awardsHandler
=
new
AwardsHandler
(
getEmojisUrl
,
postEmojiUrl
,
noteableType
,
noteableId
,
unicodes
);
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