From 1e094d3df1c71282955cc38a4292023247d3fec0 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 8 Nov 2018 17:33:56 +0100 Subject: [PATCH] add test page, add syntax highlighting --- content/test.md | 369 ++++++++++++++++++++++++++++++++++ gatsby-browser.js | 3 + src/styles/_variables.scss | 2 + src/styles/global.scss | 83 ++++---- src/templates/Doc.jsx | 11 +- src/templates/Doc.module.scss | 6 +- 6 files changed, 431 insertions(+), 43 deletions(-) create mode 100644 content/test.md diff --git a/content/test.md b/content/test.md new file mode 100644 index 00000000..4d2bdd9f --- /dev/null +++ b/content/test.md @@ -0,0 +1,369 @@ +--- +title: Content test +--- + +This is intended as a quick reference and showcase. For more complete info, see [John Gruber's original spec](http://daringfireball.net/projects/markdown/) and the [Github-flavored Markdown info page](http://github.github.com/github-flavored-markdown/). + +##### Table of Contents + +* [Headers](#headers) +* [Emphasis](#emphasis) +* [Lists](#lists) +* [Links](#links) +* [Images](#images) +* [Code and Syntax Highlighting](#code) +* [Tables](#tables) +* [Blockquotes](#blockquotes) +* [Inline HTML](#html) +* [Horizontal Rule](#hr) +* [Line Breaks](#lines) +* [YouTube Videos](#videos) + +## Headers + +``` +# H1 +## H2 +### H3 +#### H4 +##### H5 +###### H6 + +Alternatively, for H1 and H2, an underline-ish style: + +Alt-H1 +====== + +Alt-H2 +------ +``` + +# H1 +## H2 +### H3 +#### H4 +##### H5 +###### H6 + +Alternatively, for H1 and H2, an underline-ish style: + +Alt-H1 +====== + +Alt-H2 +------ + +## Emphasis + +``` +Emphasis, aka italics, with *asterisks* or _underscores_. + +Strong emphasis, aka bold, with **asterisks** or __underscores__. + +Combined emphasis with **asterisks and _underscores_**. + +Strikethrough uses two tildes. ~~Scratch this.~~ +``` + +Emphasis, aka italics, with *asterisks* or _underscores_. + +Strong emphasis, aka bold, with **asterisks** or __underscores__. + +Combined emphasis with **asterisks and _underscores_**. + +Strikethrough uses two tildes. ~~Scratch this.~~ + +## Lists + +``` +1. First ordered list item +2. Another item + * Unordered sub-list. +1. Actual numbers don't matter, just that it's a number + 1. Ordered sub-list +4. And another item. + + Some text that should be aligned with the above item. + +* Unordered list can use asterisks +- Or minuses ++ Or pluses +``` + +1. First ordered list item +2. Another item + + * Unordered sub-list. + +1. Actual numbers don't matter, just that it's a number + + 1. Ordered sub-list + +4. And another item. + + Some text that should be aligned with the above item. + +* Unordered list can use asterisks +- Or minuses ++ Or pluses + +## Links + +There are two ways to create links. + +``` +[I'm an inline-style link](https://www.google.com) + +[I'm a reference-style link][Arbitrary case-insensitive reference text] + +[You can use numbers for reference-style link definitions][1] + +Or leave it empty and use the [link text itself] + +URLs and URLs in angle brackets will automatically get turned into links. +http://www.example.com or and sometimes +example.com (but not on Github, for example). + +Some text to show that the reference links can follow later. + +[arbitrary case-insensitive reference text]: https://www.mozilla.org +[1]: http://slashdot.org +[link text itself]: http://www.reddit.com +``` + +[I'm an inline-style link](https://www.google.com) + +[I'm a reference-style link][Arbitrary case-insensitive reference text] + +[You can use numbers for reference-style link definitions][1] + +Or leave it empty and use the [link text itself] + +URLs and URLs in angle brackets will automatically get turned into links. +http://www.example.com or and sometimes +example.com (but not on Github, for example). + +Some text to show that the reference links can follow later. + +[arbitrary case-insensitive reference text]: https://www.mozilla.org +[1]: http://slashdot.org +[link text itself]: http://www.reddit.com + +## Images + +``` +Here's our logo (hover to see the title text): + +Inline-style: +![alt text](https://github.com/adam-p/markdown-here/raw/master/src/common/images/icon48.png "Logo Title Text 1") + +Reference-style: +![alt text][logo] + +[logo]: https://github.com/adam-p/markdown-here/raw/master/src/common/images/icon48.png "Logo Title Text 2" +``` + +Here's our logo (hover to see the title text): + +Inline-style: +![alt text](https://github.com/adam-p/markdown-here/raw/master/src/common/images/icon48.png "Logo Title Text 1") + +Reference-style: +![alt text][logo] + +[logo]: https://github.com/adam-p/markdown-here/raw/master/src/common/images/icon48.png "Logo Title Text 2" + +## Code and Syntax Highlighting + +Code blocks are part of the Markdown spec, but syntax highlighting isn't. However, many renderers -- like Github's and *Markdown Here* -- support syntax highlighting. *Markdown Here* supports highlighting for dozens of languages (and not-really-languages, like diffs and HTTP headers); to see the complete list, and how to write the language names, see the [highlight.js demo page](http://softwaremaniacs.org/media/soft/highlight/test.html). + +``` +Inline `code` has `back-ticks around` it. +``` + +Inline `code` has `back-ticks around` it. + +Blocks of code are either fenced by lines with three back-ticks ```, or are indented with four spaces. I recommend only using the fenced code blocks -- they're easier and only they support syntax highlighting. + +
```javascript
+var s = "JavaScript syntax highlighting";
+alert(s);
+```
+
+```python
+s = "Python syntax highlighting"
+print s
+```
+
+```
+No language indicated, so no syntax highlighting.
+But let's throw in a <b>tag</b>.
+```
+
+ +```javascript +var s = "JavaScript syntax highlighting"; +alert(s); +``` + +```python +s = "Python syntax highlighting" +print s +``` + +``` +No language indicated, so no syntax highlighting in Markdown Here (varies on Github). +But let's throw in a tag. +``` + +Again, to see what languages are available for highlighting, and how to write those language names, see the [highlight.js demo page](http://softwaremaniacs.org/media/soft/highlight/test.html). + + +## Tables + +Tables aren't part of the core Markdown spec, but they are part of GFM and *Markdown Here* supports them. They are an easy way of adding tables to your email -- a task that would otherwise require copy-pasting from another application. + +```no-highlight +Colons can be used to align columns. + +| Tables | Are | Cool | +| ------------- | :-----------: | ----: | +| col 3 is | right-aligned | $1600 | +| col 2 is | centered | $12 | +| zebra stripes | are neat | $1 | + +The outer pipes (|) are optional, and you don't need to make the raw Markdown line up prettily. You can also use inline Markdown. + +| | Markdown | Less | Pretty | | +| | ------------- | --------------- | ---------- |------- | +| | *Still* | `renders` | **nicely** | | +| | 1 | 2 | 3 | | +``` + +Colons can be used to align columns. + +| Tables | Are | Cool | +| ------------- | :-----------: | ----: | +| col 3 is | right-aligned | $1600 | +| col 2 is | centered | $12 | +| zebra stripes | are neat | $1 | + +The outer pipes (|) are optional, and you don't need to make the raw Markdown line up prettily. You can also use inline Markdown. + +| Markdown | Less | Pretty | +| -------- | --------- | ---------- | +| *Still* | `renders` | **nicely** | +| 1 | 2 | 3 | + + +## Blockquotes + +``` +> Blockquotes are very handy in email to emulate reply text. +> This line is part of the same quote. + +Quote break. + +> This is a very long line that will still be quoted properly when it wraps. Oh boy let's keep writing to make sure this is long enough to actually wrap for everyone. Oh, you can *put* **Markdown** into a blockquote. +``` + +> Blockquotes are very handy in email to emulate reply text. +> This line is part of the same quote. + +Quote break. + +> This is a very long line that will still be quoted properly when it wraps. Oh boy let's keep writing to make sure this is long enough to actually wrap for everyone. Oh, you can *put* **Markdown** into a blockquote. + +## Inline HTML + +You can also use raw HTML in your Markdown, and it'll mostly work pretty well. + +```html +
+
Definition list
+
Is something people use sometimes.
+ +
Markdown in HTML
+
Does *not* work **very** well. Use HTML tags.
+
+``` + +
+
Definition list
+
Is something people use sometimes.
+ +
Markdown in HTML
+
Does *not* work **very** well. Use HTML tags.
+
+ +## Horizontal Rule + +``` +Three or more... + +--- + +Hyphens + +*** + +Asterisks + +___ + +Underscores +``` + +Three or more... + +--- + +Hyphens + +*** + +Asterisks + +___ + +Underscores + +## Line Breaks + +My basic recommendation for learning how line breaks work is to experiment and discover -- hit <Enter> once (i.e., insert one newline), then hit it twice (i.e., insert two newlines), see what happens. You'll soon learn to get what you want. "Markdown Toggle" is your friend. + +Here are some things to try out: + +``` +Here's a line for us to start with. + +This line is separated from the one above by two newlines, so it will be a *separate paragraph*. + +This line is also a separate paragraph, but... +This line is only separated by a single newline, so it's a separate line in the *same paragraph*. +``` + +Here's a line for us to start with. + +This line is separated from the one above by two newlines, so it will be a *separate paragraph*. + +This line is also begins a separate paragraph, but... +This line is only separated by a single newline, so it's a separate line in the *same paragraph*. + +(Technical note: *Markdown Here* uses GFM line breaks, so there's no need to use MD's two-space line breaks.) + +## YouTube Videos + +They can't be added directly but you can add an image with a link to the video like this: + +``` + +``` + +Or, in pure Markdown, but losing the image sizing and border: + +``` +[![IMAGE ALT TEXT HERE](http://img.youtube.com/vi/YOUTUBE_VIDEO_ID_HERE/0.jpg)](http://www.youtube.com/watch?v=YOUTUBE_VIDEO_ID_HERE) +``` diff --git a/gatsby-browser.js b/gatsby-browser.js index c40415d9..b03eebbd 100755 --- a/gatsby-browser.js +++ b/gatsby-browser.js @@ -1,6 +1,9 @@ // import global branding styles import './src/styles/global.scss' +// import prismjs syntax highlighting styles +import 'prismjs/themes/prism-tomorrow.css' + // IntersectionObserver polyfill for gatsby-image (Safari, IE) if (typeof window.IntersectionObserver === 'undefined') { import('intersection-observer') diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss index 7c47e225..ec454199 100644 --- a/src/styles/_variables.scss +++ b/src/styles/_variables.scss @@ -21,6 +21,8 @@ $brand-gradient: linear-gradient(to right bottom, $brand-purple, $brand-pink); $font-family-base: 'Sharp Sans Medium', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif; $font-family-title: 'Sharp Sans Display', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif; $font-family-button: 'Sharp Sans Bold', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif; +$font-family-monospace: 'Fira Code', 'Fira Mono', Menlo, Monaco, Consolas, +'Courier New', monospace; $font-size-root: 15px; $font-size-base: 1rem; diff --git a/src/styles/global.scss b/src/styles/global.scss index 5a1a9989..d3eaee8e 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -24,6 +24,11 @@ body { position: relative; margin: 0; + // handling long text, like URLs + overflow-wrap: break-word; + word-wrap: break-word; + word-break: break-word; + @media screen and (min-width: $break-point--small) { padding: $page-frame; } @@ -91,46 +96,50 @@ h5 { font-size: $font-size-h5; } -.fade { - &-enter { - opacity: .01; - } +// Responsive Media +///////////////////////////////////// - &-enter-active { - opacity: 1; - transition: opacity 400ms ease-out; - } +figure, +img, +svg, +video, +audio, +embed, +canvas, +picture { + max-width: 100%; + height: auto; + margin: 0 auto; + display: block; +} - &-exit { - opacity: 1; - } +code, +kbd, +pre, +samp { + font-family: $font-family-monospace; + font-size: $font-size-small; +} - &-exit-active { - opacity: .01; - transition: opacity 400ms ease-in; +pre { + display: block; + margin-bottom: $spacer !important; + + // make 'em scrollable + overflow: auto; + -webkit-overflow-scrolling: touch; + max-height: 500px; + max-width: 100%; + + code { + padding: 0; + white-space: pre; + display: block; + color: inherit; + overflow-wrap: normal; + word-wrap: normal; + word-break: normal; + overflow: auto; } } -.grow { - &-enter { - opacity: .01; - max-height: 0; - } - - &-enter-active { - opacity: 1; - max-height: 500px; - transition: 200ms ease-out; - } - - &-exit { - opacity: 1; - max-height: 500px; - } - - &-exit-active { - opacity: .01; - max-height: 0; - transition: 200ms ease-in; - } -} diff --git a/src/templates/Doc.jsx b/src/templates/Doc.jsx index 9881e183..1866de6c 100644 --- a/src/templates/Doc.jsx +++ b/src/templates/Doc.jsx @@ -24,9 +24,14 @@ export default class DocTemplate extends Component {
- + {section && ( + + )}
diff --git a/src/templates/Doc.module.scss b/src/templates/Doc.module.scss index 60381650..4962c89d 100644 --- a/src/templates/Doc.module.scss +++ b/src/templates/Doc.module.scss @@ -9,10 +9,10 @@ .sidebar { flex: 0 0 25%; -} -.main { - flex: 0 0 70%; + + .main { + flex: 0 0 70%; + } } .header {