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
Boxiang Sun
gitlab-ce
Commits
5e987d10
Commit
5e987d10
authored
May 19, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spacing of issue emojis
parent
c19d58de
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
app/assets/stylesheets/framework/awards.scss
app/assets/stylesheets/framework/awards.scss
+1
-1
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+4
-0
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+3
-3
No files found.
app/assets/stylesheets/framework/awards.scss
View file @
5e987d10
...
@@ -108,7 +108,7 @@
...
@@ -108,7 +108,7 @@
}
}
.award-control
{
.award-control
{
margin
-right
:
5px
;
margin
:
0
5px
6px
0
;
outline
:
0
;
outline
:
0
;
&
.disabled
{
&
.disabled
{
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
5e987d10
...
@@ -56,6 +56,10 @@
...
@@ -56,6 +56,10 @@
padding
:
5px
;
padding
:
5px
;
max-height
:
calc
(
100vh
-
100px
);
max-height
:
calc
(
100vh
-
100px
);
}
}
.emoji-block
{
padding
:
10px
0
4px
;
}
}
}
.issuable-filter-count
{
.issuable-filter-count
{
...
...
app/views/projects/issues/show.html.haml
View file @
5e987d10
...
@@ -69,11 +69,11 @@
...
@@ -69,11 +69,11 @@
#related-branches
{
data:
{
url:
related_branches_namespace_project_issue_url
(
@project
.
namespace
,
@project
,
@issue
)
}
}
#related-branches
{
data:
{
url:
related_branches_namespace_project_issue_url
(
@project
.
namespace
,
@project
,
@issue
)
}
}
// This element is filled in using JavaScript.
// This element is filled in using JavaScript.
.content-block.
content-block-small
.content-block.
emoji-block
.row
.row
.col-sm-
6
.col-sm-
8
=
render
'award_emoji/awards_block'
,
awardable:
@issue
,
inline:
true
=
render
'award_emoji/awards_block'
,
awardable:
@issue
,
inline:
true
.col-sm-
6
.new-branch-col
.col-sm-
4
.new-branch-col
=
render
'new_branch'
unless
@issue
.
confidential?
=
render
'new_branch'
unless
@issue
.
confidential?
%section
.issuable-discussion
%section
.issuable-discussion
...
...
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