Skip to content

Refactor underline nav #377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Nov 7, 2017
Merged

Refactor underline nav #377

Changes from 2 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ce1a6f8
Add underline nav styles and import file
ampinsk Oct 20, 2017
67fe320
Add octicon styles to prototype
ampinsk Oct 20, 2017
346992a
Add prototyping cases
ampinsk Oct 20, 2017
ca5a104
Add docs
ampinsk Oct 20, 2017
936a8fe
Move underline nav section in docs
ampinsk Oct 23, 2017
ad5fa52
Merge branch 'release-10.0.0' into underline-nav
jonrohan Oct 27, 2017
36565dc
Linting fixes
jonrohan Oct 27, 2017
f6dde1e
Using storiesfrommarkdown
jonrohan Oct 28, 2017
43b8b8e
Publish alpha release any time we're not on a release branch or master
jonrohan Nov 2, 2017
f85d54c
Add support for all container classes; add support for right + actions
ampinsk Nov 3, 2017
84efc60
Merge branch 'underline-nav' of https://github.com/primer/primer-css …
ampinsk Nov 3, 2017
573b961
Fix spacing
ampinsk Nov 3, 2017
921fef6
Update docs
ampinsk Nov 3, 2017
80f0616
Update naming and docs
ampinsk Nov 6, 2017
751b999
Remove mr-1 from octicon component style
ampinsk Nov 6, 2017
8336983
Update docs
ampinsk Nov 6, 2017
d7d54d5
Merge branch 'release-10.0.0' into underline-nav
jonrohan Nov 6, 2017
f270f97
Update docs
ampinsk Nov 7, 2017
0ffc472
Merge branch 'underline-nav' of https://github.com/primer/primer-css …
ampinsk Nov 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .storybook/lib/storiesFromMarkdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,15 @@ const htmlParser = new htmlToReact.Parser()

const railsOcticonToReact = (html) => {
// <%= octicon "tools" %> to <Octicon name="tools" />
const octre = /<%= octicon ["']([a-z\-]+)["'] %>/gi
const octre = /<%= octicon ["']([a-z\-]+)["'][^%]*%>/gi
html = html.replace(octre, (match, name) => {
return ReactDOMServer.renderToStaticMarkup(<Octicon name={name} />)
})
return html
}

const isValidNode = () => {
return true;
}

const nodeToStory = (node, file) => {
let html = railsOcticonToReact(node.value)
const html = railsOcticonToReact(node.value)
const element = htmlParser.parse(html)
const pairs = node.lang.replace(/^html\s*/, '')
const attrs = pairs.length ? parsePairs(pairs) : {}
Expand Down