From 481431b75d0ec81e5077f2dc7622910ad44e9145 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 13 Jan 2016 21:21:57 -0500 Subject: [PATCH 1/2] Fix cross-project reference clipboard text See https://gitlab.com/gitlab-org/gitlab-ce/issues/4183 --- app/assets/stylesheets/pages/issuable.scss | 6 +++++- app/views/shared/issuable/_sidebar.html.haml | 7 ++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index d4b44004f4f..1c17d9e94ad 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -95,7 +95,7 @@ .cross-project-reference { color: $gl-link-color; - + span { white-space: nowrap; width: 85%; @@ -105,6 +105,10 @@ text-overflow: ellipsis; } + cite { + font-style: normal; + } + button { float: right; } diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 2299112bec7..9f4a7098ea2 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -69,15 +69,16 @@ You're not receiving notifications from this thread. .subscribed{class: ( 'hidden' unless subscribed )} You're receiving notifications because you're subscribed to this thread. + - project_ref = cross_project_reference(@project, issuable) .block .title .cross-project-reference - %span#cross-project-reference + %span Reference: - %a{href: '#', title:project_ref} + %cite{title: project_ref} = project_ref - = clipboard_button(clipboard_target: 'span#cross-project-reference') + = clipboard_button(clipboard_text: project_ref) :javascript new Subscription("#{toggle_subscription_path(issuable)}"); From 5c6e768a9d10be7352222438be0f57aecd449cb1 Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Wed, 13 Jan 2016 22:07:15 -0500 Subject: [PATCH 2/2] centering copy button --- app/assets/stylesheets/pages/issuable.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 1c17d9e94ad..34169c87352 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -111,6 +111,7 @@ button { float: right; + padding: 3px 5px; } }