Skip to content

Commit

Permalink
fix(scrollbar): Fix scrollbar gap display
Browse files Browse the repository at this point in the history
  • Loading branch information
trevorgerhardt committed Sep 25, 2018
1 parent c8ff62e commit c22a5df
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 44 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"prestart": "yarn",
"pretest": "yarn",
"semantic-release": "semantic-release",
"start": "mastarm build --serve --env",
"start": "mastarm build --serve",
"test": "mastarm lint src"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion src/components/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ export default class Application extends Component<Props, State> {
return (
<div>
<div className='Fullscreen'>
<svg width='0' height='0' style='position:absolute'>
<svg width='0' height='0' style={{position:'absolute'}}>
<defs>
<filter id='shadow'>
<feDropShadow dx='1' dy='1' stdDeviation='1' />
Expand Down
4 changes: 4 additions & 0 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
--shadow: #333;
}

::-webkit-scrollbar {
width: 0;
}

html, body {
font-size: 15px;
font-family: -apple-system,
Expand Down
31 changes: 18 additions & 13 deletions src/selectors/points-of-interest.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,23 @@ export default createSelector(
state => state.data.pointsOfInterest,
featureCollection =>
(featureCollection
? featureCollection.features.map(feature => ({
label: feature.properties.name,
value: `poi-${feature.properties.name}-${feature.geometry.coordinates.join(',')}`,
feature: {
...feature,
properties: {
...feature.properties,
label: feature.properties.name,
'marker-color': '#0b2b40',
'marker-size': 'small'
? featureCollection.features.map(feature => {
const p = feature.properties
const label = p.label || p.name || p.Name
return {
label,
value: `poi-${label}-${feature.geometry.coordinates.join(',')}`,
feature: {
...feature,
properties: {
...p,
label,
'marker-color': '#0b2b40',
'marker-size': 'small'
}
}
}
}
}))
: [])
})
: []
)
)
32 changes: 3 additions & 29 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2743,7 +2743,7 @@ debug@^4.0.0, debug@^4.0.1:
dependencies:
ms "^2.1.1"

debuglog@*, debuglog@^1.0.1:
debuglog@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"

Expand Down Expand Up @@ -4427,7 +4427,7 @@ import-local@^1.0.0:
pkg-dir "^2.0.0"
resolve-cwd "^2.0.0"

imurmurhash@*, imurmurhash@^0.1.4:
imurmurhash@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"

Expand Down Expand Up @@ -5654,39 +5654,17 @@ lodash-es@^4.0.0, lodash-es@^4.17.5:
version "4.17.11"
resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0"

lodash._baseindexof@*:
version "3.1.0"
resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"

lodash._baseuniq@~4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
dependencies:
lodash._createset "~4.0.0"
lodash._root "~3.0.0"

lodash._bindcallback@*:
version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"

lodash._cacheindexof@*:
version "3.0.2"
resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"

lodash._createcache@*:
version "3.1.2"
resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
dependencies:
lodash._getnative "^3.0.0"

lodash._createset@~4.0.0:
version "4.0.3"
resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"

lodash._getnative@*, lodash._getnative@^3.0.0:
version "3.9.1"
resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"

lodash._reinterpolate@~3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
Expand Down Expand Up @@ -5747,10 +5725,6 @@ lodash.merge@^4.6.0:
version "4.6.1"
resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"

lodash.restparam@*:
version "3.6.1"
resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"

lodash.sortby@^4.7.0:
version "4.7.0"
resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
Expand Down Expand Up @@ -8286,7 +8260,7 @@ readable-stream@~2.0.0:
string_decoder "~0.10.x"
util-deprecate "~1.0.1"

readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0:
readdir-scoped-modules@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
dependencies:
Expand Down

0 comments on commit c22a5df

Please sign in to comment.