git ssb

10+

Matt McKegg / patchwork



Commit 6e8bb78d907b33bbdb544951cbaa4d6120d2958b

Merge branch 'master' into flume

# Conflicts:
#	package.json
Matt McKegg committed on 6/12/2017, 5:06:43 AM
Parent: 61bfb6eda2830c9f7e8cfe9b9388ac820cab5359
Parent: c2330d6f4c502dd3403846261543d2cbdac5d504

Files changed

styles/markdown.mcsschanged
styles/markdown.mcssView
@@ -1,6 +1,27 @@
11 Markdown {
22 word-break: break-word
3+ (img) {
4+ -pending {
5+ border: 1px solid #DDD
6+ background-color: #EEE
7+ width: 120px
8+ height: 40px
9+ background-image: svg(fetching)
10+ background-position: center
11+ background-repeat: no-repeat
12+
13+ @svg fetching {
14+ width: 100px
15+ height: 20px
16+ content: '<text x='0' y='12'>Fetching image...</text>'
17+ text {
18+ font: caption
19+ font-size: 12px
20+ }
21+ }
22+ }
23+ }
324 (blockquote) {
425 margin: 1rem 0;
526 padding: 5px 20px;
627 border-left: 4px gainsboro solid;

Built with git-ssb-web