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
Jérome Perrin
gitlab-ce
Commits
06a4fd10
Commit
06a4fd10
authored
Nov 17, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
css improvements
parent
fd2c0fe4
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
9 deletions
+19
-9
app/assets/javascripts/awards_handler.coffee
app/assets/javascripts/awards_handler.coffee
+1
-1
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+15
-5
app/finders/notes_finder.rb
app/finders/notes_finder.rb
+2
-2
app/views/votes/_votes_block.html.haml
app/views/votes/_votes_block.html.haml
+1
-1
No files found.
app/assets/javascripts/awards_handler.coffee
View file @
06a4fd10
...
@@ -39,7 +39,7 @@ class @AwardsHandler
...
@@ -39,7 +39,7 @@ class @AwardsHandler
nodes
.
push
(
"<div class='counter'>1"
)
nodes
.
push
(
"<div class='counter'>1"
)
nodes
.
push
(
"</div></div>"
)
nodes
.
push
(
"</div></div>"
)
$
(
".awards
"
).
append
(
nodes
.
join
(
"
\n
"
))
$
(
".awards
-controls"
).
before
(
nodes
.
join
(
"
\n
"
))
getImage
:
(
emoji
)
->
getImage
:
(
emoji
)
->
$
(
"li."
+
emoji
).
html
()
$
(
"li."
+
emoji
).
html
()
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
06a4fd10
...
@@ -128,12 +128,22 @@
...
@@ -128,12 +128,22 @@
}
}
}
}
#add-award
{
.awards-controls
{
font-size
:
20
px
;
height
:
25
px
;
border-radius
:
5
px
;
width
:
28
px
;
float
:
left
;
float
:
left
;
width
:
50px
;
padding
:
0
0
5px
5px
;
font-weight
:
bold
;
line-height
:
1
;
#add-award
{
font-size
:
27px
;
&
:hover
{
text-decoration
:
none
;
}
&
:link
{
text-decoration
:
none
;
}
}
}
}
.awards-menu
{
.awards-menu
{
...
...
app/finders/notes_finder.rb
View file @
06a4fd10
...
@@ -12,9 +12,9 @@ class NotesFinder
...
@@ -12,9 +12,9 @@ class NotesFinder
when
"commit"
when
"commit"
project
.
notes
.
for_commit_id
(
target_id
).
not_inline
project
.
notes
.
for_commit_id
(
target_id
).
not_inline
when
"issue"
when
"issue"
project
.
issues
.
find
(
target_id
).
notes
.
inc_author
project
.
issues
.
find
(
target_id
).
notes
.
nonawards
.
inc_author
when
"merge_request"
when
"merge_request"
project
.
merge_requests
.
find
(
target_id
).
mr_and_commit_notes
.
inc_author
project
.
merge_requests
.
find
(
target_id
).
mr_and_commit_notes
.
nonawards
.
inc_author
when
"snippet"
,
"project_snippet"
when
"snippet"
,
"project_snippet"
project
.
snippets
.
find
(
target_id
).
notes
project
.
snippets
.
find
(
target_id
).
notes
else
else
...
...
app/views/votes/_votes_block.html.haml
View file @
06a4fd10
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
.counter
.counter
=
vote
.
last
.
count
=
vote
.
last
.
count
%button
.dropdown
.dropdown.awards-controls
%a
#add-award
{
"data-toggle"
=>
"dropdown"
,
"data-target"
=>
"#"
,
"href"
=>
"#"
}
+
%a
#add-award
{
"data-toggle"
=>
"dropdown"
,
"data-target"
=>
"#"
,
"href"
=>
"#"
}
+
%ul
.dropdown-menu.awards-menu
%ul
.dropdown-menu.awards-menu
-
[
"100"
,
"blush"
,
"heart"
,
"smile"
,
"rage"
,
"beers"
,
"thumbsup"
,
"disappointed"
,
"ok_hand"
,
"helicopter"
].
each
do
|
emoji
|
-
[
"100"
,
"blush"
,
"heart"
,
"smile"
,
"rage"
,
"beers"
,
"thumbsup"
,
"disappointed"
,
"ok_hand"
,
"helicopter"
].
each
do
|
emoji
|
...
...
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