Skip to content

Commit

Permalink
Enhancement for #415 (#418)
Browse files Browse the repository at this point in the history
* init

* adjust title padding and button min-width

* removed border in favor of using v-divider, added default white background

* additional tweaks
  • Loading branch information
johnleider authored Apr 24, 2017
1 parent 5a45a33 commit e0be2be
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 24 deletions.
4 changes: 2 additions & 2 deletions src/components/dialogs/Dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default {
},
width: {
type: [String, Number],
default: 320
default: 290
},
scrollable: Boolean,
transition: {
Expand Down Expand Up @@ -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', {
Expand Down
8 changes: 0 additions & 8 deletions src/components/overlay/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down
1 change: 0 additions & 1 deletion src/stylus/components/_cards.styl
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
height: 100%

&--actions
border-top: 1px solid $material-twelve-percent-dark
padding: 8px
height: 52px
flex: 0 0 auto
Expand Down
22 changes: 9 additions & 13 deletions src/stylus/components/_dialogs.styl
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
.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
vertical-align: middle

>
.card
elevation(24)

& ^[2..-1]__title
padding 12px 24px

Expand All @@ -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%
Expand All @@ -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
Expand All @@ -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

0 comments on commit e0be2be

Please sign in to comment.