From e0be2beeff401c05d9e19eec3134a21694913abb Mon Sep 17 00:00:00 2001 From: John Leider Date: Mon, 24 Apr 2017 08:55:24 -0400 Subject: [PATCH] Enhancement for #415 (#418) * init * adjust title padding and button min-width * removed border in favor of using v-divider, added default white background * additional tweaks --- src/components/dialogs/Dialog.js | 4 ++-- src/components/overlay/index.js | 8 -------- src/stylus/components/_cards.styl | 1 - src/stylus/components/_dialogs.styl | 22 +++++++++------------- 4 files changed, 11 insertions(+), 24 deletions(-) diff --git a/src/components/dialogs/Dialog.js b/src/components/dialogs/Dialog.js index f6c3b2494fe..7fbba0dba84 100755 --- a/src/components/dialogs/Dialog.js +++ b/src/components/dialogs/Dialog.js @@ -20,7 +20,7 @@ export default { }, width: { type: [String, Number], - default: 320 + default: 290 }, scrollable: Boolean, transition: { @@ -85,7 +85,7 @@ export default { let dialog = h(this.computedTransition, { props: { origin: this.origin } - }, [h('div', data, [h('v-card', [this.$slots.default])])]) + }, [h('div', data, [this.$slots.default])]) if (this.overlay) { dialog = h('v-overlay', { diff --git a/src/components/overlay/index.js b/src/components/overlay/index.js index 257dcb10104..2dff5f622a6 100755 --- a/src/components/overlay/index.js +++ b/src/components/overlay/index.js @@ -9,14 +9,6 @@ const Overlay = { data.staticClass = data.staticClass ? `overlay ${data.staticClass}` : 'overlay' if (props.value) data.staticClass += ' overlay--active' - if (typeof document !== 'undefined') { - if (props.value) { - document.documentElement.style.overflow = 'hidden' - } else { - document.documentElement.style.overflow = null - } - } - return h('div', data, children) } } diff --git a/src/stylus/components/_cards.styl b/src/stylus/components/_cards.styl index 833ebdfc515..8455f8eb655 100755 --- a/src/stylus/components/_cards.styl +++ b/src/stylus/components/_cards.styl @@ -49,7 +49,6 @@ height: 100% &--actions - border-top: 1px solid $material-twelve-percent-dark padding: 8px height: 52px flex: 0 0 auto diff --git a/src/stylus/components/_dialogs.styl b/src/stylus/components/_dialogs.styl index f4230b1f5af..de377377d8d 100755 --- a/src/stylus/components/_dialogs.styl +++ b/src/stylus/components/_dialogs.styl @@ -1,10 +1,15 @@ .dialog + elevation(24) + background: #fff + border-radius: $card-border-radius margin: 24px 40px + overflow-y: auto transition: .3s ease-in-out z-index 1001 &:not(.dialog--fullscreen) max-width: 90% + max-height: 90% &__container display: inline-block @@ -12,8 +17,6 @@ > .card - elevation(24) - & ^[2..-1]__title padding 12px 24px @@ -24,13 +27,9 @@ padding: 8px 0 .btn + min-width: 64px margin-right: 8px - &:not(.dialog--scrollable) - > .card - .card__row--actions - border initial - &--fullscreen margin 0 width 100% @@ -39,10 +38,13 @@ overflow-y: auto top: 0 left 0 + padding-top: 56px .toolbar height 56px // TODO: height with two lines of text: 80dp padding 0 !important + position: fixed + top: 0 &__title font-size 20px // TODO: convert from 20sp @@ -67,9 +69,3 @@ &--scrollable .card__row:not(.card__row--actions) overflow-y: auto - - .card__title - border-bottom: 1px solid $material-twelve-percent-dark - - .card__row--actions - border-top: 1px solid $material-twelve-percent-dark