Skip to content

Commit

Permalink
fix: #217 [ios] Insufficient margin in the Drawer header.
Browse files Browse the repository at this point in the history
  • Loading branch information
rstoenescu committed Dec 17, 2016
1 parent 8b10a1d commit d947e39
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 35 deletions.
14 changes: 3 additions & 11 deletions src/vue-components/layout/Layout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,20 @@
<div class="layout">
<div class="layout-header">
<slot name="header"></slot>
<slot v-if="!ios" name="navigation"></slot>
<slot v-if="$quasar.theme !== 'ios'" name="navigation"></slot>
</div>

<div class="layout-content">
<slot></slot>
</div>

<div class="layout-footer">
<slot v-if="ios" name="navigation"></slot>
<slot name="footer"></slot>
<slot v-if="$quasar.theme === 'ios'" name="navigation"></slot>
</div>
</div>
</template>

<script>
import { current as theme } from '../../features/theme'
export default {
data () {
return {
ios: theme === 'ios'
}
}
}
export default {}
</script>
28 changes: 11 additions & 17 deletions src/vue-components/layout/layout.ios.styl
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
$layout-navbar-order ?= 9
$layout-border ?= 1px solid $toolbar-faded-color
$layout-toolbar-min-height ?= 50px
$toolbar-title-font-size ?= 1.2rem
Expand All @@ -14,21 +13,13 @@ $toolbar-title-font-size ?= 1.2rem
display flex
flex-direction column

> .q-tabs
z-index $z-marginals
order $layout-navbar-order
border-top $layout-border
border-radius 0 !important

.layout-header
order -10
.toolbar
border-bottom $layout-border
.layout-header > .toolbar
border-bottom $layout-border
&:first-child
align-items end

.layout-footer
order 10
.toolbar
border-top $layout-border
.layout-footer > .toolbar
border-top $layout-border

body.desktop
.layout-header, .layout-footer
Expand All @@ -50,8 +41,6 @@ body.desktop
.layout-header, .layout-footer
color $toolbar-color
background $toolbar-background

.layout-header, .layout-footer
z-index $z-marginals

.toolbar
Expand Down Expand Up @@ -145,6 +134,11 @@ body.desktop
> div
text-align right

body.cordova .layout-header > .toolbar:first-child
padding-top 20px
.toolbar-title
padding-top 20px

.layout-padding
@media only screen and (max-width $layout-small-max)
padding 1.5rem .5rem
Expand Down
7 changes: 0 additions & 7 deletions src/vue-components/layout/layout.mat.styl
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
$layout-navbar-order ?= -9
$layout-toolbar-min-height ?= 56px
$layout-header-shadow ?= $shadow-2
$layout-footer-shadow ?= $shadow-up-2
Expand All @@ -16,16 +15,12 @@ $toolbar-title-font-size ?= 1.25rem
flex-direction column

> .q-tabs
z-index $z-marginals
order $layout-navbar-order
border-radius 0 !important

.layout-header
order -10
box-shadow $layout-header-shadow

.layout-footer
order 10
box-shadow $layout-footer-shadow

body.desktop
Expand All @@ -48,8 +43,6 @@ body.desktop
.layout-header, .layout-footer
color $toolbar-color
background $toolbar-background

.layout-header, .layout-footer
z-index $z-marginals

.toolbar
Expand Down

0 comments on commit d947e39

Please sign in to comment.