diff --git a/src/app/pages/components/mail/list/mailList.html b/src/app/pages/components/mail/list/mailList.html index 72fcec1ff..a5d57676b 100644 --- a/src/app/pages/components/mail/list/mailList.html +++ b/src/app/pages/components/mail/list/mailList.html @@ -26,7 +26,7 @@ - - +
+
{{m.name}}
diff --git a/src/app/pages/components/mail/mail.html b/src/app/pages/components/mail/mail.html index 4e7152742..7c53d0e10 100644 --- a/src/app/pages/components/mail/mail.html +++ b/src/app/pages/components/mail/mail.html @@ -15,9 +15,7 @@
-
- Labels -
+
diff --git a/src/sass/app/_email.scss b/src/sass/app/_email.scss index 9d62aa96a..c925f8b6e 100644 --- a/src/sass/app/_email.scss +++ b/src/sass/app/_email.scss @@ -13,23 +13,26 @@ } .mail-navigation-container { - width: 300px; + width: 200px; .mail-navigation { cursor: pointer; font-weight: $font-light; font-size: 16px; - padding: 10px; - margin-left: 22px; + text-align: left; + padding: 10px 10px 10px 30px; + transition: 0.8s padding ease; .new-mails { - display: inline-block; - float: right; + position: absolute; + left: 150px; + padding: 1px 6px; + border: 1px solid; color: white; background-color: $primary-light; - padding: 1px 6px; margin-top: -2px; font-size: 12px; margin-right: 5px; border-radius: 10px; + transition: 0.8s left ease; } &.active { background-color: $primary-light; @@ -41,7 +44,7 @@ color: $primary-light; background-color: white; } - transition: background-color .2s ease; + transition: background-color .2s ease, 0.8s padding ease; } &:hover { background-color: $border-light; @@ -63,6 +66,15 @@ margin-left: 22px; } +.labels-container { + text-align: center; + padding-right: 28px; + padding-left: 20px; + .label-item { + display: inline-block; + } +} + .labels-title { padding-left: 10px; border-bottom: 1px solid $border-light; @@ -80,6 +92,7 @@ font-size: 16px; font-weight: $font-light; .label-input-stub { + font-size: 14px; margin-left: 5px; } i { @@ -125,7 +138,7 @@ .side-message-navigation { padding: 10px 0 0 0; - width: calc(100% - 300px); + width: calc(100% - 200px); box-shadow: -4px 0 7px -2px $input-border; .side-message-navigation-item { border-bottom: 1px solid $input-border; @@ -183,7 +196,7 @@ width: 45px; height: 45px; border-radius: 23px; - margin: 7px 0 7px 7px; + margin: 7px 0px 7px 7px; transition: all .2s ease-in-out; } .name { @@ -265,6 +278,14 @@ width: 100%; } } +@media screen and (min-width: 1199px) { + .photo-td { + width: 55px; + } + .check-td{ + width: 35px; + } +} .important { color: $warning; @@ -454,21 +475,6 @@ } } -@media screen and (max-width: 1300px) { - - .mail-navigation-container { - width: 260px - } - - .side-message-navigation { - width: calc(100% - 260px); - } - - .message-container { - width: calc(100% - 260px); - } - -} @media screen and (max-width: 1199px) { .name-h { @@ -483,17 +489,6 @@ } @media screen and (max-width: 990px) { - .mail-navigation-container { - width: 200px - } - - .side-message-navigation { - width: calc(100% - 200px); - } - - .message-container { - width: calc(100% - 200px); - } .person-info .human-picture { width: 150px; @@ -533,7 +528,13 @@ @media screen and (max-width: 760px) { .mail-navigation-container { - width: 175px + width: 175px; + .mail-navigation{ + padding-left: 19px; + .new-mails { + left: 137px; + } + } } .side-message-navigation { @@ -565,8 +566,9 @@ } .mail-navigation { font-size: 14px; + padding-left: 23px; .new-mails { - left: 82%; + left: 116px; padding: 0px 5px; margin-top: 0px; font-size: 12px; @@ -755,16 +757,11 @@ body.badmin-transparent { .mail-navigation-container { overflow: hidden; - width: 250px; + width: 200px; padding: 0; .mail-navigation { margin-left: 0; - text-align: center; .new-mails { - position: absolute; - left: 85%; - padding: 1px 6px; - border: 1px solid; background-color: transparent; } &.active { @@ -786,7 +783,7 @@ body.badmin-transparent { } .message-container, .side-message-navigation{ - width: calc(100% - 250px); + width: calc(100% - 200px); border-bottom-right-radius: 5px; border-top-right-radius: 5px; border-left: 1px solid rgba(0, 0, 0, 0.12); @@ -798,14 +795,6 @@ body.badmin-transparent { padding: 0; } - .labels-container { - text-align: center; - padding-right: 8px; - .label-item { - display: inline-block; - } - } - .labels, .add-label-container { margin-left: 0; } @@ -937,17 +926,6 @@ body.badmin-transparent { } } - .mail-navigation-container { - width: 200px - } - - .side-message-navigation { - width: calc(100% - 200px); - } - - .message-container { - width: calc(100% - 200px); - } .back-button { margin-left: 10px; } @@ -990,9 +968,8 @@ body.badmin-transparent { .mail-navigation { font-size: 14px; .new-mails { - left: 82%; - padding: 0px 5px; - margin-top: 0px; + padding: 0 5px; + margin-top: 0; font-size: 12px; } .labels { diff --git a/src/sass/theme/dashboard/_blurFeed.scss b/src/sass/theme/dashboard/_blurFeed.scss index f57c09157..0774e0592 100644 --- a/src/sass/theme/dashboard/_blurFeed.scss +++ b/src/sass/theme/dashboard/_blurFeed.scss @@ -146,6 +146,7 @@ font-size: 11px; padding-top: 10px; color: $help-text; + margin-bottom: 5px; .post-time { float: left; } diff --git a/src/sass/theme/dashboard/_todo.scss b/src/sass/theme/dashboard/_todo.scss index 64579e5c5..95d8233b3 100644 --- a/src/sass/theme/dashboard/_todo.scss +++ b/src/sass/theme/dashboard/_todo.scss @@ -1,5 +1,5 @@ input.task-todo { - margin-bottom: 14px; + margin-bottom: 8px; } ul.todo-list { @@ -126,7 +126,7 @@ body.badmin-transparent { input.task-todo { color: white; width: calc(100% - 25px); - opacity: 0.9; + border-radius: 0; border: none; background: transparent; &:focus {