From 3866e6d443297b1af022f6e4b746efe94bad4b67 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Wed, 14 Jan 2015 11:06:08 +0100 Subject: [PATCH 1/5] fix sidebars --- app/styles/layout/base.scss | 12 ++++++------ app/styles/layout/issues.scss | 4 ++-- app/styles/modules/common/nav.scss | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/styles/layout/base.scss b/app/styles/layout/base.scss index 9a0cd994..0aa146bd 100644 --- a/app/styles/layout/base.scss +++ b/app/styles/layout/base.scss @@ -94,20 +94,19 @@ body { .menu-secondary { background: $whitish; - flex: 1; + flex: 0 0 auto; 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 +117,9 @@ body { .menu-tertiary { background-color: $dark-grayish-lime-green; - flex: 1; + flex: 0 0 auto; 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/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; From 99d183085fe0cf6eca0ae82045a0a8e50c6ea2d6 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Wed, 14 Jan 2015 13:25:10 +0100 Subject: [PATCH 2/5] fix vertical align lightbox in IE --- app/coffee/modules/common/lightboxes.coffee | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee index 198db241..db0ff379 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 From 7f4c12e3b816db23021c8c26a54a32c806cfae82 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Wed, 14 Jan 2015 15:21:32 +0100 Subject: [PATCH 3/5] fix kanban & backlog column width in IE11 --- app/styles/modules/backlog/taskboard-table.scss | 2 +- app/styles/modules/kanban/kanban-table.scss | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) 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/kanban/kanban-table.scss b/app/styles/modules/kanban/kanban-table.scss index ef5f1f52..b6c1259c 100644 --- a/app/styles/modules/kanban/kanban-table.scss +++ b/app/styles/modules/kanban/kanban-table.scss @@ -54,15 +54,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; } From 7caf8ff018e65f7a13b6abb621c23902606692f2 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Wed, 14 Jan 2015 15:32:36 +0100 Subject: [PATCH 4/5] fix height 100% wrapper in the admin section in IE --- app/styles/layout/base.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/styles/layout/base.scss b/app/styles/layout/base.scss index 0aa146bd..10bd471e 100644 --- a/app/styles/layout/base.scss +++ b/app/styles/layout/base.scss @@ -95,6 +95,7 @@ body { .menu-secondary { background: $whitish; flex: 0 0 auto; + min-height: 100vh; min-width: 0; padding: 2rem 1rem; width: 320px; @@ -118,6 +119,7 @@ body { .menu-tertiary { background-color: $dark-grayish-lime-green; flex: 0 0 auto; + min-height: 100vh; padding: 2em 1em; width: 255px; } From de90811a946dd518f675d8a42b8e4b7b3efca8c8 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Wed, 14 Jan 2015 15:51:10 +0100 Subject: [PATCH 5/5] fix avatar size in related tasks in IE --- app/styles/modules/common/related-tasks.scss | 3 +++ 1 file changed, 3 insertions(+) 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;