Skip to content

Commit 9adda1d

Browse files
authored
Merge pull request #1 from drewngyen/feature-code-snippets
fixed footer for mb pros 15in
2 parents f7473bd + 3d77685 commit 9adda1d

File tree

5 files changed

+162
-26
lines changed

5 files changed

+162
-26
lines changed

package-lock.json

Lines changed: 140 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
"fs-extra": "^8.1.0",
1616
"localforage": "^1.7.3",
1717
"mousetrap": "^1.6.3",
18+
"prismjs": "^1.16.0",
1819
"quasar": "^1.0.0",
1920
"vue-drag-resize": "^1.3.2",
2021
"vue-draggable-resizable": "^2.0.0-rc2",
2122
"vue-loader": "^15.7.0",
2223
"vue-multiselect": "^2.1.6",
24+
"vue-prism-editor": "^0.2.1",
2325
"vued3tree": "^3.7.1",
2426
"vuex": "^3.1.1"
2527
},

quasar.conf.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ module.exports = function (ctx) {
5656
'QTabPanel',
5757
'QFab',
5858
'QFabAction',
59-
'QUploader',
60-
'QEditor'
59+
'QUploader'
6160
],
6261

6362
directives: [

src/components/CodeSnippet.vue

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
11
<template>
2-
<div class="snip">
3-
<q-editor
4-
v-model="editor"
5-
:definitions="{
6-
bold: {label: 'Bold', icon: null, tip: 'My bold tooltip'}
7-
}"
2+
<div>
3+
codsnypets
4+
<PrismEditor
5+
language="js"
6+
lineNumbers="true"
87
/>
98
</div>
109
</template>
1110

1211
<script>
12+
import PrismEditor from 'vue-prism-editor'
13+
import 'prismjs'
14+
import 'prismjs/themes/prism.css'
15+
1316
export default {
14-
data () {
15-
return {
16-
editor: 'Here we are overriding the <b>bold</b> command to include a label instead of an icon and also changing its tooltip.'
17-
}
17+
components: {
18+
PrismEditor
1819
}
1920
}
2021
</script>
21-
22-
<style>
23-
.snip{
24-
height: 150px;
25-
}
26-
</style>

src/components/Footer.vue

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@
2323

2424
<q-tab-panels v-model="tab" animated class="bg-primary text-white">
2525
<q-tab-panel name="code">
26+
<CodeSnippet />
2627
</q-tab-panel>
2728

2829
<q-tab-panel name="detail">
30+
<div class="text-h6">Component Deets</div>Component Info Here
2931
</q-tab-panel>
3032

3133
<q-tab-panel name="tree">
@@ -42,12 +44,12 @@
4244

4345
<script>
4446
import Tree from './Tree'
45-
// import CodeSnippet from './CodeSnippet'
47+
import CodeSnippet from './CodeSnippet'
4648
4749
export default {
4850
components: {
49-
Tree
50-
// CodeSnippet
51+
Tree,
52+
CodeSnippet
5153
},
5254
data () {
5355
return {
@@ -60,7 +62,9 @@ export default {
6062
},
6163
methods: {
6264
openBottomDrawer () {
63-
let minHeight = (window.outerHeight < 900) ? 4.5 : 2.5
65+
// 15in mb pro - 1027 px 3.75
66+
// big ass screens 2.5
67+
let minHeight = (window.outerHeight < 900) ? 4.5 : (window.outerHeight < 1035) ? 3.75 : 2.5
6468
this.height === 35 ? (this.height = minHeight) : (this.height = 35)
6569
this.open === true ? this.open = false : this.open = true
6670
}

0 commit comments

Comments
 (0)