From 0f0f4e5b82884bcb66e93222d740c74291fa7eb1 Mon Sep 17 00:00:00 2001 From: Marcos Moura Date: Tue, 27 Dec 2016 00:09:04 -0200 Subject: [PATCH] add better spacing between fab and snackbar --- src/components/mdSnackbar/mdSnackbar.scss | 59 ++++++++++++++++++++--- src/components/mdSnackbar/mdSnackbar.vue | 9 ++-- 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/src/components/mdSnackbar/mdSnackbar.scss b/src/components/mdSnackbar/mdSnackbar.scss index decb7dc..1c46284 100644 --- a/src/components/mdSnackbar/mdSnackbar.scss +++ b/src/components/mdSnackbar/mdSnackbar.scss @@ -2,6 +2,7 @@ @import '../../core/stylesheets/mixins.scss'; $snackbar-height: 48px; +$snackbar-padding: 14px; $snackbar-space: $snackbar-height / 2; .md-snackbar { @@ -100,13 +101,13 @@ $snackbar-space: $snackbar-height / 2; min-width: 288px; max-width: 568px; min-height: $snackbar-height; - padding: 14px 24px; + padding: $snackbar-padding 24px; overflow: hidden; border-radius: 2px; background-color: #323232; transition: $swift-ease-out; color: #fff; - font-size: 14px; + font-size: $snackbar-padding; @include layout-xsmall { width: 100%; @@ -117,36 +118,78 @@ $snackbar-space: $snackbar-height / 2; .md-has-toast-top-right { .md-fab.md-fab-top-right { - transform: translate3D(0, $snackbar-height + $snackbar-space, 0); + transform: translate3D(0, $snackbar-height + $snackbar-padding + 6px, 0); + + @include layout-xsmall { + transform: translate3D(0, $snackbar-height, 0); + } } } .md-has-toast-top-center { .md-fab.md-fab-top-center { - transform: translate3D(-50%, $snackbar-height + $snackbar-space, 0); + transform: translate3D(-50%, $snackbar-height + $snackbar-padding + 6px, 0); + + @include layout-xsmall { + transform: translate3D(-50%, $snackbar-height, 0); + } } } .md-has-toast-top-left { .md-fab.md-fab-top-left { - transform: translate3D(0, $snackbar-height + $snackbar-space, 0); + transform: translate3D(0, $snackbar-height + $snackbar-padding + 6px, 0); + + @include layout-xsmall { + transform: translate3D(0, $snackbar-height, 0); + } } } .md-has-toast-bottom-right { .md-fab.md-fab-bottom-right { - transform: translate3D(0, -$snackbar-height - $snackbar-space, 0); + transform: translate3D(0, -$snackbar-height - $snackbar-padding - 6px, 0); + + @include layout-xsmall { + transform: translate3D(0, -$snackbar-height, 0); + } } } .md-has-toast-bottom-center { .md-fab.md-fab-bottom-center { - transform: translate3D(-50%, -$snackbar-height - $snackbar-space, 0); + transform: translate3D(-50%, -$snackbar-height - $snackbar-padding - 6px, 0); + + @include layout-xsmall { + transform: translate3D(-50%, -$snackbar-height, 0); + } } } .md-has-toast-bottom-left { .md-fab.md-fab-bottom-left { - transform: translate3D(0, -$snackbar-height - $snackbar-space, 0); + transform: translate3D(0, -$snackbar-height - $snackbar-padding - 6px, 0); + + @include layout-xsmall { + transform: translate3D(0, -$snackbar-height, 0); + } + } +} + +.md-has-toast { + .md-fab.md-fab-top-right, + .md-fab.md-fab-top-center, + .md-fab.md-fab-top-left { + @include layout-xsmall { + transform: translate3D(0, $snackbar-height - 4px, 0); + } + } + + .md-fab.md-fab-bottom-right, + .md-fab.md-fab-bottom-center, + .md-fab.md-fab-bottom-left { + @include layout-xsmall { + transform: translate3D(0, -$snackbar-height + 4px, 0); + } } } diff --git a/src/components/mdSnackbar/mdSnackbar.vue b/src/components/mdSnackbar/mdSnackbar.vue index 4381067..a0fb287 100644 --- a/src/components/mdSnackbar/mdSnackbar.vue +++ b/src/components/mdSnackbar/mdSnackbar.vue @@ -54,12 +54,15 @@ }, watch: { active(active) { - const cssClass = 'md-has-toast-' + this.directionClass; + const directionClass = 'md-has-toast-' + this.directionClass; + const toastClass = 'md-has-toast'; if (active) { - document.body.classList.add(cssClass); + document.body.classList.add(directionClass); + document.body.classList.add(toastClass); } else { - document.body.classList.remove(cssClass); + document.body.classList.remove(directionClass); + document.body.classList.remove(toastClass); } } },