Fixed merge from master and updated files
Xavier Julián
parent
bd8c2df7c3
commit
2891e88365
|
|
@ -4,41 +4,42 @@ block head
|
|||
title Taiga Project management web application with scrum in mind!
|
||||
|
||||
block content
|
||||
div.main.us-detail
|
||||
div.us-detail-header
|
||||
h1
|
||||
span ProjectName
|
||||
span.green User Story
|
||||
a.button.button-green(href="", title="Edit") Edit
|
||||
section.us-story-main-data
|
||||
h2.us-title
|
||||
span.us-number 125
|
||||
span.us-name Tagear contenido dentro de las catas privadas
|
||||
div.user-story-tags
|
||||
- for(var y = 0; y < 6; y++)
|
||||
include views/components/tag
|
||||
input(type="text", placeholder="Add Tag")
|
||||
section.us-content
|
||||
p Hay que cambiar el texto "Hola NombreDelUsuario" por "Nivel de conexion al XX%"
|
||||
p La propuesta que esperábamos de UX debía incluir nombre y nivel de conexión. Esperamos nueva propuesta corregida donde aparezca tanto el nombre como el % de conexión
|
||||
p <strong>Test de aceptación</strong>
|
||||
ul
|
||||
li Entro en la aplicación
|
||||
li Compruebo que el indicador crece
|
||||
p <strong>Prototipos</strong><br /><a href="">share.axure.com/lalala</a>
|
||||
p <strong>Prototipos</strong><br /><a href="">share.axure.com/lalala</a>
|
||||
include views/modules/attachments
|
||||
section.us-activity
|
||||
ul.us-activity-tabs
|
||||
li
|
||||
a.active(href="#")
|
||||
span.icon.icon-bulk
|
||||
span.tab-title Comments
|
||||
div.wrapper
|
||||
div.main.us-detail
|
||||
div.us-detail-header
|
||||
h1
|
||||
span ProjectName
|
||||
span.green User Story
|
||||
a.button.button-green(href="", title="Edit") Edit
|
||||
section.us-story-main-data
|
||||
h2.us-title
|
||||
span.us-number 125
|
||||
span.us-name Tagear contenido dentro de las catas privadas
|
||||
div.user-story-tags
|
||||
- for(var y = 0; y < 6; y++)
|
||||
include views/components/tag
|
||||
input(type="text", placeholder="Add Tag")
|
||||
section.us-content
|
||||
p Hay que cambiar el texto "Hola NombreDelUsuario" por "Nivel de conexion al XX%"
|
||||
p La propuesta que esperábamos de UX debía incluir nombre y nivel de conexión. Esperamos nueva propuesta corregida donde aparezca tanto el nombre como el % de conexión
|
||||
p <strong>Test de aceptación</strong>
|
||||
ul
|
||||
li Entro en la aplicación
|
||||
li Compruebo que el indicador crece
|
||||
p <strong>Prototipos</strong><br /><a href="">share.axure.com/lalala</a>
|
||||
p <strong>Prototipos</strong><br /><a href="">share.axure.com/lalala</a>
|
||||
include views/modules/attachments
|
||||
section.us-activity
|
||||
ul.us-activity-tabs
|
||||
li
|
||||
a.active(href="#")
|
||||
span.icon.icon-bulk
|
||||
span.tab-title Comments
|
||||
|
||||
li
|
||||
a(href="#")
|
||||
span.icon.icon-issues
|
||||
span.tab-title Activity
|
||||
include views/modules/comments
|
||||
//-include views/modules/activity
|
||||
sidebar.menu-secondary.sidebar
|
||||
li
|
||||
a(href="#")
|
||||
span.icon.icon-issues
|
||||
span.tab-title Activity
|
||||
//-include views/modules/comments
|
||||
include views/modules/activity
|
||||
sidebar.menu-secondary.sidebar
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
top: 2px;
|
||||
}
|
||||
&:hover {
|
||||
@include transition (background .3s linear);
|
||||
@include transition (background .3s linear);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -193,5 +193,5 @@ a:visited {
|
|||
content: 'A';
|
||||
}
|
||||
.icon-reload:before {
|
||||
content: 'z';
|
||||
content: 'z';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,4 +59,4 @@ body {
|
|||
|
||||
.hidden {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,3 +74,31 @@
|
|||
.comment-list {
|
||||
padding: 1rem 2rem;
|
||||
}
|
||||
|
||||
.activity-single {
|
||||
@include table-flex;
|
||||
border-bottom: 2px solid $gray-light;
|
||||
padding: 1rem 0;
|
||||
position: relative;
|
||||
.username {
|
||||
color: $green-taiga;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
.date {
|
||||
@extend %small;
|
||||
color: $gray-light;
|
||||
margin-left: 1rem;
|
||||
}
|
||||
}
|
||||
|
||||
.activity-user {
|
||||
@include table-flex-child(1, 50px, 0);
|
||||
img {
|
||||
max-width: 70px;
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.activity-content {
|
||||
@include table-flex-child(20, 150px, 0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,9 @@ $prefix-for-spec: true;
|
|||
@import 'modules/admin-functionalities';
|
||||
@import 'modules/category-config';
|
||||
@import 'modules/project-details';
|
||||
@import 'modules/comments';
|
||||
@import 'modules/attachments';
|
||||
@import 'modules/comment-activity';
|
||||
|
||||
// Responsive
|
||||
@import 'responsive/mobile';
|
||||
|
|
@ -51,3 +54,4 @@ $prefix-for-spec: true;
|
|||
@import 'layout/base';
|
||||
@import 'layout/backlog';
|
||||
@import 'layout/taskboard';
|
||||
@import 'layout/us-detail';
|
||||
|
|
|
|||
|
|
@ -104,10 +104,10 @@
|
|||
color: $white;
|
||||
}
|
||||
&.selected {
|
||||
@include transition(all .2s ease-in);
|
||||
background: $green-taiga;
|
||||
border: 1px solid $green-taiga;
|
||||
color: $white;
|
||||
@include transition(all .2s ease-in);
|
||||
background: $green-taiga;
|
||||
border: 1px solid $green-taiga;
|
||||
color: $white;
|
||||
}
|
||||
}
|
||||
.blocked {
|
||||
|
|
|
|||
Loading…
Reference in New Issue