From 807765b6a779239c6bb706ab6dbe742efe0e3e64 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Mon, 15 Feb 2016 16:29:22 -0500 Subject: Move issue details after action buttons --- app/views/projects/issues/show.html.haml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index fe977fd700c..d635a879491 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -6,16 +6,6 @@ .issue .detail-page-header - .status-box{ class: "status-box-closed #{issue_button_visibility(@issue, false)}"} Closed - .status-box{ class: "status-box-open #{issue_button_visibility(@issue, true)}"} Open - %span.identifier - Issue ##{@issue.iid} - %span.creator - · - opened by #{link_to_member(@project, @issue.author, size: 24)} - · - = time_ago_with_tooltip(@issue.created_at, placement: 'bottom', html_class: 'issue_created_ago') - .pull-right - if can?(current_user, :create_issue, @project) = link_to new_namespace_project_issue_path(@project.namespace, @project), class: 'btn btn-nr btn-grouped new-issue-link btn-success', title: 'New Issue', id: 'new_issue_link' do @@ -29,6 +19,16 @@ = icon('pencil-square-o') Edit + .status-box{ class: "status-box-closed #{issue_button_visibility(@issue, false)}"} Closed + .status-box{ class: "status-box-open #{issue_button_visibility(@issue, true)}"} Open + %span.identifier + Issue ##{@issue.iid} + %span.creator + · + opened by #{link_to_member(@project, @issue.author, size: 24)} + · + = time_ago_with_tooltip(@issue.created_at, placement: 'bottom', html_class: 'issue_created_ago') + .issue-details.issuable-details .detail-page-description.content-block %h2.title -- cgit v1.2.1 From 4af93e0296b53985cd5c96e8d7733d00d313f5be Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Mon, 15 Feb 2016 16:30:17 -0500 Subject: Prevent split time into multiple lines for better reading --- app/assets/stylesheets/pages/detail_page.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss index 529a43548c8..542842e0d43 100644 --- a/app/assets/stylesheets/pages/detail_page.scss +++ b/app/assets/stylesheets/pages/detail_page.scss @@ -12,6 +12,10 @@ .identifier { color: #5c5d5e; } + + .issue_created_ago { + white-space: nowrap; + } } .detail-page-description { -- cgit v1.2.1 From 828f7a12dc24bd5fb8073c40b229525f711989c3 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Mon, 15 Feb 2016 16:46:21 -0500 Subject: Prevent author name to split into multiple lines --- app/assets/stylesheets/pages/detail_page.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss index 542842e0d43..0bddc83f5c0 100644 --- a/app/assets/stylesheets/pages/detail_page.scss +++ b/app/assets/stylesheets/pages/detail_page.scss @@ -13,7 +13,7 @@ color: #5c5d5e; } - .issue_created_ago { + .issue_created_ago, .author_link { white-space: nowrap; } } -- cgit v1.2.1 From 18390c6a91f9c2d765e1f69a548f0bfd6657d20c Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Tue, 16 Feb 2016 09:30:34 -0500 Subject: Change "opened by" to just "by" --- app/views/projects/issues/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index d635a879491..c2d33e4e5dc 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -25,7 +25,7 @@ Issue ##{@issue.iid} %span.creator · - opened by #{link_to_member(@project, @issue.author, size: 24)} + by #{link_to_member(@project, @issue.author, size: 24)} · = time_ago_with_tooltip(@issue.created_at, placement: 'bottom', html_class: 'issue_created_ago') -- cgit v1.2.1 From 6d80a4c4f9a9fedb586b82a5dea34ae090981d78 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Tue, 16 Feb 2016 11:06:15 -0500 Subject: Wrap issue details to prevent content misalignment --- app/assets/stylesheets/pages/detail_page.scss | 4 ++++ app/views/projects/issues/show.html.haml | 21 ++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss index 0bddc83f5c0..d93b6ee6733 100644 --- a/app/assets/stylesheets/pages/detail_page.scss +++ b/app/assets/stylesheets/pages/detail_page.scss @@ -16,6 +16,10 @@ .issue_created_ago, .author_link { white-space: nowrap; } + + .issue-meta { + margin-left: 65px + } } .detail-page-description { diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index c2d33e4e5dc..69a0e2a0c4d 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -19,15 +19,18 @@ = icon('pencil-square-o') Edit - .status-box{ class: "status-box-closed #{issue_button_visibility(@issue, false)}"} Closed - .status-box{ class: "status-box-open #{issue_button_visibility(@issue, true)}"} Open - %span.identifier - Issue ##{@issue.iid} - %span.creator - · - by #{link_to_member(@project, @issue.author, size: 24)} - · - = time_ago_with_tooltip(@issue.created_at, placement: 'bottom', html_class: 'issue_created_ago') + .pull-left + .status-box{ class: "status-box-closed #{issue_button_visibility(@issue, false)}"} Closed + .status-box{ class: "status-box-open #{issue_button_visibility(@issue, true)}"} Open + + .issue-meta + %span.identifier + Issue ##{@issue.iid} + %span.creator + · + by #{link_to_member(@project, @issue.author, size: 24)} + · + = time_ago_with_tooltip(@issue.created_at, placement: 'bottom', html_class: 'issue_created_ago') .issue-details.issuable-details .detail-page-description.content-block -- cgit v1.2.1