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
8a2b89f3
Commit
8a2b89f3
authored
Sep 07, 2016
by
tauriedavis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix margin for multi-line emojis
parent
7da2dcc1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+4
-0
app/assets/stylesheets/pages/awards.scss
app/assets/stylesheets/pages/awards.scss
+2
-0
app/views/projects/issues/_new_branch.html.haml
app/views/projects/issues/_new_branch.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/blocks.scss
View file @
8a2b89f3
...
@@ -249,6 +249,10 @@
...
@@ -249,6 +249,10 @@
>
.controls
{
>
.controls
{
float
:
right
;
float
:
right
;
}
}
.new-branch
{
margin-top
:
3px
;
}
}
}
.content-block-small
{
.content-block-small
{
...
...
app/assets/stylesheets/pages/awards.scss
View file @
8a2b89f3
...
@@ -93,6 +93,8 @@
...
@@ -93,6 +93,8 @@
}
}
.award-control
{
.award-control
{
margin-top
:
3px
;
margin-bottom
:
3px
;
margin-right
:
5px
;
margin-right
:
5px
;
padding-left
:
5px
;
padding-left
:
5px
;
padding-right
:
5px
;
padding-right
:
5px
;
...
...
app/views/projects/issues/_new_branch.html.haml
View file @
8a2b89f3
-
if
can?
(
current_user
,
:push_code
,
@project
)
-
if
can?
(
current_user
,
:push_code
,
@project
)
.pull-right
.pull-right
#new-branch
{
'data-path'
=>
can_create_branch_namespace_project_issue_path
(
@project
.
namespace
,
@project
,
@issue
)}
#new-branch
.new-branch
{
'data-path'
=>
can_create_branch_namespace_project_issue_path
(
@project
.
namespace
,
@project
,
@issue
)}
=
link_to
'#'
,
class:
'checking btn btn-grouped'
,
disabled:
'disabled'
do
=
link_to
'#'
,
class:
'checking btn btn-grouped'
,
disabled:
'disabled'
do
=
icon
(
'spinner spin'
)
=
icon
(
'spinner spin'
)
Checking branches
Checking branches
...
...
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