schnabu/maputnik
1
0
Fork 0
mirror of https://github.com/a-nyx/maputnik-with-pmtiles.git synced 2025-01-30 16:15:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #170 from orangemug/fix/maputnik-logo-stretch

Browse source 
Fixes logo styling in toolbar
This commit is contained in:
Orange Mug 2017-10-11 14:34:43 +01:00 committed by GitHub
commit 817d0a7e63
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -34,6 +34,7 @@
"lodash.throttle": "^4.1.1", "lodash.throttle": "^4.1.1",
"mapbox-gl": "^0.34.0", "mapbox-gl": "^0.34.0",
"mapbox-gl-inspect": "^1.2.3", "mapbox-gl-inspect": "^1.2.3",
"maputnik-design": "github:maputnik/design",
"mousetrap": "^1.6.0", "mousetrap": "^1.6.0",
"ol-mapbox-style": "1.0.1", "ol-mapbox-style": "1.0.1",
"openlayers": "^3.19.1", "openlayers": "^3.19.1",

2
src/components/Toolbar.jsx
View file

@ -16,7 +16,7 @@ import MdFontDownload from 'react-icons/lib/md/font-download'
import HelpIcon from 'react-icons/lib/md/help-outline' import HelpIcon from 'react-icons/lib/md/help-outline'
import InspectionIcon from 'react-icons/lib/md/find-in-page' import InspectionIcon from 'react-icons/lib/md/find-in-page'
import logoImage from '../img/maputnik.png' import logoImage from 'maputnik-design/logos/logo-color.svg'
import SettingsModal from './modals/SettingsModal' 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'

3
src/styles/_toolbar.scss
View file

@ -22,9 +22,8 @@
img { img {
width: 30px; width: 30px;
height: 30px;
padding-right: $margin-2; padding-right: $margin-2;
vertical-align: middle; vertical-align: top;
} }
} }

2
test/specs/simple.js
View file

@ -9,7 +9,7 @@ describe('maputnik', function() {
browser.waitForExist(".maputnik-toolbar-link"); browser.waitForExist(".maputnik-toolbar-link");
var src = browser.getAttribute(".maputnik-toolbar-link img", "src"); var src = browser.getAttribute(".maputnik-toolbar-link img", "src");
assert.equal(src, config.baseUrl+'/img/maputnik.png'); assert.equal(src, config.baseUrl+'/img/logo-color.svg');
}); });
}); });