From 268d804854b4d310181a598fc2920a8a5649f37f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 28 Jan 2015 15:13:39 +0100 Subject: [PATCH] Fixed kanban tasks and made same css styles. TG-2085 #ready-for-test --- app/styles/components/kanban-task.scss | 57 +++++++++++------------ app/styles/components/taskboard-task.scss | 8 ---- 2 files changed, 26 insertions(+), 39 deletions(-) diff --git a/app/styles/components/kanban-task.scss b/app/styles/components/kanban-task.scss index 64a1da6e..5cc71ed5 100644 --- a/app/styles/components/kanban-task.scss +++ b/app/styles/components/kanban-task.scss @@ -1,5 +1,7 @@ .kanban-task { background: $postit; + border: 1px solid $postit-hover; + box-shadow: none; cursor: move; margin: .2rem; position: relative; @@ -9,14 +11,19 @@ &:hover { .icon-edit, .icon-drag-h { + color: $postit-dark-hover; + display: block; opacity: 1; - transition: opacity .2s linear; + transition: color .3s linear, opacity .3s linear; } } &.ui-sortable-helper { box-shadow: 1px 1px 15px rgba($black, .4); transition: box-shadow .3s linear; } + &.ui-sortable-placeholder { + background: $grayer; + } &.blocked { background: $red; border: 1px solid darken($red, 10%); @@ -32,12 +39,24 @@ height: .6rem; } .kanban-tag { - border-color: $postit-hover; + border-top: .3rem solid $postit-hover; + flex-basis: 0; flex-grow: 1; height: .6rem; + z-index: 100; } .kanban-task-inner { display: flex; + padding: .5rem; + } + .avatar-wrapper { + flex-basis: 55px; + flex-grow: 0; + flex-shrink: 0; + width: 55px; + img { + width: 100%; + } } .avatar { a { @@ -51,26 +70,16 @@ transition: border .3s linear; } } - .assigned-to { - color: darken($postit-hover, 15%); - display: none; - overflow: hidden; - position: relative; - text-overflow: ellipsis; - top: -6px; - white-space: nowrap; - width: 50px; - } - } - .task-assigned { - @extend %small; - color: $postit-dark-hover; - display: block; } .task-text { @extend %small; + flex-grow: 1; padding: 0 .5rem 0 .8rem; } + .task-assigned { + color: $postit-dark-hover; + display: block; + } .task-num { color: $grayer; margin-right: .3rem; @@ -94,9 +103,6 @@ .kanban-task-maximized { - .kanban-task-inner { - padding: 1rem 1rem 2rem; - } .task-archived { background: darken($whitish, 5%); padding: .5rem; @@ -123,9 +129,6 @@ } } } - .avatar { - width: 55px; - } .task-name { word-wrap: break-word; } @@ -185,14 +188,6 @@ } } } - .avatar-wrapper { - flex-basis: 50px; - flex-grow: 0; - width: 55px; - img { - width: 55px; - } - } .task-num { vertical-align: top; } diff --git a/app/styles/components/taskboard-task.scss b/app/styles/components/taskboard-task.scss index 8e1440bb..cad16d5d 100644 --- a/app/styles/components/taskboard-task.scss +++ b/app/styles/components/taskboard-task.scss @@ -63,14 +63,6 @@ transition: border .3s linear; } } - figcaption { - color: darken($postit-hover, 15%); - display: none; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - width: 100%; - } } .iocaine { img {