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
Léo-Paul Géneau
gitlab-ce
Commits
fd87bf3c
Commit
fd87bf3c
authored
Dec 08, 2016
by
Dimitrie Hoekstra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Various small emoji positioning adjustments
parent
50a78448
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
app/assets/stylesheets/framework/awards.scss
app/assets/stylesheets/framework/awards.scss
+3
-2
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+1
-0
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+0
-1
changelogs/unreleased/small-emoji-adjustments.yml
changelogs/unreleased/small-emoji-adjustments.yml
+4
-0
No files found.
app/assets/stylesheets/framework/awards.scss
View file @
fd87bf3c
.awards
{
.awards
{
.emoji-icon
{
.emoji-icon
{
width
:
19
px
;
width
:
20
px
;
height
:
19
px
;
height
:
20
px
;
}
}
}
}
...
@@ -136,5 +136,6 @@
...
@@ -136,5 +136,6 @@
.award-control-icon
{
.award-control-icon
{
color
:
$award-emoji-new-btn-icon-color
;
color
:
$award-emoji-new-btn-icon-color
;
margin-top
:
1px
;
}
}
}
}
app/assets/stylesheets/framework/common.scss
View file @
fd87bf3c
...
@@ -255,6 +255,7 @@ img.emoji {
...
@@ -255,6 +255,7 @@ img.emoji {
height
:
20px
;
height
:
20px
;
vertical-align
:
top
;
vertical-align
:
top
;
width
:
20px
;
width
:
20px
;
margin-top
:
1px
;
}
}
.chart
{
.chart
{
...
...
app/assets/stylesheets/pages/notes.scss
View file @
fd87bf3c
...
@@ -413,7 +413,6 @@ ul.notes {
...
@@ -413,7 +413,6 @@ ul.notes {
.fa
{
.fa
{
color
:
$notes-action-color
;
color
:
$notes-action-color
;
position
:
relative
;
position
:
relative
;
top
:
1px
;
font-size
:
17px
;
font-size
:
17px
;
}
}
...
...
changelogs/unreleased/small-emoji-adjustments.yml
0 → 100644
View file @
fd87bf3c
---
title
:
Various small emoji positioning adjustments
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