From c56f85cb1162fc5379942a1a1aea6e192896c7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 2 Jul 2014 10:08:18 +0200 Subject: [PATCH] Moved modules to components for watchers and assigned --- app/partials/issues-detail.jade | 22 +++++++------------ .../views/components/assigned-to.jade | 7 ++++++ app/partials/views/components/watchers.jade | 13 +++++++++++ app/partials/views/modules/watchers.jade | 13 ----------- app/styles/modules/sprints.scss | 3 ++- 5 files changed, 30 insertions(+), 28 deletions(-) create mode 100644 app/partials/views/components/assigned-to.jade create mode 100644 app/partials/views/components/watchers.jade delete mode 100644 app/partials/views/modules/watchers.jade diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade index 5f7dcc27..23a77d8a 100644 --- a/app/partials/issues-detail.jade +++ b/app/partials/issues-detail.jade @@ -11,9 +11,11 @@ block content include views/components/mainTitle a.button.button-green(href="", title="Edit") Edit section.us-story-main-data - h2.us-title - span.us-number(tg-bo-html="issue.ref") - span.us-name(ng-bind="issue.subject") + div.us-title + h2 + span.us-number(tg-bo-html="issue.ref") + span.us-name(ng-bind="issue.subject") + input(type="text", placeholder="Set title") // div.blocked-warning // span.icon.icon-warning @@ -61,17 +63,9 @@ block content span.points 10 span.role UX - - // TODO: change clase - section.us-detail-assigned-to - div.user-avatar - a.avatar(href="", title="Assigned to") - img(src="http://thecodeplayer.com/u/uifaces/18.jpg", alt="username") - div.assigned-to - span.assigned-title Assigned to - span.user-assigned Anler Hernández - - include views/modules/watchers + include views/components/assigned-to + section.watchers + include views/components/watchers // NOTE: only for user story? // section.us-detail-settings diff --git a/app/partials/views/components/assigned-to.jade b/app/partials/views/components/assigned-to.jade new file mode 100644 index 00000000..10c6ec30 --- /dev/null +++ b/app/partials/views/components/assigned-to.jade @@ -0,0 +1,7 @@ +section.us-detail-assigned-to + div.user-avatar + a.avatar(href="", title="Assigned to") + img(src="http://thecodeplayer.com/u/uifaces/18.jpg", alt="username") + div.assigned-to + span.assigned-title Assigned to + span.user-assigned Anler Hernández \ No newline at end of file diff --git a/app/partials/views/components/watchers.jade b/app/partials/views/components/watchers.jade new file mode 100644 index 00000000..cbc03c5b --- /dev/null +++ b/app/partials/views/components/watchers.jade @@ -0,0 +1,13 @@ +//- Father [section.watchers] should be out of the template +div.watchers-header + span.title watchers + a.icon.icon-plus(href="", title="Add watcher") +div.watchers-content + - for(var y=0; y<5; y++) + div.watcher-single + div.watcher-avatar + a.avatar(href="", title="Assigned to") + img(src="http://thecodeplayer.com/u/uifaces/32.jpg", alt="username") + div.watcher-name + a(href="", title="Jesús Espino") Jesús + a.icon.icon-delete(href="", title="delete-watcher") diff --git a/app/partials/views/modules/watchers.jade b/app/partials/views/modules/watchers.jade deleted file mode 100644 index 523d582e..00000000 --- a/app/partials/views/modules/watchers.jade +++ /dev/null @@ -1,13 +0,0 @@ -section.watchers - div.watchers-header - span.title watchers - a.icon.icon-plus(href="", title="Add watcher") - div.watchers-content - - for(var y=0; y<5; y++) - div.watcher-single - div.watcher-avatar - a.avatar(href="", title="Assigned to") - img(src="http://thecodeplayer.com/u/uifaces/32.jpg", alt="username") - div.watcher-name - a(href="", title="Jesús Espino") Jesús - a.icon.icon-delete(href="", title="delete-watcher") \ No newline at end of file diff --git a/app/styles/modules/sprints.scss b/app/styles/modules/sprints.scss index 1a714f33..83563bb7 100644 --- a/app/styles/modules/sprints.scss +++ b/app/styles/modules/sprints.scss @@ -53,6 +53,7 @@ } ul { float: right; + margin: 0; } li { display: inline-block; @@ -65,7 +66,7 @@ background: $gray-light; border-radius: 2px; height: 8px; - margin-bottom: 0; + margin-bottom: 1rem; margin-top: .5rem; position: relative; width: 100%;