diff --git a/app/partials/views/modules/search-result-table.jade b/app/partials/views/modules/search-result-table.jade index 951554e7..b259828c 100644 --- a/app/partials/views/modules/search-result-table.jade +++ b/app/partials/views/modules/search-result-table.jade @@ -4,17 +4,17 @@ script(type="text/ng-template", id="search-issues") div.search-result-table-container(ng-class="{'hidden': !issues.length}") div.search-result-table-header div.row.title - div.user-stories.width-4 Issues - div.status.width-2 Status - div.points.width-1 Assigned to + div.user-stories Issues + div.status Status + div.assigned-to Assigned to div.search-result-table-body div.row.table-main(ng-repeat="issue in issues track by issue.id") - div.user-stories.width-6 + div.user-stories div.user-story-name a(href="", tg-nav="project-issues-detail:project=project.slug,ref=issue.ref", tg-bo-bind="issue.subject") - div.status.width-2(tg-listitem-issue-status="issue") - div.points.width-1(tg-listitem-assignedto="issue") + div.status(tg-listitem-issue-status="issue") + div.assigned-to(tg-listitem-assignedto="issue") div.empty.empty-search-results(ng-class="{'hidden': issues.length}") span.icon.icon-issues @@ -26,17 +26,17 @@ script(type="text/ng-template", id="search-userstories") div.search-result-table-container(ng-class="{'hidden': !userstories.length}") div.search-result-table-header div.row.title - div.user-stories.width-4 User Stories - div.status.width-2 Status - div.points.width-1 Points + div.user-stories User Stories + div.status Status + div.points Points div.search-result-table-body div.row.table-main(ng-repeat="us in userstories track by us.id") - div.user-stories.width-4 + div.user-stories div.user-story-name a(href="", tg-nav="project-userstories-detail:project=project.slug,ref=us.ref", tg-bo-bind="us.subject") - div.status.width-2(tg-listitem-us-status="us") - div.points.width-1(tg-bo-bind="us.total_points") + div.status(tg-listitem-us-status="us") + div.points(tg-bo-bind="us.total_points") div.empty.empty-search-results(ng-class="{'hidden': userstories.length}") span.icon.icon-issues @@ -47,17 +47,17 @@ script(type="text/ng-template", id="search-tasks") div.search-result-table-container(ng-class="{'hidden': !tasks.length}") div.search-result-table-header div.row.title - div.user-stories.width-4 Task - div.status.width-2 Status - div.points.width-1 Assigned to + div.user-stories Task + div.status Status + div.assigned-to Assigned to div.search-result-table-body div.row.table-main(ng-repeat="task in tasks track by task.id") - div.user-stories.width-4 + div.user-stories div.user-story-name a(href="", tg-nav="project-tasks-detail:project=project.slug,ref=task.ref", tg-bo-bind="task.subject") - div.status.width-2(tg-listitem-task-status="task") - div.points.width-1(tg-listitem-assignedto="task") + div.status(tg-listitem-task-status="task") + div.assigned-to(tg-listitem-assignedto="task") div.empty.empty-search-results(ng-class="{'hidden': tasks.length}") span.icon.icon-issues @@ -68,10 +68,10 @@ script(type="text/ng-template", id="search-wikipages") div.search-result-table-container(ng-class="{'hidden': !wikipages.length}") div.search-result-table-header div.row.title - div.user-stories.width-4 Wiki page + div.user-stories Wiki page div.search-result-table-body div.row.table-main(ng-repeat="wikipage in wikipages track by wikipage.id") - div.user-stories.width-4 + div.user-stories div.user-story-name a(href="", tg-nav="project-wiki-page:project=project.slug,slug=wikipage.slug", tg-bo-bind="wikipage.slug") diff --git a/app/styles/modules/search/search-result-table.scss b/app/styles/modules/search/search-result-table.scss index 8675d43f..2a1e3947 100644 --- a/app/styles/modules/search/search-result-table.scss +++ b/app/styles/modules/search/search-result-table.scss @@ -7,18 +7,22 @@ } .row { - @include table-flex; - padding: 20px; + @include table-flex($align-content: center, $align-items: center); + padding: .5rem; &:hover { background: lighten($green-taiga, 60%); @include transition (background .2s ease-in); } - >div { - @include table-flex-child(1, 0, 0); - } .user-stories { @include table-flex-child(5, 500px, 0, 500px); } + .status, + .points { + @include table-flex-child(1, 0, 0); + } + .assigned-to { + @include table-flex-child(1, 250px, 0, 250px); + } } .row-selected { background: lighten($green-taiga, 60%); @@ -69,7 +73,11 @@ flex-basis: 35px; } figcaption { - margin-left: 1rem; + display: inline-block; + margin-left: .5rem; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } } }