From 2555808b7cdc7ccfc698c299241b0d72d0734605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 2 Jul 2014 13:15:39 +0200 Subject: [PATCH] Issues data --- app/partials/issues-detail.jade | 25 +++++++++++++------------ app/styles/components/level.scss | 7 +++++++ app/styles/layout/us-detail.scss | 21 +++++++++++++++++++++ app/styles/main.scss | 1 + app/styles/modules/issues-table.scss | 7 ------- 5 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 app/styles/components/level.scss diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade index 5cf98e2f..83785178 100644 --- a/app/partials/issues-detail.jade +++ b/app/partials/issues-detail.jade @@ -47,18 +47,19 @@ block content span Open span.us-detail-status In progress - div.us-detail-progress-bar - div.current-progress - span.tasks-completed 6/7 tasks completed - - ul.points-per-role - li.total - span.points 10 - span.role total - - li(ng-repeat="role in roles track by role.id") - span.points 10 - span.role UX + div.issue-data + div.severity-data + span.level + span.severity-status Important + span.level-name severity + div.priority-data + span.level + span.priority-status low + span.level-name priority + div.status-data + span.level + span.status-status new + span.level-name status include views/components/assigned-to section.watchers(tg-watchers, ng-model="issue.watchers") diff --git a/app/styles/components/level.scss b/app/styles/components/level.scss new file mode 100644 index 00000000..3e28ea06 --- /dev/null +++ b/app/styles/components/level.scss @@ -0,0 +1,7 @@ +.level { + background-color: $gray-light; + border-radius: 9px; + height: 18px; + margin: 0 auto; + width: 18px; +} diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index fcf4218f..3cfae2ee 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -177,6 +177,27 @@ } } +.issue-data { + div { + @include clearfix(); + background: darken($whitish, 5%); + margin-bottom: 1rem; + padding: .5rem; + &:last-child { + margin: 0; + } + } + .level { + display: inline-block; + margin-right: .5rem; + vertical-align: top; + } + .level-name { + color: darken($whitish, 20%); + float: right; + } +} + .us-detail-assigned-to { @include table-flex(); margin-top: 2rem; diff --git a/app/styles/main.scss b/app/styles/main.scss index 23bc4a7a..a2c411a1 100755 --- a/app/styles/main.scss +++ b/app/styles/main.scss @@ -28,6 +28,7 @@ $prefix-for-spec: true; @import 'components/basic-table'; @import 'components/paginator'; @import 'components/watchers'; +@import 'components/level'; //Modules @import 'modules/nav'; diff --git a/app/styles/modules/issues-table.scss b/app/styles/modules/issues-table.scss index 0a91e6e4..e679a254 100644 --- a/app/styles/modules/issues-table.scss +++ b/app/styles/modules/issues-table.scss @@ -33,13 +33,6 @@ margin-left: 1rem; } } - .level { - background-color: $gray-light; - border-radius: 9px; - height: 18px; - margin: 0 auto; - width: 18px; - } .level-field { @include table-flex-child(1, 50px, 0, 50px); text-align: center;