diff --git a/src/app/dashboard/template/boards_worklists.html b/src/app/dashboard/template/boards_worklists.html index 47b52a61..cff13c0b 100644 --- a/src/app/dashboard/template/boards_worklists.html +++ b/src/app/dashboard/template/boards_worklists.html @@ -21,82 +21,72 @@
- - - - - - - - - - - - - - - -
My Boards
-

- - {{board.title}} - -

+
+

+   + My Boards +

+
+ + {{board.title}} + +

- - {{lane.worklist.items.length}} - {{lane.worklist.title}} -   + ng-if="!lane.worklist.archived"> + + {{lane.worklist.items.length}} + {{lane.worklist.title}} +   -

+

+ +

You don't currently have any boards. -

- -
+

+

+ +

+
- - - - - - - - - - - - - - - -
My Worklists
- - -

- - {{worklist.title}} - -

+
+

+   + My Worklists +

+
+ + + + {{worklist.title}} + +

- - {{worklist.items.length}} - Items + + {{worklist.items.length}} + Items -

+

+ +

You don't currently have any worklists. -

- -
+

+

+ +

+
diff --git a/src/app/dashboard/template/dashboard.html b/src/app/dashboard/template/dashboard.html index 3734313c..06a40c5f 100644 --- a/src/app/dashboard/template/dashboard.html +++ b/src/app/dashboard/template/dashboard.html @@ -7,159 +7,115 @@
- - - - - - - - - - - - - - - - -
- - - - Recent Events - - ({{subscriptionEvents.length}}) - - - - Recent Events +

+ + + + Recent Events + + ({{subscriptionEvents.length}}) -

- -
- - There are no recent events on your subscriptions. - -
+ + + Recent Events + + + + + +
+

+ +

+
+
+
+

+ There are no recent events on your subscriptions. +

+
- +
-
- - - - - - - - - - - - - - - - - - - - - -
Tasks assigned to me
- - -

- - {{task.title}} - -

-
- - -

- - {{task.title}} - -

-
- - -

- - {{task.title}} - -

-
+
+

Tasks assigned to me

+
+ +   + + {{task.title}} + +
+
+ +   + + {{task.title}} + +
+
+ +   + + {{task.title}} + +
+

There are no tasks in active stories currently assigned to you. -

+

- +
-
- - - - - - - - - - - - - -
Stories created by me
- - - +

Stories created by me

+
+ + +   + -

- - {{story.title}} - -

- -
+ + + {{story.title}} + +

+ +

+ +

There are no active stories created by you. -

+

diff --git a/src/app/dashboard/template/event/user_comment.html b/src/app/dashboard/template/event/user_comment.html index 8bca3872..7db1befa 100644 --- a/src/app/dashboard/template/event/user_comment.html +++ b/src/app/dashboard/template/event/user_comment.html @@ -7,7 +7,7 @@ {{ author.full_name }} left a comment:

-

- {{evt.event_info.comment_content || 'The author left a blank comment.'}} -

+
+ +
diff --git a/src/app/dashboard/template/subscriptions.html b/src/app/dashboard/template/subscriptions.html index 6d91f025..759ebe9c 100644 --- a/src/app/dashboard/template/subscriptions.html +++ b/src/app/dashboard/template/subscriptions.html @@ -19,165 +19,124 @@
Subscriptions

- +   Subscriptions

-
- - - - - - - - - - - - - -
- +
+

+   Stories -

- - - + +
+ + +   + -

- - {{story.title}} - -

- -
+ + + {{story.title}} + +

+ +

+ +

You are not currently subscribed to any stories. -

+

-
-
- - - - - - - - - - - - -
- +
+

+   Projects -

- - -

- - {{project.name}} - -

-
+ +
+ + +

+ + {{project.name}} + +

+
+

You are not currently subscribed to any projects. -

+

-
-
- - - - - - - - - - - - -
- +
+

+   Project Groups -

- - -

- - {{projectGroup.name}} - -

-
+ +
+ + +

+ + {{projectGroup.name}} + +

+
+

You are not currently subscribed to any project groups. -

+

-
-
- - - - - - - - - - - - - - -
- +
+

+   Worklists -

- - -

- - {{worklist.title}} - -

+ +
+ + + + {{ worklist.title }} + +

- - {{worklist.items.length}} - Items + + {{ worklist.items.length }} + Items -

- - You are not currently subscribed to any worklists. - -
+

+
+

+ + You are not currently subscribed to any worklists. + +

diff --git a/src/app/util/directive/story_task_status.js b/src/app/util/directive/story_task_status.js index 5dfbb0dd..d94ac0e6 100644 --- a/src/app/util/directive/story_task_status.js +++ b/src/app/util/directive/story_task_status.js @@ -37,6 +37,18 @@ angular.module('sb.util').directive('storyTaskStatus', $scope.status_texts = statuses; }); + + $scope.orderStatus = function(item) { + var order = [ + 'todo', + 'inprogress', + 'review', + 'invalid', + 'merged' + ]; + + return order.indexOf(item.key); + }; } }; }); diff --git a/src/app/util/template/story_task_status.html b/src/app/util/template/story_task_status.html index 45e1aa5f..784a742b 100644 --- a/src/app/util/template/story_task_status.html +++ b/src/app/util/template/story_task_status.html @@ -1,4 +1,4 @@ - + {{task_status.count}} diff --git a/src/theme/base/_cards.scss b/src/theme/base/_cards.scss new file mode 100644 index 00000000..f5211d36 --- /dev/null +++ b/src/theme/base/_cards.scss @@ -0,0 +1,20 @@ +.card { + background-color: #fff; + padding: 30px; + border-radius: 2px; + box-shadow: 0 2px 2px rgba(0, 0, 0, 0.12); + margin: 30px 0px 0px 0px; + + h3:first-of-type { + margin-top: 0px; + font-size: 1.25em; + } + + task-status-dropdown { + width: 80px; + } + + .card-row { + margin-top: 25px; + } +} \ No newline at end of file diff --git a/src/theme/base/_layout.scss b/src/theme/base/_layout.scss new file mode 100644 index 00000000..29c6cc3b --- /dev/null +++ b/src/theme/base/_layout.scss @@ -0,0 +1,24 @@ +.row.bordered { + border-top: 1px solid #ddd; + padding: 10px; + margin: 0px; + line-height: 1.5em; + background-color: transparent; + overflow: hidden; + + &:last-of-type { + border-bottom: 1px solid #ddd; + } + + p { + margin: 14px 0px; + + button.close { + margin-left: 10px; + } + } +} + +.indented { + padding: 0px 15px; +} \ No newline at end of file diff --git a/src/theme/base/_typography.scss b/src/theme/base/_typography.scss index 7ee219f3..252c5eb9 100644 --- a/src/theme/base/_typography.scss +++ b/src/theme/base/_typography.scss @@ -22,3 +22,7 @@ p, span, em, strong, small { white-space: pre-wrap; } } + +h3 { + font-size: 1.25em; +} \ No newline at end of file diff --git a/src/theme/main.scss b/src/theme/main.scss index bc61df8b..cbe855e6 100644 --- a/src/theme/main.scss +++ b/src/theme/main.scss @@ -61,3 +61,5 @@ $fa-font-path: '../fonts'; @import 'base/boards_worklists'; @import 'base/calendar'; @import 'base/stories'; +@import 'base/cards'; +@import 'base/layout';