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
Tatuya Kamada
gitlab-ce
Commits
7da2dcc1
Commit
7da2dcc1
authored
Sep 06, 2016
by
tauriedavis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix margin for awards-control buttons
parent
aa152e4a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
app/assets/stylesheets/pages/awards.scss
app/assets/stylesheets/pages/awards.scss
+0
-2
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/awards.scss
View file @
7da2dcc1
...
@@ -94,10 +94,8 @@
...
@@ -94,10 +94,8 @@
.award-control
{
.award-control
{
margin-right
:
5px
;
margin-right
:
5px
;
margin-bottom
:
5px
;
padding-left
:
5px
;
padding-left
:
5px
;
padding-right
:
5px
;
padding-right
:
5px
;
line-height
:
20px
;
outline
:
0
;
outline
:
0
;
&
:hover
,
&
:hover
,
...
...
app/views/projects/merge_requests/_show.html.haml
View file @
7da2dcc1
...
@@ -83,7 +83,7 @@
...
@@ -83,7 +83,7 @@
.tab-content
#diff-notes-app
.tab-content
#diff-notes-app
#notes
.notes.tab-pane.voting_notes
#notes
.notes.tab-pane.voting_notes
.content-block.content-block-small
.oneline-block
.content-block.content-block-small
=
render
'award_emoji/awards_block'
,
awardable:
@merge_request
,
inline:
true
=
render
'award_emoji/awards_block'
,
awardable:
@merge_request
,
inline:
true
.row
.row
...
...
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