Skip to content

Commit ca81aa0

Browse files
committed
fix: Various fixes
1 parent 72cd35d commit ca81aa0

File tree

4 files changed

+33
-15
lines changed

4 files changed

+33
-15
lines changed

dev/components/css/shadows.vue

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
<template>
2-
<div>
3-
<div class="layout-padding">
4-
<div style="margin: 10px; text-align: center">
5-
<div class="flex inline shadow-box items-center justify-center inset-shadow">.inset-shadow</div>
6-
<div class="flex inline shadow-box items-center justify-center" v-for="n in 5" :class="['shadow-' + n]">.shadow-{{n}}</div>
7-
<div class="flex inline shadow-box items-center justify-center" v-for="n in 5" :class="['shadow-up-' + n]">.shadow-up-{{n}}</div>
8-
</div>
2+
<div class="layout-padding">
3+
<div style="margin: 10px; text-align: center">
4+
<h1 class="text-left">Standard shadows</h1>
5+
<div class="flex inline shadow-box items-center justify-center" v-for="n in 24" :class="['shadow-' + n]">.shadow-{{n}}</div>
6+
<h1 class="text-left">Shadows pointing up</h1>
7+
<div class="flex inline shadow-box items-center justify-center" v-for="n in 24" :class="['shadow-up-' + n]">.shadow-up-{{n}}</div>
8+
<h1 class="text-left">Inset Shadow</h1>
9+
<div class="flex inline shadow-box items-center justify-center inset-shadow doc-inset-shadow" border="1px solid grey">.inset-shadow</div>
910
</div>
1011
</div>
1112
</template>
1213

13-
<style lang="styl" scoped>
14+
<style lang="styl">
1415
.shadow-box
1516
width 100px
1617
height 100px
1718
margin 15px
18-
border-radius 50%
19+
border-radius 5px
1920
</style>

dev/components/test-layout/toolbar.vue

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,15 @@
4343
<q-btn flat><q-icon name="sim_card" /></q-btn>
4444
<q-btn flat><q-icon name="gamepad" /></q-btn>
4545
</q-toolbar>
46+
<q-toolbar color="yellow" class="text-dark">
47+
<q-btn flat><q-icon name="assignment_ind" /></q-btn>
48+
<q-toolbar-title>
49+
Toolbar
50+
<span slot="subtitle">Subtitle</span>
51+
</q-toolbar-title>
52+
<q-btn flat><q-icon name="sim_card" /></q-btn>
53+
<q-btn flat><q-icon name="gamepad" /></q-btn>
54+
</q-toolbar>
4655
<q-toolbar color="orange">
4756
<q-btn flat><q-icon name="mail" /></q-btn>
4857
<q-toolbar-title>
@@ -74,6 +83,15 @@
7483
<q-btn flat><q-icon name="sim_card" /></q-btn>
7584
<q-btn flat><q-icon name="gamepad" /></q-btn>
7685
</q-toolbar>
86+
<q-toolbar inverted color="grey">
87+
<q-btn flat><q-icon name="assignment_ind" /></q-btn>
88+
<q-toolbar-title>
89+
Toolbar
90+
<span slot="subtitle">Subtitle</span>
91+
</q-toolbar-title>
92+
<q-btn flat><q-icon name="sim_card" /></q-btn>
93+
<q-btn flat><q-icon name="gamepad" /></q-btn>
94+
</q-toolbar>
7795
<q-toolbar inverted color="orange">
7896
<q-btn flat><q-icon name="mail" /></q-btn>
7997
<q-toolbar-title>
@@ -94,8 +112,3 @@
94112
</q-toolbar>
95113
</div>
96114
</template>
97-
98-
<script>
99-
export default {
100-
}
101-
</script>

src/components/tab/QTab.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@
2424
import TabMixin from './tab-mixin'
2525
import Ripple from '../../directives/ripple'
2626
import { QIcon } from '../icon'
27+
import { QChip } from '../chip'
2728
2829
export default {
2930
name: 'q-tab',
3031
components: {
31-
QIcon
32+
QIcon,
33+
QChip
3234
},
3335
directives: {
3436
Ripple

src/css/core/elevation.styl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
for $z in 1..24
55
.shadow-{$z}
66
box-shadow $shadow-+$z
7+
.shadow-up-{$z}
8+
box-shadow $shadow-up-+$z
79

810
.no-shadow, .shadow-0
911
box-shadow none !important

0 commit comments

Comments
 (0)