Skip to content

Commit f31ecb7

Browse files
webdevnerdstuffwebdevnerdstuff
authored
Merge pull request #34 from webdevnerdstuff/dev
Fix styles and examples
2 parents a4757f4 + 8cd4531 commit f31ecb7

File tree

10 files changed

+76
-101
lines changed

10 files changed

+76
-101
lines changed

‎src/App.vue‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,34 @@ html {
8181
scroll-padding-top: 70px;
8282
}
8383
84+
body {
85+
font-family: 'Open Sans', sans-serif;
86+
87+
}
88+
89+
.v-row {
90+
h1,
91+
h2,
92+
h5 {
93+
font-family: 'Encode Sans Expanded', sans-serif !important;
94+
}
95+
96+
h1 {
97+
font-size: 3rem;
98+
font-weight: 700;
99+
}
100+
101+
h2 {
102+
font-size: 2rem;
103+
font-weight: 400;
104+
padding-bottom: 0.5rem;
105+
}
106+
107+
h5 {
108+
font-weight: 600;
109+
}
110+
}
111+
84112
.top-app-bar {
85113
z-index: 99 !important;
86114

‎src/documentation/DocsPage.vue‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -153,32 +153,6 @@ provide('classes', classes);
153153
</script>
154154

155155
<style lang="scss" scoped>
156-
body {
157-
font-family: 'Open Sans', sans-serif;
158-
}
159-
160-
h1,
161-
h2,
162-
h5 {
163-
font-family: 'Encode Sans Expanded', sans-serif !important;
164-
}
165-
166-
h1 {
167-
font-size: 3rem;
168-
font-weight: 700;
169-
}
170-
171-
h2 {
172-
border-bottom: 1px solid #ccc;
173-
font-size: 2rem;
174-
font-weight: 400;
175-
padding-bottom: 0.5rem;
176-
}
177-
178-
h5 {
179-
font-weight: 600;
180-
}
181-
182156
:deep(pre),
183157
:deep(code) {
184158
&.ic {

‎src/documentation/components/examples/AdditionalLangExamples.vue‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
:label="`Example of using ${selectedLibrary.title} to highlight TypeScript`"
3737
lang="html"
3838
:prismjs="selectedLibrary.id === 'prismjs'"
39-
:tabs="false"
4039
:theme="selectedTheme"
4140
/>
4241
</v-col>
@@ -51,7 +50,6 @@
5150
label="TypeScript"
5251
lang="typescript"
5352
:prismjs="selectedLibrary.id === 'prismjs'"
54-
:tabs="false"
5553
:theme="selectedTheme"
5654
/>
5755
</v-col>
@@ -69,7 +67,6 @@
6967
:label="`Example of using ${selectedLibrary.label} to highlight JSON`"
7068
lang="html"
7169
:prismjs="selectedLibrary.id === 'prismjs'"
72-
:tabs="false"
7370
:theme="selectedTheme"
7471
/>
7572
</v-col>
@@ -84,7 +81,6 @@
8481
label="JSON"
8582
lang="json"
8683
:prismjs="selectedLibrary.id === 'prismjs'"
87-
:tabs="false"
8884
:theme="selectedTheme"
8985
/>
9086
</v-col>
@@ -102,7 +98,6 @@
10298
:label="`Example of using ${selectedLibrary.label} to highlight PHP`"
10399
lang="html"
104100
:prismjs="selectedLibrary.id === 'prismjs'"
105-
:tabs="false"
106101
:theme="selectedTheme"
107102
/>
108103
</v-col>
@@ -119,7 +114,6 @@
119114
label="PHP"
120115
lang="php"
121116
:prismjs="selectedLibrary.id === 'prismjs'"
122-
:tabs="false"
123117
:theme="selectedTheme"
124118
/>
125119
</v-col>
@@ -144,12 +138,11 @@ const selectedTheme = inject('selectedTheme');
144138
const usageExamples = {
145139
prismjs: {
146140
json: `<template>
147-
<CodeBlock
141+
<VCodeBlock
148142
:code="myCode"
149143
:indent="2"
150144
lang="json"
151145
prismjs
152-
:tabs="false"
153146
/\>
154147
<\/template>
155148
@@ -158,11 +151,10 @@ const usageExamples = {
158151
import 'prismjs/components/prism-json';
159152
<\/script>`,
160153
typescript: `<template>
161-
<CodeBlock
154+
<VCodeBlock
162155
:code="myCode"
163156
lang="typescript"
164157
prismjs
165-
:tabs="false"
166158
/\>
167159
<\/template>
168160
@@ -171,11 +163,10 @@ const usageExamples = {
171163
import 'prismjs/components/prism-typescript';
172164
<\/script>`,
173165
php: `<template>
174-
<CodeBlock
166+
<VCodeBlock
175167
:code="myCode"
176168
lang="php"
177169
prismjs
178-
:tabs="false"
179170
/\>
180171
<\/template>
181172
@@ -187,12 +178,11 @@ const usageExamples = {
187178
},
188179
highlightjs: {
189180
json: `<template>
190-
<CodeBlock
181+
<VCodeBlock
191182
:code="myCode"
192183
highlightjs
193184
:indent="2"
194185
lang="json"
195-
:tabs="false"
196186
/\>
197187
<\/template>
198188
@@ -203,11 +193,10 @@ const usageExamples = {
203193
hljs.registerLanguage('json', langJson);
204194
<\/script>`,
205195
typescript: `<template>
206-
<CodeBlock
196+
<VCodeBlock
207197
:code="myCode"
208198
highlightjs
209199
lang="typescript"
210-
:tabs="false"
211200
/\>
212201
<\/template>
213202
@@ -218,11 +207,10 @@ const usageExamples = {
218207
hljs.registerLanguage('typescript', langTypescript);
219208
<\/script>`,
220209
php: `<template>
221-
<CodeBlock
210+
<VCodeBlock
222211
:code="myCode"
223212
highlightjs
224213
lang="php"
225-
:tabs="false"
226214
/\>
227215
<\/template>
228216

‎src/documentation/components/examples/BrowserWindowExamples.vue‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
:highlightjs="selectedLibrary.id === 'highlightjs'"
1414
lang="html"
1515
:prismjs="selectedLibrary.id === 'prismjs'"
16-
:tabs="false"
1716
:theme="selectedTheme"
1817
/>
1918
</v-col>
@@ -28,19 +27,17 @@ const selectedLibrary = inject('selectedLibrary');
2827
const selectedTheme = inject('selectedTheme');
2928
3029
const examples = {
31-
prismjs: `<CodeBlock
30+
prismjs: `<VCodeBlock
3231
:browser-window="true"
3332
:code="myCode"
3433
lang="javascript"
3534
prismjs
36-
:tabs="false"
3735
/>`,
38-
highlightjs: `<CodeBlock
36+
highlightjs: `<VCodeBlock
3937
:browser-window="true"
4038
:code="myCode"
4139
highlightjs
4240
lang="javascript"
43-
:tabs="false"
4441
/>`
4542
};
4643
</script>

‎src/documentation/components/examples/ButtonExamples.vue‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
label="Visible on hover"
1515
lang="html"
1616
:prismjs="selectedLibrary.id === 'prismjs'"
17-
:tabs="false"
1817
:theme="selectedTheme"
1918
/>
2019
</v-col>
@@ -30,7 +29,6 @@
3029
lang="html"
3130
persistent-copy-button
3231
:prismjs="selectedLibrary.id === 'prismjs'"
33-
:tabs="false"
3432
:theme="selectedTheme"
3533
/>
3634
</v-col>
@@ -45,37 +43,33 @@ const selectedTheme = inject('selectedTheme');
4543
4644
const examples = {
4745
prismjs: {
48-
btn: `<CodeBlock
46+
btn: `<VCodeBlock
4947
:code="myCode"
5048
label="Visible on hover"
5149
lang="html"
5250
prismjs
53-
:tabs="false"
5451
/>`,
55-
btnPersist: `<CodeBlock
52+
btnPersist: `<VCodeBlock
5653
:code="myCode"
5754
label="Persistent Copy Button"
5855
lang="html"
5956
persistent-copy-button
6057
prismjs
61-
:tabs="false"
6258
/>`,
6359
},
6460
highlightjs: {
65-
btn: `<CodeBlock
61+
btn: `<VCodeBlock
6662
:code="myCode"
6763
highlightjs
6864
label="Visible on hover"
6965
lang="html"
70-
:tabs="false"
7166
/>`,
72-
btnPersist: `<CodeBlock
67+
btnPersist: `<VCodeBlock
7368
:code="myCode"
7469
highlightjs
7570
label="Persistent Copy Button"
7671
lang="html"
7772
persistent-copy-button
78-
:tabs="false"
7973
/>`,
8074
}
8175
};

‎src/documentation/components/examples/LangExamples.vue‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
lang="javascript"
1616
:max-height="codeBlockOptions.preHeight"
1717
:prismjs="selectedLibrary.id === 'prismjs'"
18-
:tabs="false"
1918
:theme="selectedTheme"
2019
/>
2120
</v-col>
@@ -31,7 +30,6 @@
3130
lang="html"
3231
:max-height="codeBlockOptions.preHeight"
3332
:prismjs="selectedLibrary.id === 'prismjs'"
34-
:tabs="false"
3533
:theme="selectedTheme"
3634
/>
3735
</v-col>
@@ -47,7 +45,6 @@
4745
lang="css"
4846
:max-height="codeBlockOptions.preHeight"
4947
:prismjs="selectedLibrary.id === 'prismjs'"
50-
:tabs="false"
5148
:theme="selectedTheme"
5249
/>
5350
</v-col>
@@ -63,7 +60,6 @@
6360
lang="html"
6461
:max-height="codeBlockOptions.preHeight"
6562
:prismjs="selectedLibrary.id === 'prismjs'"
66-
:tabs="false"
6763
:theme="selectedTheme"
6864
/>
6965
</v-col>
@@ -78,7 +74,6 @@
7874
label="SVG"
7975
lang="svg"
8076
:prismjs="selectedLibrary.id === 'prismjs'"
81-
:tabs="false"
8277
:theme="selectedTheme"
8378
/>
8479
</v-col>

0 commit comments

Comments
 (0)