From e9395ce81a2f026c10f1e0df0a9f3d7074215f5b Mon Sep 17 00:00:00 2001 From: KostyaDanovsky Date: Fri, 22 Apr 2016 20:54:07 +0300 Subject: [PATCH] fix(mail): fix mail client styles --- src/app/pages/components/mail/mail.html | 2 +- src/sass/app/_email.scss | 69 ++++++++++++++++--------- 2 files changed, 45 insertions(+), 26 deletions(-) diff --git a/src/app/pages/components/mail/mail.html b/src/app/pages/components/mail/mail.html index 95b5661..0a1593e 100644 --- a/src/app/pages/components/mail/mail.html +++ b/src/app/pages/components/mail/mail.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/sass/app/_email.scss b/src/sass/app/_email.scss index 8e753c3..db60911 100644 --- a/src/sass/app/_email.scss +++ b/src/sass/app/_email.scss @@ -10,28 +10,21 @@ } .mail-navigation-container { - float: left; - position: relative; - height: 550px; - transition: width 0.5s; color: $default-text; width: 200px; - overflow: hidden; - padding: 0; .mail-navigation { cursor: pointer; font-weight: $font-light; font-size: 16px; text-align: left; padding: 10px 10px 10px 30px; - margin-left: 0; transition: 0.8s padding ease; .new-mails { position: absolute; left: 150px; padding: 1px 6px; border: 1px solid; - background-color: transparent; + background-color: $primary-light; margin-top: -2px; font-size: 12px; margin-right: 5px; @@ -39,29 +32,26 @@ transition: 0.8s left ease; } &.active { - background: rgba(black, 0.2); - color: white; - transition: background-color .5s ease; + background-color: $primary-light; &:hover { - background-color: rgba(black, 0.3); + background-color: $primary-light; } .new-mails { - background-color: transparent; - color: $default; + color: $primary-light; + background-color: $default; } + transition: background-color .2s ease, 0.8s padding ease; } &:hover { - background-color: rgba(black, 0.1); + background-color: $border-light; } } .compose-button { margin: 7px 0; - text-align: center; .btn { width: 140px; font-weight: $font-light; - border: $border 2px solid; - background-color: transparent; + background-color: $dribble-color; } } } @@ -134,17 +124,12 @@ } } -.message-container, .side-message-navigation { +.message-container, .side-message-navigation, .mail-navigation-container { float: left; padding: 0 15px; position: relative; height: 550px; transition: width 0.5s; - width: calc(100% - 200px); - border-bottom-right-radius: 5px; - border-top-right-radius: 5px; - border-left: 1px solid rgba(0, 0, 0, 0.12); - box-shadow: -1px 0 0 0 rgba(255, 255, 255, 0.12); } .side-message-navigation { @@ -769,7 +754,41 @@ } } -body.badmin-transparent { +.mail-client-container.transparent { + .mail-navigation-container { + overflow: hidden; + width: 200px; + padding: 0; + .mail-navigation { + margin-left: 0; + .new-mails { + background-color: transparent; + } + &.active { + background: rgba(black, 0.2); + color: white; + transition: background-color .5s ease; + .new-mails { + background-color: transparent; + color: $default; + } + &:hover { + background-color: rgba(black, 0.3); + } + } + &:hover { + background-color: rgba(black, 0.1); + } + } + } + + .message-container, .side-message-navigation{ + width: calc(100% - 200px); + border-bottom-right-radius: 5px; + border-top-right-radius: 5px; + border-left: 1px solid rgba(0, 0, 0, 0.12); + box-shadow: -1px 0px 0px 0px rgba(255, 255, 255, 0.12); + } .side-message-navigation { overflow: hidden;