Merge branch 'feature/accessibility-list-reorder' into feature/shortcuts

Conflicts:
	src/components/App.jsx
This commit is contained in:
orangemug
2018-06-03 09:41:07 +01:00
8 changed files with 138 additions and 5 deletions
+4
View File
@@ -99,9 +99,13 @@ export default class Toolbar extends React.Component {
return <div className='maputnik-toolbar'>
<div className="maputnik-toolbar__inner">
<ToolbarLink
tabIndex="2"
href={"https://github.com/maputnik/editor"}
className="maputnik-toolbar-logo"
>
<a tabIndex="1" className="maputnik-toolbar-skip" href="#skip-menu">
Skip navigation
</a>
<img src={logoImage} alt="Maputnik" />
<h1>Maputnik
<span className="maputnik-toolbar-version">v{pkgJson.version}</span>