From 9c0b65ba6f0d8ce811491fcc06b29c0b35de75dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Mon, 25 Aug 2014 11:46:13 +0200 Subject: [PATCH] Reduced Ommpa Loompa banner and show time ISsue #669 --- app/coffee/modules/base/confirm.coffee | 2 +- .../components/notification-message.scss | 8 ++++--- app/styles/layout/base.scss | 21 ++++++++++--------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/app/coffee/modules/base/confirm.coffee b/app/coffee/modules/base/confirm.coffee index 4f828ca8..d172c84d 100644 --- a/app/coffee/modules/base/confirm.coffee +++ b/app/coffee/modules/base/confirm.coffee @@ -173,7 +173,7 @@ class ConfirmService extends taiga.Service if @.tsem cancelTimeout(@.tsem) - @.tsem = timeout 3500, => + @.tsem = timeout 1500, => body.find(selector) .removeClass('active') .addClass('inactive') diff --git a/app/styles/components/notification-message.scss b/app/styles/components/notification-message.scss index d112a03a..aad728ec 100644 --- a/app/styles/components/notification-message.scss +++ b/app/styles/components/notification-message.scss @@ -3,7 +3,6 @@ background: rgba($gray-light, .95); color: $white; padding: 1rem; - padding-bottom: .5em; position: absolute; top: 0; width: 100%; @@ -19,6 +18,9 @@ display: inline-block; margin-left: .5rem; width: 80%; + p { + margin: 0; + } } .warning { @extend %xlarge; @@ -35,7 +37,7 @@ } .notification-message-success { - background: rgba($fresh-taiga, .95); + background: rgba($fresh-taiga, .9); .icon-notification-success { @extend %xxlarge; display: inline; @@ -44,7 +46,7 @@ } .notification-message-error { - background: rgba($red, .95); + background: rgba($red, .9); .icon-notification-error { @extend %xxlarge; display: inline; diff --git a/app/styles/layout/base.scss b/app/styles/layout/base.scss index a1c4b3eb..935eae32 100644 --- a/app/styles/layout/base.scss +++ b/app/styles/layout/base.scss @@ -15,12 +15,6 @@ body { -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; width: 100%; - &.closed-projects-nav { - .projects-nav { - @include transform(translate3d(-300px, 0, 0)); - @include transition (transform 1s ease); - } - } .master { @include transition (transform 1s ease); &.ng-animate { @@ -53,9 +47,6 @@ body { opacity: .9; } } - &.loader-active { - overflow: hidden; - } &.loading-project { overflow: hidden; .projects-nav-overlay { @@ -70,6 +61,17 @@ body { } } +.closed-projects-nav { + .projects-nav { + @include transform(translate3d(-300px, 0, 0)); + @include transition (transform 1s ease); + } +} + +.loader-active { + overflow: hidden; +} + .master { height: 100%; min-height: 100%; @@ -118,7 +120,6 @@ body { margin-bottom: 1rem; .action-buttons { flex-shrink: 0; - margin-right: 2rem; padding-left: 1rem; } h1 {