diff options
| author | tauriedavis <taurie@gitlab.com> | 2016-09-07 10:04:59 -0700 |
|---|---|---|
| committer | tauriedavis <taurie@gitlab.com> | 2016-09-07 10:04:59 -0700 |
| commit | 8a2b89f3ceedfba7d5b8ac196d2925d114b1cdeb (patch) | |
| tree | b19175c18db6d3601157d26de33c36f69993a04f | |
| parent | 7da2dcc12dbc11ed9790d94861fc23f0962f331c (diff) | |
| download | gitlab-ce-8a2b89f3ceedfba7d5b8ac196d2925d114b1cdeb.tar.gz | |
fix margin for multi-line emojis
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/awards.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/issues/_new_branch.html.haml | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 7ce203d2ec7..f5223207f3a 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -249,6 +249,10 @@ > .controls { float: right; } + + .new-branch { + margin-top: 3px; + } } .content-block-small { diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss index 188a4e193a6..447ba24b46b 100644 --- a/app/assets/stylesheets/pages/awards.scss +++ b/app/assets/stylesheets/pages/awards.scss @@ -93,6 +93,8 @@ } .award-control { + margin-top: 3px; + margin-bottom: 3px; margin-right: 5px; padding-left: 5px; padding-right: 5px; diff --git a/app/views/projects/issues/_new_branch.html.haml b/app/views/projects/issues/_new_branch.html.haml index 33556a1a2b3..c56b6cc11f5 100644 --- a/app/views/projects/issues/_new_branch.html.haml +++ b/app/views/projects/issues/_new_branch.html.haml @@ -1,6 +1,6 @@ - if can?(current_user, :push_code, @project) .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 = icon('spinner spin') Checking branches |