taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #147 from taigaio/issue/1546/hover-tags-on-kanban-and-taskboard 

Now the tag hover space is the double of the tag line
stable
Alejandro 2014-11-06 10:35:45 +01:00
parent 73c54555c0 246df0cc86
commit e96c729ba5
4 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/coffee/modules/common/tags.coffee
View File

@ -63,12 +63,12 @@ ColorizeTagsDirective = ->
""") """)
kanban: _.template(""" kanban: _.template("""
<% _.each(tags, function(tag) { %> <% _.each(tags, function(tag) { %>
<a class="kanban-tag" href="" style="background: <%- tag.color %>" title="<%- tag.name %>" /> <a class="kanban-tag" href="" style="border-color: <%- tag.color %>" title="<%- tag.name %>" />
<% }) %> <% }) %>
""") """)
taskboard: _.template(""" taskboard: _.template("""
<% _.each(tags, function(tag) { %> <% _.each(tags, function(tag) { %>
<a class="taskboard-tag" href="" style="background: <%- tag.color %>" title="<%- tag.name %>" /> <a class="taskboard-tag" href="" style="border-color: <%- tag.color %>" title="<%- tag.name %>" />
<% }) %> <% }) %>
""") """)
} }

2
app/partials/views/components/kanban-task.jade
View File

@ -1,4 +1,4 @@
div.kanban-tagline(tg-colorize-tags="us.tags" tg-colorize-tags-type="kanban") div.kanban-tagline(tg-colorize-tags="us.tags", tg-colorize-tags-type="kanban")
div.kanban-task-inner div.kanban-task-inner
div(tg-kanban-user-avatar="us.assigned_to", ng-model="us") div(tg-kanban-user-avatar="us.assigned_to", ng-model="us")
div.task-text div.task-text

20
app/styles/components/kanban-task.scss
View File

@ -28,13 +28,13 @@
} }
.kanban-tagline { .kanban-tagline {
@include table-flex(); @include table-flex();
background: $postit-hover; //Fallback border-color: $postit-hover;
//height: .3rem; height: .6rem;
} }
.kanban-tag { .kanban-tag {
@include table-flex-child(1, 0, 0, 0); @include table-flex-child(1, 0, 0, 0);
background: $postit-hover; //Fallback border-color: $postit-hover;
//height: .3rem; height: .6rem;
} }
.kanban-task-inner { .kanban-task-inner {
@include table-flex(); @include table-flex();
@ -127,17 +127,14 @@
} }
} }
} }
.kanban-tagline {
height: .3rem;
}
.kanban-tag { .kanban-tag {
height: .3rem; border-top: .3rem solid;
} }
} }
.kanban-task-minimized { .kanban-task-minimized {
.kanban-task-inner { .kanban-task-inner {
padding: .3rem; padding: 0 .3rem;
} }
.avatar { .avatar {
@include table-flex-child($flex-basis: 40px); @include table-flex-child($flex-basis: 40px);
@ -169,10 +166,7 @@
cursor: move; cursor: move;
right: .1rem; right: .1rem;
} }
.kanban-tagline {
height: .2rem;
}
.kanban-tag { .kanban-tag {
height: .2rem; border-top: .2rem solid;
} }
} }

13
app/styles/components/taskboard-task.scss
View File

@ -34,18 +34,19 @@
} }
.taskboard-tagline { .taskboard-tagline {
@include table-flex(); @include table-flex();
background: $gray-light; //Fallback border-color: $postit-hover;
height: .3rem; height: .6rem;
} }
.taskboard-tag { .taskboard-tag {
@include table-flex-child(1, 0, 0, 0); @include table-flex-child(1, 0, 0, 0);
background: $postit-hover; //Fallback border-top: .3rem solid $postit-hover;
height: .3rem; height: .6rem;
z-index: 100;
} }
.taskboard-task-inner { .taskboard-task-inner {
@include table-flex(); @include table-flex();
min-height: 7.5rem; min-height: 7rem;
padding: 1rem .5rem; padding: .5rem;
} }
.taskboard-user-avatar { .taskboard-user-avatar {
.avatar { .avatar {