schnabu/maputnik
1
0
Fork 0
mirror of https://github.com/a-nyx/maputnik-with-pmtiles.git synced 2024-12-29 06:20:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/maputnik/editor into issues

Browse source
This commit is contained in:
jPalmer 2018-02-01 13:44:23 -08:00
commit 240d02a124
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/components/Toolbar.jsx
View file

@ -22,6 +22,7 @@ import SettingsModal from './modals/SettingsModal'
import ExportModal from './modals/ExportModal' import ExportModal from './modals/ExportModal'
import SourcesModal from './modals/SourcesModal' import SourcesModal from './modals/SourcesModal'
import OpenModal from './modals/OpenModal' import OpenModal from './modals/OpenModal'
import pkgJson from '../../package.json'
import style from '../libs/style' import style from '../libs/style'
@ -136,7 +137,9 @@ export default class Toolbar extends React.Component {
className="maputnik-toolbar-logo" className="maputnik-toolbar-logo"
> >
<img src={logoImage} alt="Maputnik" /> <img src={logoImage} alt="Maputnik" />
<h1>Maputnik</h1> <h1>Maputnik
<span className="maputnik-toolbar-version">v{pkgJson.version}</span>
</h1>
</ToolbarLink> </ToolbarLink>
<div className="maputnik-toolbar__actions"> <div className="maputnik-toolbar__actions">
<ToolbarAction onClick={this.toggleModal.bind(this, 'open')}> <ToolbarAction onClick={this.toggleModal.bind(this, 'open')}>

1
src/styles/_modal.scss
View file

@ -76,6 +76,7 @@
position: fixed; position: fixed;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
z-index: 9;
@include flex-row; @include flex-row;
} }

14
src/styles/_toolbar.scss
View file

@ -36,12 +36,24 @@
cursor: pointer; cursor: pointer;
color: $color-white; color: $color-white;
text-decoration: none; text-decoration: none;
line-height: 20px;
h1 {
position: relative;
}
&:hover { &:hover {
background-color: $color-midgray; background-color: $color-midgray;
} }
} }
.maputnik-toolbar-version {
position: absolute;
font-size: 10px;
bottom: -2px;
margin-left: 4px;
}
.maputnik-toolbar-action { .maputnik-toolbar-action {
@extend .maputnik-toolbar-link; @extend .maputnik-toolbar-link;
} }
@ -56,7 +68,7 @@
} }
.maputnik-toolbar-logo { .maputnik-toolbar-logo {
flex: 0 0 140px; flex: 0 0 170px;
} }
.maputnik-toolbar__inner { .maputnik-toolbar__inner {