diff --git a/app/coffee/modules/taskboard/main.coffee b/app/coffee/modules/taskboard/main.coffee index cc95b2ef..13a68719 100644 --- a/app/coffee/modules/taskboard/main.coffee +++ b/app/coffee/modules/taskboard/main.coffee @@ -369,7 +369,7 @@ SprintGraphDirective = -> redrawChart(element, $scope.stats.days) $scope.$on "taskboard:graph:toggle-visibility", -> - $el.toggle() + $el.parent().toggleClass('open'); $scope.$on "$destroy", -> $el.off() diff --git a/app/partials/taskboard.jade b/app/partials/taskboard.jade index 689fa249..21fdfe8e 100644 --- a/app/partials/taskboard.jade +++ b/app/partials/taskboard.jade @@ -14,7 +14,7 @@ block content include views/components/sprint-summary div.graphics-container - div.burndown.hidden(tg-sprint-graph) + div.burndown(tg-sprint-graph) include views/modules/burndown include views/modules/taskboard-table diff --git a/app/partials/views/modules/lightbox_add-edit-task.jade b/app/partials/views/modules/lightbox_add-edit-task.jade index 7c0d638d..cc0e0e46 100644 --- a/app/partials/views/modules/lightbox_add-edit-task.jade +++ b/app/partials/views/modules/lightbox_add-edit-task.jade @@ -21,7 +21,9 @@ form div.description-preview.hidden div.new-us-settings fieldset - label.iocaine(for="iocaine-task icon-iocaine" data-icon="r") Iocaine + label.iocaine + span.icon.icon-iocaine(for="iocaine-task icon-iocaine") + span Iocaine input(type="checkbox", ng-model="task.is_iocaine", name="iocaine-task", id="iocaine-task") fieldset label.blocked(for="blocked-task") Blocked diff --git a/app/styles/dependencies/mixins.scss b/app/styles/dependencies/mixins.scss index 97c623ee..17fdba67 100644 --- a/app/styles/dependencies/mixins.scss +++ b/app/styles/dependencies/mixins.scss @@ -40,3 +40,13 @@ display: table; } } + +@mixin slide($max, $overflow, $min: 0) { + @include transition(max-height .5s ease-in); + max-height: $min; + #{$overflow}: hidden; + &.open { + @include transition(max-height .5s ease-in); + max-height: $max; + } +} diff --git a/app/styles/layout/taskboard.scss b/app/styles/layout/taskboard.scss index e8f26f98..9dc6b0c7 100644 --- a/app/styles/layout/taskboard.scss +++ b/app/styles/layout/taskboard.scss @@ -1,5 +1,5 @@ .taskboard { - .burndown-container { - display: none; + .graphics-container { + @include slide(300px, overflow-y); } } diff --git a/app/styles/modules/lightbox.scss b/app/styles/modules/lightbox.scss index f64d9043..9901d73d 100644 --- a/app/styles/modules/lightbox.scss +++ b/app/styles/modules/lightbox.scss @@ -63,6 +63,24 @@ max-height: 9rem; min-height: 7rem; } + label { + @extend %button; + @include transition(all .2s ease-in); + border: 1px solid $gray-light; + color: $grayer; + cursor: pointer; + display: block; + padding: 7px 30px; + &:hover { + span { + color: $white; + } + } + span { + color: $grayer; + vertical-align: middle; + } + } .new-us-settings { align-content: flex-start; align-items: stretch; @@ -81,14 +99,6 @@ margin: 0; } } - label { - @extend %button; - @include transition(all .2s ease-in); - border: 1px solid $gray-light; - cursor: pointer; - display: block; - padding: 7px 30px; - } .requirement, .iocaine { &:hover { @@ -96,6 +106,7 @@ background: $fresh-taiga; border: 1px solid $fresh-taiga; color: $white; + } &.selected { @include transition(all .2s ease-in);