Skip to content

Commit 8e91d47

Browse files
committed
Merge branch 'gh-pages' into dev
2 parents 9bb758d + 65aae4f commit 8e91d47

File tree

2 files changed

+31
-29
lines changed

2 files changed

+31
-29
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@quasar/quasar-app-extension-qmarkdown",
3-
"version": "1.0.0-beta.4",
3+
"version": "1.0.0-beta.5",
44
"description": "A Quasar UI App Extension to display inline markdown",
55
"author": "Hawkeye64 <[email protected]>",
66
"main": "src/index.js",

src/component/markdown.styl

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -149,75 +149,77 @@
149149
margin 0
150150

151151
&--note
152-
border-radius $generic-border-radius
153-
margin 16px 0
154-
padding 16px 24px
152+
margin 14px 0
153+
padding 14px 18px
155154
font-size 1em
156155
letter-spacing .5px
156+
background-color $grey-2
157+
color $blue-grey-10
158+
font-weight 400
159+
157160

158161
.q-markdown--token
159162
color $grey-9
160163
.q-markdown--link
161164
color darken($grey-6, 35%)
162165

163-
// > p
164-
// margin-bottom 0
165-
166-
// TODO: ???
167166
&--
168-
border-color $grey-6
169-
background-color lighten($grey-6, 40%)
170-
color white
167+
border-left 10px solid lighten($grey-8, 30%)
171168
.q-markdown--token
172169
background-color lighten($grey-6, 55%)
173170
.q-markdown--link
174171
color darken($grey-6, 35%)
175172

176173
&--info
177-
border-color $blue-6
178-
background-color lighten($blue-6, 20%)
179-
color white
174+
border-left 10px solid lighten($blue-8, 30%)
175+
color lighten($blue-8, 30%)
176+
background-color lighten($blue-8, 90%)
180177
.q-markdown--token
181178
background-color lighten($blue-6, 55%)
182179
.q-markdown--link
183180
color darken($blue-6, 35%)
181+
.q-markdown--note-title
182+
color lighten($blue-8, 10%)
184183

185184
&--tip
186-
border-color $positive
187-
background-color lighten($positive, 20%)
188-
color white
185+
border-left 10px solid lighten($green-8, 30%)
186+
color lighten($green-8, 30%)
187+
background-color lighten($green-8, 90%)
189188
.q-markdown--token
190-
background-color lighten($positive, 55%)
189+
background-color lighten($green-6, 55%)
191190
.q-markdown--link
192-
color darken($positive, 35%)
191+
color darken($green-8, 35%)
192+
.q-markdown--note-title
193+
color lighten($green-8, 10%)
193194

194195
&--warning
195-
border-color $warning
196-
background-color lighten($warning, 20%)
197-
color white
196+
border-left 10px solid lighten($orange-8, 30%)
197+
color lighten($orange-8, 30%)
198+
background-color lighten($warning, 90%)
198199
.q-markdown--token
199200
background-color lighten($warning, 15%)
200201
.q-markdown--link
201202
color darken($warning, 45%)
203+
.q-markdown--note-title
204+
color lighten($orange-8, 10%)
202205

203206
&--danger
204-
border-color $negative
205-
background-color lighten($negative, 60%)
206-
color white
207+
border-left 10px solid lighten($negative, 30%)
208+
color lighten($red-8, 30%)
209+
background-color lighten($negative, 90%)
207210
.q-markdown--token
208211
background-color lighten($negative, 65%)
209212
.q-markdown--link
210213
color darken($negative, 25%)
214+
.q-markdown--note-title
215+
color lighten($red-8, 10%)
211216

212217
&-title
213-
font-weight 500
214-
background-color rgba(0,0,0,0.1)
215-
border-radius $generic-border-radius
218+
font-weight 800
216219
margin-left -4px
217220
margin-right -4px
218221
padding 0 4px
219222
margin-bottom 4px
220-
border-bottom: 2px solid rgba(0,0,0,0.3)
221223

222224
&--table
223225
width fit-content

0 commit comments

Comments
 (0)