Skip to content

Commit

Permalink
Merge branch 'master' into upgrade-typescript
Browse files Browse the repository at this point in the history
  • Loading branch information
nvlaarhoven authored Apr 16, 2020
2 parents 7ddf666 + 33ae171 commit add7dfc
Show file tree
Hide file tree
Showing 48 changed files with 416 additions and 23,055 deletions.
5 changes: 1 addition & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"extends": [
"dabapps/base",
"dabapps/commonjs"
],
"extends": ["dabapps/base", "dabapps/commonjs"],
"rules": {
"prettier/prettier": 0
}
Expand Down
10 changes: 10 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/node_modules/*
/coverage/*
/.nyc_output/*
/dist/*
/docs/build/*
/styleguide/*
.vscode/*

.DS_Store
npm-debug.log*
23 changes: 10 additions & 13 deletions docs/components/logo.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,28 @@
var React = require('react');
var Styled = require('rsg-components/Styled').default;

function styles (settings) {
function styles(settings) {
return {
image: {
fontFamily: settings.fontFamily.base,
width: 63,
height: 24,
display: 'block'
}
display: 'block',
},
};
}

function Logo (props) {
function Logo(props) {
return React.createElement(
'a',
{
href: '#'
href: '#',
},
React.createElement(
'img',
{
src: 'images/roe-logo-small.png',
alt: 'Roe Logo',
className: props.classes.image
}
)
React.createElement('img', {
src: 'images/roe-logo-small.png',
alt: 'Roe Logo',
className: props.classes.image,
})
);
}

Expand Down
19 changes: 7 additions & 12 deletions docs/introduction/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,13 @@ This will help avoid writing lots of custom LESS to override existing Roe styles
All components are exported, named, at the root level.

```javascript static
import {
Column,
Container,
Row
} from '@dabapps/roe';
import { Column, Container, Row } from '@dabapps/roe';

const App = () => (
<Container>
<Row>
<Column md={6}>
Column 1
</Column>
<Column md={6}>
Column 2
</Column>
<Column md={6}>Column 1</Column>
<Column md={6}>Column 2</Column>
</Row>
</Container>
);
Expand All @@ -51,7 +43,10 @@ Highlight.js recommends this CDN.

```html static
<!-- Include this in your head tag -->
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/github-gist.min.css">
<link
rel="stylesheet"
href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/github-gist.min.css"
/>

<!-- Include this anywhere before your main javascript file -->
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
Expand Down
Loading

0 comments on commit add7dfc

Please sign in to comment.