From 297398ea32c271987c72be3f6ee20ddfba94189e Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Tue, 15 Dec 2015 17:32:37 +0100 Subject: Move cross-project reference down --- app/views/shared/issuable/_sidebar.html.haml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 0019f739b89..79c5cc7f40a 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -1,13 +1,5 @@ .issuable-sidebar.issuable-affix = form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, html: {class: 'issuable-context-form inline-update js-issuable-update'} do |f| - .block - .title - Cross-project reference - .cross-project-reference - %span#cross-project-reference - = cross_project_reference(@project, issuable) - = clipboard_button(clipboard_target: 'span#cross-project-reference') - .block.assignee .title %label @@ -62,6 +54,14 @@ = f.collection_select :label_ids, issuable.project.labels.all, :id, :name, { selected: issuable.label_ids }, multiple: true, class: 'select2 js-select2', data: { placeholder: "Select labels" } + .block + .title + Cross-project reference + .cross-project-reference + %span#cross-project-reference + = cross_project_reference(@project, issuable) + = clipboard_button(clipboard_target: 'span#cross-project-reference') + = render "shared/issuable/participants", participants: issuable.participants(current_user) - if current_user -- cgit v1.2.1 From e4e1777aa5e465663e8caf1696d67a0567dd6bc6 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Tue, 15 Dec 2015 17:32:46 +0100 Subject: Fix "Notifications" label color --- app/views/shared/issuable/_sidebar.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 79c5cc7f40a..e5588e11b41 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -68,7 +68,7 @@ - subscribed = issuable.subscribed?(current_user) .block.light .title - %label.light Notifications + %label Notifications - subscribtion_status = subscribed ? 'subscribed' : 'unsubscribed' %button.btn.btn-block.btn-gray.subscribe-button{:type => 'button'} %span= subscribed ? 'Unsubscribe' : 'Subscribe' -- cgit v1.2.1 From c1db8d15903117964274963b87fcc1893c4ee82c Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Tue, 15 Dec 2015 17:33:03 +0100 Subject: Use regularly colored button for "Subscribe"/"Unsubscribe" --- app/views/shared/issuable/_sidebar.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index e5588e11b41..8c0ec3f5269 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -70,7 +70,7 @@ .title %label Notifications - subscribtion_status = subscribed ? 'subscribed' : 'unsubscribed' - %button.btn.btn-block.btn-gray.subscribe-button{:type => 'button'} + %button.btn.btn-block.subscribe-button{:type => 'button'} %span= subscribed ? 'Unsubscribe' : 'Subscribe' .subscription-status{data: {status: subscribtion_status}} .unsubscribed{class: ( 'hidden' if subscribed )} -- cgit v1.2.1 From f4c94e1fd6bc4c119a59dcea18c72382c7b229d2 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Wed, 16 Dec 2015 16:23:18 +0100 Subject: Revert "Use regularly colored button for "Subscribe"/"Unsubscribe"" This reverts commit c1db8d15903117964274963b87fcc1893c4ee82c. --- app/views/shared/issuable/_sidebar.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 8c0ec3f5269..e5588e11b41 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -70,7 +70,7 @@ .title %label Notifications - subscribtion_status = subscribed ? 'subscribed' : 'unsubscribed' - %button.btn.btn-block.subscribe-button{:type => 'button'} + %button.btn.btn-block.btn-gray.subscribe-button{:type => 'button'} %span= subscribed ? 'Unsubscribe' : 'Subscribe' .subscription-status{data: {status: subscribtion_status}} .unsubscribed{class: ( 'hidden' if subscribed )} -- cgit v1.2.1 From ff16ee63e64a34dd0f23909f64664726d108d918 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Wed, 16 Dec 2015 16:23:31 +0100 Subject: Revert "Fix "Notifications" label color" This reverts commit e4e1777aa5e465663e8caf1696d67a0567dd6bc6. --- app/views/shared/issuable/_sidebar.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index e5588e11b41..79c5cc7f40a 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -68,7 +68,7 @@ - subscribed = issuable.subscribed?(current_user) .block.light .title - %label Notifications + %label.light Notifications - subscribtion_status = subscribed ? 'subscribed' : 'unsubscribed' %button.btn.btn-block.btn-gray.subscribe-button{:type => 'button'} %span= subscribed ? 'Unsubscribe' : 'Subscribe' -- cgit v1.2.1