Skip to content

Commit

Permalink
feat(quasar): Refactor QSelect to use QMenu
Browse files Browse the repository at this point in the history
  • Loading branch information
pdanpdan committed Mar 29, 2019
1 parent 81b1d70 commit 9d0fbc9
Show file tree
Hide file tree
Showing 7 changed files with 115 additions and 182 deletions.
10 changes: 5 additions & 5 deletions quasar/src/components/field/QField.js
Expand Up @@ -220,10 +220,6 @@ export default Vue.extend({
this.__getInnerAppendNode(h, 'inner-append', this.__getInnerAppend(h))
)

this.__getLocalMenu !== void 0 && node.push(
this.__getLocalMenu(h)
)

return node
},

Expand Down Expand Up @@ -268,7 +264,11 @@ export default Vue.extend({
return node.concat(
this.__getDefaultSlot !== void 0
? this.__getDefaultSlot(h)
: slot(this, 'default')
: slot(this, 'default'),

this.__getLocalMenu !== void 0
? this.__getLocalMenu(h)
: void 0
)
},

Expand Down
19 changes: 1 addition & 18 deletions quasar/src/components/menu/menu.styl
@@ -1,29 +1,12 @@
.q-menu, .q-local-menu
.q-menu
box-shadow $menu-box-shadow
background $menu-background
border-radius $generic-border-radius
overflow-y auto
overflow-x hidden
outline 0
max-height 65vh

.q-menu
z-index $z-menu
position fixed !important
display inline-block
max-width $menu-max-width

.q-local-menu
z-index $z-local-menu
cursor default
position absolute
color initial
left 0
min-width 100%
max-width 100vw

&--dark
color white
background $grey-9
&--square
border-radius 0

0 comments on commit 9d0fbc9

Please sign in to comment.