diff --git a/app/partials/issues.jade b/app/partials/issues.jade index bed9b41a..6f771a08 100644 --- a/app/partials/issues.jade +++ b/app/partials/issues.jade @@ -7,7 +7,7 @@ block content div.wrapper.issues(tg-issues, ng-controller="IssuesController as ctrl", ng-init="section='issues'") sidebar.menu-secondary.extrabar.filters-bar include views/modules/filters - // + //- TODO: Please delete this once filters are working correctly sidebar.menu-secondary.sidebar.filters-container // TODO: maybe everything related to this section // should be done in one unique include? diff --git a/app/partials/views/modules/issues-table.jade b/app/partials/views/modules/issues-table.jade index ac144f99..4c32cf09 100644 --- a/app/partials/views/modules/issues-table.jade +++ b/app/partials/views/modules/issues-table.jade @@ -1,15 +1,15 @@ section.issues-table.basic-table div.row.title - div.level-field.width-1 Severity - div.level-field.width-1 Priority - div.width-7.subject Subject - div.width-2 Status - div.width-2 Assigned to + div.level-field Severity + div.level-field Priority + div.subject Subject + div.issue-field Status + div.assigned-field Assigned to div.row.table-main(ng-repeat="issue in issues track by issue.id") - div.level-field.width-1(tg-issue-severity="issue") - div.level-field.width-1(tg-issue-priority="issue") - div.width-7.subject(tg-bo-html="issue.subject") - div.width-2(tg-issue-status="issue") - div.width-2(tg-issue-assignedto="issue") + div.level-field(tg-issue-severity="issue") + div.level-field(tg-issue-priority="issue") + div.subject(tg-bo-html="issue.subject") + div.issue-field(tg-issue-status="issue") + div.assigned-field(tg-issue-assignedto="issue") -section.issues-paginator \ No newline at end of file +section.issues-paginator diff --git a/app/styles/layout/issues.scss b/app/styles/layout/issues.scss index 721744a6..3af26e41 100644 --- a/app/styles/layout/issues.scss +++ b/app/styles/layout/issues.scss @@ -6,4 +6,4 @@ opacity: 1; padding: 2em 1em; } -} \ No newline at end of file +} diff --git a/app/styles/modules/issues-table.scss b/app/styles/modules/issues-table.scss index b4e448ab..71b556f7 100644 --- a/app/styles/modules/issues-table.scss +++ b/app/styles/modules/issues-table.scss @@ -1,4 +1,5 @@ .issues-table { + @include table-flex(); .row { &:hover { background: lighten($green-taiga, 60%); @@ -39,9 +40,17 @@ width: 18px; } .level-field { + @include table-flex-child(1, 50px, 0, 50px); text-align: center; } .subject { + @include table-flex-child(7, 300px, 0, 300px); padding-right: 1rem; } + .issue-field, + .assigned-field { + @include table-flex-child(1, 150px, 0, 150px); + padding: 0 1rem; + text-align: left; + } } diff --git a/app/styles/modules/list-filters.scss b/app/styles/modules/list-filters.scss index cea40bfa..06e0a234 100644 --- a/app/styles/modules/list-filters.scss +++ b/app/styles/modules/list-filters.scss @@ -3,6 +3,7 @@ background-color: $whitish; display: flex; justify-content: space-between; + margin-bottom: 2rem; padding: .5rem 1rem; ul { display: flex;