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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
b4bef24b
Commit
b4bef24b
authored
Jun 02, 2017
by
tauriedavis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
32720 Create equal padding for emoji on comments and emoji-block
parent
71f9c43c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
10 deletions
+18
-10
app/assets/stylesheets/framework/awards.scss
app/assets/stylesheets/framework/awards.scss
+1
-2
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+1
-1
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+12
-7
changelogs/unreleased/32720-emoji-spacing.yml
changelogs/unreleased/32720-emoji-spacing.yml
+4
-0
No files found.
app/assets/stylesheets/framework/awards.scss
View file @
b4bef24b
...
@@ -100,7 +100,6 @@
...
@@ -100,7 +100,6 @@
.award-menu-holder
{
.award-menu-holder
{
display
:
inline-block
;
display
:
inline-block
;
position
:
absolute
;
.tooltip
{
.tooltip
{
white-space
:
nowrap
;
white-space
:
nowrap
;
...
@@ -108,7 +107,7 @@
...
@@ -108,7 +107,7 @@
}
}
.award-control
{
.award-control
{
margin
:
0
5px
6
px
0
;
margin
:
4px
8px
4
px
0
;
outline
:
0
;
outline
:
0
;
position
:
relative
;
position
:
relative
;
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
b4bef24b
...
@@ -58,7 +58,7 @@
...
@@ -58,7 +58,7 @@
}
}
.emoji-block
{
.emoji-block
{
padding
:
10px
0
4px
;
padding
:
10px
0
;
}
}
}
}
...
...
app/assets/stylesheets/pages/issues.scss
View file @
b4bef24b
...
@@ -249,9 +249,13 @@ ul.related-merge-requests > li {
...
@@ -249,9 +249,13 @@ ul.related-merge-requests > li {
}
}
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
.emoji-block
.row
{
display
:
flex
;
.new-branch-col
{
.new-branch-col
{
padding-top
:
0
;
padding-top
:
0
;
text-align
:
right
;
text-align
:
right
;
align-self
:
center
;
}
}
.create-mr-dropdown-wrap
{
.create-mr-dropdown-wrap
{
...
@@ -259,4 +263,5 @@ ul.related-merge-requests > li {
...
@@ -259,4 +263,5 @@ ul.related-merge-requests > li {
display
:
inline-block
;
display
:
inline-block
;
}
}
}
}
}
}
}
changelogs/unreleased/32720-emoji-spacing.yml
0 → 100644
View file @
b4bef24b
---
title
:
Create equal padding for emoji
merge_request
:
author
:
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