diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-02-16 15:52:07 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-02-16 15:52:07 +0000 |
| commit | 7cc4b73942a0620678cd7e058d6dcde0ae71f4e6 (patch) | |
| tree | 22faf21e96c492557c7fa9bdabb5de7c71395cd2 | |
| parent | bbbfdba0b9c0e2d5c463110398f7469821fd4c44 (diff) | |
| parent | 306c50cecde50b0bbfc9d665a09ecd2fa1676005 (diff) | |
| download | gitlab-ce-7cc4b73942a0620678cd7e058d6dcde0ae71f4e6.tar.gz | |
Merge branch 'bugfix/jschatz1/sidebar-fixes-13215' into 'master'
Sidebar fixes
Fixes #13215
* when editing a dropdown, but not changing anything you end up in an ugly state
* the hover-over state for the subscribe and other buttons are veeery subtle
* the collapse button needs some sort of hover-over state
* the reference gets shortened. It always got shortened. Not an issue with this in particular.
* the minimized sidebar is not functional. The copy button doesn't do anything
* looks all funky in safari (not for me)
See merge request !2736
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 25 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 2 |
2 files changed, 26 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 9d5dc42b6cc..ef62f069dc2 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -80,6 +80,10 @@ display: inline-block; } + .select2-container span { + margin-top: 0; + } + .issuable-count { } @@ -88,6 +92,10 @@ margin-left: 20px; border-left: 1px solid $border-gray-light; padding-left: 10px; + + &:hover { + color: $gray-darkest; + } } } @@ -192,6 +200,10 @@ .btn { background: $gray-normal; border: 1px solid $border-gray-normal; + &:hover { + background: $gray-dark; + border: 1px solid $border-gray-dark; + } } &.right-sidebar-collapsed { @@ -223,6 +235,19 @@ display: block; margin-top: 0; } + + .btn-clipboard { + border: none; + + &:hover { + background: transparent; + } + + i { + color: #999999; + } + } + } } diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index e1aecdd9436..2aada5c9952 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -115,7 +115,7 @@ - project_ref = cross_project_reference(@project, issuable) .block.project-reference .sidebar-collapsed-icon - = icon('clipboard') + = clipboard_button(clipboard_text: project_ref) .title .cross-project-reference %span |