diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-07-19 21:35:41 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-07-19 21:35:41 +0300 |
commit | 16f60fc74f353ca575a765d3c210c06a9233327c (patch) | |
tree | d611d859ecd4629cf023634391af7bee912187fb /app/assets | |
parent | f4505757cf8ad288d64ab73b8f68e070572692b8 (diff) | |
parent | 967b75ba92937deefc6da1d139825ac52cdbcc68 (diff) |
Merge branch 'clipboard-button' into 'master'
Remove white background on clipboard button; position icon
## What does this MR do?
Removes white background from clipboard button
## What are the relevant issue numbers?
Closes #19098
## Screenshots (if relevant)
![Screen_Shot_2016-07-18_at_3.12.24_PM](/uploads/4a6a540e1a074e6cf89fb99be1b49f2d/Screen_Shot_2016-07-18_at_3.12.24_PM.png)
![Screen_Shot_2016-07-18_at_8.50.55_PM](/uploads/8c594b6f9a74095b194fe1f634eaf226/Screen_Shot_2016-07-18_at_8.50.55_PM.png)
See merge request !5335
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index d52e8f00172..3fa4a22258d 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -198,6 +198,10 @@ header.header-pinned-nav { .sidebar-collapsed-icon { cursor: pointer; + + .btn { + background-color: $gray-light; + } } } diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 542fa244689..ded437625ee 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -122,7 +122,8 @@ button { float: right; - padding: 3px 5px; + padding: 1px 5px; + background-color: $gray-light; } } |