Fixed backlog structure to keep Andrey happy

stable
Xavier Julián 2014-06-17 12:12:43 +02:00
parent d1499ad541
commit aea77b56cd
10 changed files with 191 additions and 157 deletions

View File

@ -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}")

View File

@ -4,6 +4,7 @@ block head
title Taiga Project management web application with scrum in mind!
block content
div.wrapper
sidebar.menu-secondary.extrabar.filters-bar
include views/modules/filters
section.main.backlog(tg-backlog)
@ -30,4 +31,6 @@ block content
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

View File

@ -1,2 +1 @@
block content

View File

@ -10,5 +10,5 @@ html(lang="en")
block head
body
include views/modules/nav
div.wrapper
div.master
block content

View File

@ -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 }}

View File

@ -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")
script(type="text/ng-template" id="backlog-row.html")
include ../components/backlog-row

View File

@ -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

View File

@ -21,10 +21,11 @@
}
}
.button-green {
.button-green,
.button-gray,
.button-red {
@extend %button;
@include transition (background .3s linear);
background: $green-taiga;
span {
color: $white;
position: relative;
@ -32,26 +33,32 @@
}
&:hover {
@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;

View File

@ -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;

View File

@ -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;
}
}
}