diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-11 19:47:07 +0000 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-06-12 11:38:43 +0200 |
| commit | 234e9c369362c57ee9a967b2128811967e3eaf60 (patch) | |
| tree | ea9381339c0f6c530ab40079ec6b033846de0fc2 | |
| parent | 23b41af6f96b5c1ce89c04d96a29fa7f8092f08f (diff) | |
| download | gitlab-ce-234e9c369362c57ee9a967b2128811967e3eaf60.tar.gz | |
Merge branch 'jivl-fix-padding-commit-info' into 'master'
fix padding in commit info
Closes #47278
See merge request gitlab-org/gitlab-ce!19435
| -rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/commit/branches.html.haml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 2c81518cb1a..8a1dcb28f88 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -217,6 +217,10 @@ table { border-bottom: 1px solid $well-inner-border; } } + + .badge.badge-gray { + background-color: $well-expand-item; + } } .card { diff --git a/app/views/projects/commit/branches.html.haml b/app/views/projects/commit/branches.html.haml index a91e31afc2b..0b8e5105bc0 100644 --- a/app/views/projects/commit/branches.html.haml +++ b/app/views/projects/commit/branches.html.haml @@ -6,7 +6,7 @@ - if @branches.any? || @tags.any? || @tags_limit_exceeded %span - = link_to "#", class: "js-details-expand label label-gray ref-name" do + = link_to "#", class: "js-details-expand badge badge-gray ref-name" do = sprite_icon('ellipsis_h', size: 12, css_class: 'vertical-align-middle') %span.js-details-content.hide = commit_branches_links(@project, @branches) |