diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-06 12:06:52 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-18 09:46:20 +0000 |
| commit | e0f47c3489d082df7f62d622ac273ae1354b50a9 (patch) | |
| tree | ec3d8006917a1c737e2390d8e1c0d98a7f72b704 | |
| parent | 704cf9df2b610893412524efcdbc81b204de6d46 (diff) | |
| download | gitlab-ce-e0f47c3489d082df7f62d622ac273ae1354b50a9.tar.gz | |
Fixed issue when user doesnt exist
Fixed button hover color
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 11 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index dd4d867c48a..7e6ab5d5c64 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -242,7 +242,7 @@ } } - a { + a:not(.btn) { &:hover { color: $md-link-color; text-decoration: none; @@ -291,14 +291,5 @@ a { color: #8c8c8c; - - &:hover { - color: $gl-text-color; - text-decoration: none; - } - - &:focus { - text-decoration: none; - } } } diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 6f07571f24f..eacb2837abd 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -21,7 +21,7 @@ = form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, html: {class: 'issuable-context-form inline-update js-issuable-update'} do |f| .block.assignee - .sidebar-collapsed-icon.sidebar-collapsed-user{data: {toggle: "tooltip", placement: "left", container: "body"}, title: issuable.assignee.to_reference} + .sidebar-collapsed-icon.sidebar-collapsed-user{data: {toggle: "tooltip", placement: "left", container: "body"}, title: (issuable.assignee.to_reference if issuable.assignee)} - if issuable.assignee = link_to_member_avatar(issuable.assignee, size: 24) - else |