diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-07-19 18:35:41 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-20 14:44:19 +0200 |
commit | 386e8c084a7b5ca68b6f52c9ce1de5f349bcb995 (patch) | |
tree | 564a8b030b8efe6cbd7e3cf8658e9c32fd660909 | |
parent | bef1ff7e6e25f4857c51b8b85621988a7f77ab74 (diff) | |
download | gitlab-ce-386e8c084a7b5ca68b6f52c9ce1de5f349bcb995.tar.gz |
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
-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; } } |