diff --git a/app/fonts/taiga.eot b/app/fonts/taiga.eot index 7c1775dd..74a60d0f 100644 Binary files a/app/fonts/taiga.eot and b/app/fonts/taiga.eot differ diff --git a/app/fonts/taiga.svg b/app/fonts/taiga.svg index 07f72bc7..ee2f5202 100644 --- a/app/fonts/taiga.svg +++ b/app/fonts/taiga.svg @@ -25,4 +25,6 @@ + + diff --git a/app/fonts/taiga.ttf b/app/fonts/taiga.ttf index b6400351..0dfcb41e 100644 Binary files a/app/fonts/taiga.ttf and b/app/fonts/taiga.ttf differ diff --git a/app/fonts/taiga.woff b/app/fonts/taiga.woff index 9203115f..9b870813 100644 Binary files a/app/fonts/taiga.woff and b/app/fonts/taiga.woff differ diff --git a/app/styles/components/taskboard-task.scss b/app/styles/components/taskboard-task.scss new file mode 100644 index 00000000..2bc366cd --- /dev/null +++ b/app/styles/components/taskboard-task.scss @@ -0,0 +1,61 @@ +.taskboard-task { + background: $postit; + margin-bottom: 1rem; + position: relative; + .taskboard-tagline { + @include table-flex(); + } + .taskboard-tag { + @include table-flex-child(1, 0, 0, 0); + background: $grayer; //Fallback + height: .2rem; + } + .taskboard-task-inner { + @include table-flex(); + padding: 1rem .5rem; + } + .avatar { + @include table-flex-child($flex-basis: 50px); + a { + @extend %small; + text-align: center; + } + img { + margin: 0 auto; + } + figcaption { + display: block; + overflow: hidden; + position: relative; + text-overflow: ellipsis; + top: 4px; + white-space: nowrap; + width: 50px; + } + } + .task-num { + color: $postit-hover; + margin-right: .5em; + } + .taskboard-text { + @include table-flex-child($flex-grow: 10, $flex-basis: 50px, $width: 100px); + } + .icon-edit, + .icon-drag-h { + @extend %large; + bottom: .2rem; + color: $postit-hover; + position: absolute; + &:hover { + @include transition(color, .3s, linear); + color: darken($postit-hover, 15%); + } + } + .icon-edit { + right: .5rem; + } + .icon-drag-h { + @extend %xlarge; + right: 45%; + } +} diff --git a/app/styles/dependencies/colors.scss b/app/styles/dependencies/colors.scss index 1a039f3f..952649ad 100755 --- a/app/styles/dependencies/colors.scss +++ b/app/styles/dependencies/colors.scss @@ -21,3 +21,6 @@ $button-green: #699b05; $button-green-hover: #9dce0a; $button-gray: #585858; $button-gray-hover: #879b89; + +$postit: #fff0c5; +$postit-hover: #e3d6b0; diff --git a/app/styles/dependencies/helpers.scss b/app/styles/dependencies/helpers.scss index 1561a7bb..667f4ab3 100644 --- a/app/styles/dependencies/helpers.scss +++ b/app/styles/dependencies/helpers.scss @@ -3,6 +3,23 @@ box-sizing: border-box; } +//Flexbox FTW +%table-flex { + align-content: stretch; + align-items: stretch; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: flex-start; +} + +%table-flex-child { + flex-basis: 300px; + flex-grow: 1; + flex-shrink: 0; + width: 300px; +} + // #Reset & Basics (Inspired by E. Meyers) //================================================== a, diff --git a/app/styles/dependencies/mixins.scss b/app/styles/dependencies/mixins.scss index ff163963..68171a47 100644 --- a/app/styles/dependencies/mixins.scss +++ b/app/styles/dependencies/mixins.scss @@ -8,3 +8,23 @@ @mixin background-opacity($color: $white, $opacity: .3) { background: rgba($color, $opacity); } + +// Table Flex - http://devbryce.com/site/flexbox/ +@mixin table-flex() { + align-content: stretch; + align-items: stretch; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: flex-start; +} + +@mixin table-flex-child($flex-grow: 1, $flex-basis: 300px, $flex-shrink: 0, $width:'') { + flex-basis: $flex-basis; + flex-grow: $flex-grow; + flex-shrink: $flex-shrink; + width: $flex-basis; + @if #{$width} != null { + width: #{$width}; + } +} diff --git a/app/styles/dependencies/typography.scss b/app/styles/dependencies/typography.scss index 37a91b5d..a3cfa641 100755 --- a/app/styles/dependencies/typography.scss +++ b/app/styles/dependencies/typography.scss @@ -168,3 +168,9 @@ a:visited { .icon-iocaine:before { content: 'r'; } +.icon-drag-h:before { + content: 's'; +} +.icon-drag-v:before { + content: 't'; +} diff --git a/app/styles/main.scss b/app/styles/main.scss index ee2b8b27..77883d90 100755 --- a/app/styles/main.scss +++ b/app/styles/main.scss @@ -23,6 +23,7 @@ $prefix-for-spec: true; @import 'components/popover'; @import 'components/tag'; @import 'components/filter'; +@import 'components/taskboard-task'; //Layout @import 'layout/base'; diff --git a/app/styles/modules/taskboard-table.scss b/app/styles/modules/taskboard-table.scss index 4c5c85b6..e75994bf 100644 --- a/app/styles/modules/taskboard-table.scss +++ b/app/styles/modules/taskboard-table.scss @@ -1,19 +1,3 @@ -%table-flex { - align-content: stretch; - align-items: stretch; - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: flex-start; -} - -%table-flex-child { - flex-basis: 300px; - flex-grow: 1; - flex-shrink: 0; - width: 300px; -} - .taskboard-table { overflow: hidden; width: 100%; diff --git a/app/views/components/taskboard-task.jade b/app/views/components/taskboard-task.jade new file mode 100644 index 00000000..f35373e8 --- /dev/null +++ b/app/views/components/taskboard-task.jade @@ -0,0 +1,14 @@ +div.taskboard-task + div.taskboard-tagline + - for(var y = 0; y < 5; y++) + div.taskboard-tag + div.taskboard-task-inner + figure.avatar + a(href="", title="UserName") + img.avatar(src="http://thecodeplayer.com/u/uifaces/12.jpg", alt="username") + figcaption Username + p.taskboard-text + span.task-num 125 + span.task-name Crear usuarios que no sepan que tienen que darse de alta para darse de baja y crear contenido bloqueado o no en la plataforma + a.icon.icon-edit(href="", title="Edit") + a.icon.icon-drag-h(href="", title="Drag&Drop") diff --git a/app/views/modules/taskboard-table.jade b/app/views/modules/taskboard-table.jade index c0063d98..efcabd6f 100644 --- a/app/views/modules/taskboard-table.jade +++ b/app/views/modules/taskboard-table.jade @@ -29,4 +29,4 @@ div.taskboard-table div.taskboard_task-playground.task-column - for(var x = 0; x < 3; x++) div.task-row - //- Include tasks + include ../components/taskboard-task