From aea77b56cd9eddf79ef4d95ac59adcec53123878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Tue, 17 Jun 2014 12:12:43 +0200 Subject: [PATCH] Fixed backlog structure to keep Andrey happy --- app/index.jade | 2 +- app/partials/backlog.jade | 55 +++---- app/partials/dummy-layout.jade | 1 - app/partials/layout.jade | 2 +- .../views/components/backlog-row.jade | 4 +- app/partials/views/modules/backlog-table.jade | 89 +++++------- app/partials/views/modules/sprints.jade | 2 +- app/styles/components/buttons.scss | 29 ++-- app/styles/modules/backlog-table.scss | 135 +++++++++--------- app/styles/modules/lightbox.scss | 29 ++++ 10 files changed, 191 insertions(+), 157 deletions(-) diff --git a/app/index.jade b/app/index.jade index bec62e34..32e01762 100644 --- a/app/index.jade +++ b/app/index.jade @@ -10,6 +10,6 @@ html(lang="en", ng-app="taiga") link(rel="stylesheet", href="/styles/main.css") body include partials/views/modules/nav - div.wrapper(ng-view="") + div.master(ng-view="") script(src="/js/libs.js?v=#{v}") script(src="/js/app.js?v=#{v}") diff --git a/app/partials/backlog.jade b/app/partials/backlog.jade index 614d4d3a..bd4e5c3b 100644 --- a/app/partials/backlog.jade +++ b/app/partials/backlog.jade @@ -4,30 +4,33 @@ block head title Taiga Project management web application with scrum in mind! block content - sidebar.menu-secondary.extrabar.filters-bar - include views/modules/filters - section.main.backlog(tg-backlog) - include views/components/mainTitle - include views/components/summary - include views/modules/burndown - div.backlog-menu - a.trans-button(href="", title="Move to Current Sprint") - span.icon.icon-move - span.text Move to current Sprint - a.trans-button(href="", title="Show Filters") - span.icon.icon-filter - span.text Show Filters - a.trans-button(href="", title="Show Tags") - span.icon.icon-tag - span.text Show Tags - include views/components/addnewus - include views/modules/backlog-table - sidebar.menu-secondary.sidebar - include views/modules/sprints - div.lightbox.lightbox_add-new-us - include views/modules/lightbox_add-new-us - div.lightbox.lightbox_add-bulk - include views/modules/lightbox_add-bulk - div.lightbox.lightbox_add-sprint - include views/modules/lightbox_add-sprint + div.wrapper + sidebar.menu-secondary.extrabar.filters-bar + include views/modules/filters + section.main.backlog(tg-backlog) + include views/components/mainTitle + include views/components/summary + include views/modules/burndown + div.backlog-menu + a.trans-button(href="", title="Move to Current Sprint") + span.icon.icon-move + span.text Move to current Sprint + a.trans-button(href="", title="Show Filters") + span.icon.icon-filter + span.text Show Filters + a.trans-button(href="", title="Show Tags") + span.icon.icon-tag + span.text Show Tags + include views/components/addnewus + include views/modules/backlog-table + sidebar.menu-secondary.sidebar + include views/modules/sprints + div.lightbox.lightbox_add-new-us + include views/modules/lightbox_add-new-us + div.lightbox.lightbox_add-bulk + include views/modules/lightbox_add-bulk + div.lightbox.lightbox_add-sprint + include views/modules/lightbox_add-sprint + div.lightbox.lightbox_confirm-delete + include views/modules/lightbox_confirm-delete diff --git a/app/partials/dummy-layout.jade b/app/partials/dummy-layout.jade index fdec9a16..6eff8e3c 100644 --- a/app/partials/dummy-layout.jade +++ b/app/partials/dummy-layout.jade @@ -1,2 +1 @@ block content - diff --git a/app/partials/layout.jade b/app/partials/layout.jade index 00a9f3e9..bff3f824 100644 --- a/app/partials/layout.jade +++ b/app/partials/layout.jade @@ -10,5 +10,5 @@ html(lang="en") block head body include views/modules/nav - div.wrapper + div.master block content diff --git a/app/partials/views/components/backlog-row.jade b/app/partials/views/components/backlog-row.jade index dc943f78..ef48587a 100644 --- a/app/partials/views/components/backlog-row.jade +++ b/app/partials/views/components/backlog-row.jade @@ -1,5 +1,5 @@ -div.row.table-main(ng-repeat="us in userstories") - div.user-stories +div.row(ng-repeat="us in userstories") + div div.user-story-name input(type="checkbox", name="") a(href="") {{ us.subject }} diff --git a/app/partials/views/modules/backlog-table.jade b/app/partials/views/modules/backlog-table.jade index eedb212e..e24c4ff8 100644 --- a/app/partials/views/modules/backlog-table.jade +++ b/app/partials/views/modules/backlog-table.jade @@ -1,60 +1,49 @@ -section.backlog-table - div.row.backlog-table-header +section.backlog-table-header + div.row.backlog-table-title div.user-stories User Stories div.status Status div.points Points div.points - div.row.sub-title + div.row.backlog-table-subtitle div.user-stories.width-4 div.status.width-2 div.points.width-1 Front div.points.width-1 Total -section.backlog-table - // div.row.table-main.blocked - // div.user-stories - // div.user-story-name - // input(type="checkbox", name="") - // a(href="") Crear el perfil de usuario Senior en el admin - // span.us-settings - // a.icon.icon-edit(href="", title="Edit") - // a.icon.icon-delete(href="", title="Delete") - // div.user-story-tags - // - for(var y = 0; y < 3; y++) - // include ../components/tag - // div.status.width-2 - // a(href="", title="Status Name") Status Name - // ul.popover.pop-status - // li - // a(href="", title="Status 1") Status 1 - // li - // a(href="", title="Status 2") Status 2 - // li - // a(href="", title="Status 3") Status 3 - // div.points - // a(href="", title="Front") 24 - // ul.popover.pop-points-open - // li: a(href="", title="0") 0 - // li: a(href="", title="1/2") 1/2 - // li: a(href="", title="1") 1 - // li: a(href="", title="2") 2 - // li: a(href="", title="3") 3 - // li: a(href="", title="4") 4 - // li: a(href="", title="8") 8 - // li: a(href="", title="13") 13 - // li: a(href="", title="20") 20 - // li: a(href="", title="40") 40 - // li: a(href="", title="100") 100 - // li: a(href="", title="?") ? - // div.points - // a(href="", title="Total Points") 43 - // ul.popover.pop-status - // li - // a(href="", title="Status 1") Status 1 - // li - // a(href="", title="Status 2") Status 2 - // li - // a(href="", title="Status 3") Status 3 +section.backlog-table-body + - for (var x = 0; x < 40; x++) + div.row + div.user-stories + div.user-story-name + input(type="checkbox", name="") + a(href="") Crear el perfil de usuario Senior en el admin + span.us-settings + a.icon.icon-edit(href="", title="Edit") + a.icon.icon-delete(href="", title="Delete") + div.user-story-tags + - for(var y = 0; y < 3; y++) + include ../components/tag + div.status.width-2 + a(href="", title="Status Name") Status Name + ul.popover.pop-status + li + a(href="", title="Status 1") Status 1 + li + a(href="", title="Status 2") Status 2 + li + a(href="", title="Status 3") Status 3 + div.points + a(href="", title="") 24 + div.points + a(href="", title="Total Points") 43 + ul.popover.pop-status + li + a(href="", title="Status 1") Status 1 + li + a(href="", title="Status 2") Status 2 + li + a(href="", title="Status 3") Status 3 + a.icon.icon-drag-v(href="", title="Drag") hr.doom-line -script(type="text/ng-template" id="backlog-row.html") - include ../components/backlog-row + script(type="text/ng-template" id="backlog-row.html") + include ../components/backlog-row diff --git a/app/partials/views/modules/sprints.jade b/app/partials/views/modules/sprints.jade index 2154d641..cabe2396 100644 --- a/app/partials/views/modules/sprints.jade +++ b/app/partials/views/modules/sprints.jade @@ -31,7 +31,7 @@ section.sprints div.column-us.width-8 a.us-name(href="", title="") #125 Crear el perfil de usuario Senior en el admin div.column-points.width-1 45 - a.button.button-gray(href="", title="Current Sprint Taksboard") + a.button.button-gray(href="", title="Current Sprint Taskboard") span Sprint Taskboard // If is current sprint diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss index dc08212b..438a0d89 100755 --- a/app/styles/components/buttons.scss +++ b/app/styles/components/buttons.scss @@ -21,37 +21,44 @@ } } -.button-green { +.button-green, +.button-gray, +.button-red { @extend %button; @include transition (background .3s linear); - background: $green-taiga; span { color: $white; position: relative; top: 2px; } &:hover { - @include transition (background .3s linear); + @include transition (background .3s linear); + } +} + +.button-green { + background: $green-taiga; + &:hover { background: $fresh-taiga; } } .button-gray { - @extend %button; - @include transition (background .3s linear); background: $button-gray; - span { - color: $white; - position: relative; - top: 2px; - } &:hover { - @include transition (background .3s linear); background: $button-gray-hover; color: $white; } } +.button-red { + background: $red-light; + &:hover { + background: $red; + color: $white; + } +} + .button-bulk { @extend %button; background: $green-taiga; diff --git a/app/styles/modules/backlog-table.scss b/app/styles/modules/backlog-table.scss index 78e6389d..510b7f6c 100644 --- a/app/styles/modules/backlog-table.scss +++ b/app/styles/modules/backlog-table.scss @@ -1,4 +1,5 @@ -.backlog-table { +.backlog-table-header, +.backlog-table-body { @include table-flex(); width: 100%; .row { @@ -6,19 +7,84 @@ padding: 1rem 0 1rem 1rem; text-align: left; width: 100%; + } + .row { //Previously table-main + @extend %small; + border-bottom: 1px solid $gray-light; + } + .backlog-table-title, + .backlog-table-subtitle, + .row { + &:hover { + background: transparent; + } + .user-stories { + @include table-flex-child(20, 100px, 0, 0); + } + .status { + @include table-flex-child(2, 100px, 0, 0); + } + .points { + @include table-flex-child(1, 100px, 0, 0); + } + } + .status, + .points { + position: relative; + } + .pop-status { + @include popover(150px, '', 30px, 10px, ''); + } + .pop-points { + @include popover(150px, '', 30px, 10px, ''); + } + .pop-points-open { + @include popover(200px, '', 30px, 10px, ''); + li { + display: inline-block; + width: 23%; + } + a { + display: block; + text-align: center; + &:hover { + background: $fresh-taiga; + color: $white; + } + } + } +} + +.backlog-table-header { + .backlog-table-title { + @extend %medium; + font-family: 'DroidSans-Bold'; + } + .backlog-table-subtitle { + @extend %small; + background: $whitish; + border-bottom: 2px solid $grayer; + font-family: 'DroidSans'; + &:hover { + background: $whitish; + } + } +} + +.backlog-table-body { + .row { &:hover { - background: lighten($green-taiga, 60%); @include transition (background .2s ease-in); - cursor: move; + background: lighten($green-taiga, 60%); .us-settings { - opacity: 1; @include transition (opacity .2s ease-in); + opacity: 1; } } } .row-selected { - background: lighten($green-taiga, 60%); @include transition (background .2s ease-in); + background: lighten($green-taiga, 60%); } .user-story-name { flex-basis: 500px; @@ -44,50 +110,12 @@ display: none; margin-top: .3rem; } - .backlog-table-header { - @extend %medium; - font-family: 'DroidSans-Bold'; - } - .backlog-table-header, - .sub-title, - .table-main { - &:hover { - background: transparent; - } - .user-stories { - @include table-flex-child(20, 100px, 0, 0); - } - .status { - @include table-flex-child(2, 100px, 0, 0); - } - .points { - @include table-flex-child(1, 100px, 0, 0); - } - } - .sub-title { - @extend %small; - background: $whitish; - border-bottom: 2px solid $grayer; - font-family: 'DroidSans'; - &:hover { - background: $whitish; - } - } - .table-main { - @extend %small; - border-bottom: 1px solid $gray-light; - } - .status, - .points { - position: relative; - } .blocked { background: $red-light; color: $white; &:hover { background: $red; @include transition (background .2s ease-in); - cursor: move; } a { color: $white; @@ -110,27 +138,6 @@ margin: .5rem 0; width: 100%; } - .pop-status { - @include popover(150px, '', 30px, 10px, ''); - } - .pop-points { - @include popover(150px, '', 30px, 10px, ''); - } - .pop-points-open { - @include popover(200px, '', 30px, 10px, ''); - li { - display: inline-block; - width: 23%; - } - a { - display: block; - text-align: center; - &:hover { - background: $fresh-taiga; - color: $white; - } - } - } .us-settings { float: right; margin-right: 2rem; diff --git a/app/styles/modules/lightbox.scss b/app/styles/modules/lightbox.scss index 5f3c4499..aad4735c 100644 --- a/app/styles/modules/lightbox.scss +++ b/app/styles/modules/lightbox.scss @@ -213,3 +213,32 @@ } } } + +.lightbox_confirm-delete { + display: none; + form { + flex-basis: 0; + flex-grow: 0; + flex-shrink: 0; + min-width: 420px; + width: 420px; + } + .us-delete-question, + .us-to-delete { + display: block; + line-height: 2rem; + text-align: center; + } + .us-to-delete { + @extend %large; + font-family: 'ostrichSans'; + } + .delete-options { + @include table-flex(); + a { + @include table-flex-child(1, 0, 0); + padding: 8px 0; + text-align: center; + } + } +}