diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee index c163b402..09f4dc5e 100644 --- a/app/coffee/modules/common/lightboxes.coffee +++ b/app/coffee/modules/common/lightboxes.coffee @@ -29,11 +29,21 @@ debounce = @.taiga.debounce ## Common Lightbox Services ############################################################################# +# the lightboxContent hide/show doesn't have sense because is an IE hack class LightboxService extends taiga.Service + constructor: (@animationFrame) -> + open: ($el) -> + lightboxContent = $el.children().not(".close") + lightboxContent.hide() + $el.css('display', 'flex') + $el.find('input,textarea').first().focus() - timeout(70, -> $el.addClass("open")) + + @animationFrame.add => + $el.addClass("open") + lightboxContent.show() docEl = angular.element(document) docEl.on "keydown.lightbox", (e) => @@ -56,7 +66,7 @@ class LightboxService extends taiga.Service @.close($(lightboxEl)) -module.service("lightboxService", LightboxService) +module.service("lightboxService", ["animationFrame", LightboxService]) class LightboxKeyboardNavigationService extends taiga.Service diff --git a/app/styles/layout/base.scss b/app/styles/layout/base.scss index 9a0cd994..10bd471e 100644 --- a/app/styles/layout/base.scss +++ b/app/styles/layout/base.scss @@ -94,20 +94,20 @@ body { .menu-secondary { background: $whitish; - flex: 1; + flex: 0 0 auto; + min-height: 100vh; min-width: 0; padding: 2rem 1rem; - width: 260px; + width: 320px; &.filters-bar { - flex: 0; + flex: 0 0 auto; padding: 0; transition: all .2s linear; width: 0; &.active { - flex: 1; padding: 2em 1em; transition: all .2s linear; - width: 210px; + width: 260px; .filters-inner { opacity: 1; transition: all .4s ease-in; @@ -118,8 +118,10 @@ body { .menu-tertiary { background-color: $dark-grayish-lime-green; - flex: 1; + flex: 0 0 auto; + min-height: 100vh; padding: 2em 1em; + width: 255px; } .extrabar { diff --git a/app/styles/layout/issues.scss b/app/styles/layout/issues.scss index 0d7d3317..d577a4a5 100644 --- a/app/styles/layout/issues.scss +++ b/app/styles/layout/issues.scss @@ -1,7 +1,7 @@ .issues { .filters-bar { - flex: 1; - width: 210px; + flex: 0 0 auto; + width: 260px; } .filters-inner { opacity: 1; diff --git a/app/styles/modules/backlog/taskboard-table.scss b/app/styles/modules/backlog/taskboard-table.scss index 144591cb..5bcca330 100644 --- a/app/styles/modules/backlog/taskboard-table.scss +++ b/app/styles/modules/backlog/taskboard-table.scss @@ -58,10 +58,10 @@ $column-margin: 0 10px 0 0; } .task-colum-name { @extend %large; - @include table-flex-child($column-flex, $column-width, $column-shrink, $column-width); @include table-flex(); background: $whitish; border-top: 3px solid $gray-light; + flex: auto 0 auto; justify-content: space-between; margin: $column-margin; max-width: $column-width; diff --git a/app/styles/modules/common/nav.scss b/app/styles/modules/common/nav.scss index c5770e63..dd1a1415 100644 --- a/app/styles/modules/common/nav.scss +++ b/app/styles/modules/common/nav.scss @@ -12,12 +12,12 @@ } .logo-container { cursor: pointer; - margin: 20% 20% .7rem; + padding: 15px 15px 10px; object, img, svg { - height: 100%; - width: 100%; + height: 50px; + width: 50px; } span { @extend %large; diff --git a/app/styles/modules/common/related-tasks.scss b/app/styles/modules/common/related-tasks.scss index 0263f448..89a5d168 100644 --- a/app/styles/modules/common/related-tasks.scss +++ b/app/styles/modules/common/related-tasks.scss @@ -202,6 +202,9 @@ display: flex; img { flex-basis: 35px; + /* width & height they are only required for IE */ + height: 35px; + width: 35px; } figcaption { margin-left: .5rem; diff --git a/app/styles/modules/kanban/kanban-table.scss b/app/styles/modules/kanban/kanban-table.scss index 5576acf6..8adee297 100644 --- a/app/styles/modules/kanban/kanban-table.scss +++ b/app/styles/modules/kanban/kanban-table.scss @@ -56,15 +56,17 @@ $column-margin: 0 10px 0 0; } .task-colum-name { @extend %large; - @include table-flex-child($column-flex, $column-width, $column-shrink, $column-width); @include table-flex(); background: $whitish; border-top: 3px solid $gray-light; + flex: auto 0 auto; justify-content: space-between; margin: $column-margin; + max-width: $column-width; padding: .5rem .5rem .5rem 1rem; position: relative; text-transform: uppercase; + width: $column-width; &:last-child { margin-right: 0; }