Skip to content
This repository was archived by the owner on Apr 21, 2023. It is now read-only.

Commit

Permalink
build(yarn): Upgrade onsenui
Browse files Browse the repository at this point in the history
This upgrades fontawesome as well

Because of lennardv2/Leaflet.awesome-markers#94, whe have to use slightly
different icons
  • Loading branch information
Rudloff committed Oct 2, 2019
1 parent 1e7a06e commit 32138fb
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -465,10 +465,10 @@ function openvegemapMain() {
new L.Control.InfoControl(
{
position: 'bottomright',
content: '<div title="Restaurants that serve only vegan food"><i class="fa fa-dot-circle-o" style="background-color: #72AF26"></i> Vegan only</div>'
content: '<div title="Restaurants that serve only vegan food"><i class="fa fa-bullseye" style="background-color: #72AF26"></i> Vegan only</div>'
+ '<div title="Restaurants that serve vegan food and other food"><i class="fa fa-circle" style="background-color: #72AF26"></i> Vegan friendly</div>'
+ '<div title="Restaurants that serve only vegetarian food but no vegan food"><i class="fa fa-circle-thin" style="background-color: #728224"></i> Vegetarian only</div>'
+ '<div title="Restaurants that serve vegetarian food and meat but no vegan food"><i class="fa fa-circle-o" style="background-color: #728224"></i> Vegetarian friendly</div>'
+ '<div title="Restaurants that serve only vegetarian food but no vegan food"><i class="fa fa-circle-notch" style="background-color: #728224"></i> Vegetarian only</div>'
+ '<div title="Restaurants that serve vegetarian food and meat but no vegan food"><i class="fa fa-dot-circle" style="background-color: #728224"></i> Vegetarian friendly</div>'
+ '<div title="Restaurants that serve meat"><i class="fa fa-ban" style="background-color: #D63E2A"></i> Not vegetarian</div>'
+ '<div title="Restaurants we don\'t have enough information about"><i class="fa fa-question" style="background-color: #575757"></i> Unknown</div>'
}
Expand Down
6 changes: 3 additions & 3 deletions js/poi.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,16 @@ function POI(tags) {
*/
function getMarkerIcon() {
if (isOnlyDiet('vegan')) {
return 'dot-circle-o';
return 'bullseye';
}
if (isDiet('vegan')) {
return 'circle';
}
if (isOnlyDiet('vegetarian')) {
return 'circle-thin';
return 'circle-notch';
}
if (isDiet('vegetarian')) {
return 'circle-o';
return 'dot-circle';
}
if (isNotDiet('vegetarian')) {
return 'ban';
Expand Down
2 changes: 1 addition & 1 deletion js/style.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require('leaflet-control-geocoder/dist/Control.Geocoder.css');
// Onsen
require('onsenui/css/onsenui-core.css');
require('onsenui/css/onsen-css-components.css');
require('onsenui/css/font_awesome/css/font-awesome.css');
require('onsenui/css/font_awesome/css/all.css');

// Custom CSS
require('../css/map.css');
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"leaflet-loader": "~0.0.1",
"leaflet-overpass-layer": "~2.8.0",
"leaflet-plugins": "~3.0.0",
"onsenui": "2.10.4",
"onsenui": "^2.10.10",
"opening_hours": "~3.5.0",
"string.prototype.padstart": "~3.0.0",
"style-loader": "~0.23.1",
Expand Down
12 changes: 6 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2238,7 +2238,7 @@ grunt@~1.0.1:
path-is-absolute "~1.0.0"
rimraf "~2.6.2"

gulp-protractor@^4.1.0:
gulp-protractor@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/gulp-protractor/-/gulp-protractor-4.1.1.tgz#c63c6b3e932ca9cd6d7b9e98fbef80673a6e8984"
integrity sha512-VijKZtwgF6R2u8jcKCSRaryaCB83+XbBndqolRxExSdS0gajQ9vVeLOrYvRlCtGKTzqX1Rn998hhQ9CugqzDcQ==
Expand Down Expand Up @@ -3670,15 +3670,15 @@ once@~1.3.0:
dependencies:
wrappy "1"

[email protected].4:
version "2.10.4"
resolved "https://registry.yarnpkg.com/onsenui/-/onsenui-2.10.4.tgz#3cfd9bf21c0c084165b6f57664f8c607feba399f"
integrity sha512-qHlPNWBonqjiqWU4b+HyRrC34rjMCHBnrqeub8TSKiit9BxO9Gox8xD4jaDAOruDdXn98/rVoOnQ+J0/2N0n8g==
onsenui@^2.10.10:
version "2.10.10"
resolved "https://registry.yarnpkg.com/onsenui/-/onsenui-2.10.10.tgz#6ef924e1bc29f0c44c07cc0bddc83092d9403bc3"
integrity sha512-TEWRsUQsi8XXmAiwEeAbA14tncxyVwdZyqC145HfXL1zIS8oqWleijkkZEjADESobIWiOR2CDkeA6CzpTjGk4w==
dependencies:
"@onsenui/custom-elements" "1.0.0"
"@onsenui/fastclick" "1.1.1"
core-js "^2.5.1"
gulp-protractor "^4.1.0"
gulp-protractor "^4.1.1"

opening_hours@~3.5.0:
version "3.5.0"
Expand Down

0 comments on commit 32138fb

Please sign in to comment.