Skip to content

Commit

Permalink
Updating UI to also fit on mobile devices. Fix nrenner#34
Browse files Browse the repository at this point in the history
  • Loading branch information
bagage committed Jan 12, 2017
1 parent 1e26cb1 commit 9939806
Show file tree
Hide file tree
Showing 44 changed files with 470 additions and 1,257 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ nbproject/
bingkey.txt
/.project
/keys.js
/dist
28 changes: 15 additions & 13 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,25 @@
"bower_components"
],
"dependencies": {
"leaflet": "~0.7.3",
"leaflet": "^1.0.2",
"leaflet-plugins": "~2.0.0",
"leaflet-routing": "Turistforeningen/leaflet-routing#gh-pages",
"async": "~0.9.2",
"d3": "~3.5.5",
"leaflet.draw": "~0.2.3",
"bootstrap": "~3.3.4",
"bootstrap": "4.0.0-alpha.5",
"DataTables": "~1.10.5",
"leaflet.elevation": "MrMufflon/Leaflet.Elevation#master",
"leaflet-control-geocoder": "~1.1.0",
"leaflet-control-geocoder": "1.5.3",
"Leaflet.EasyButton": "*",
"bootbox": "~4.4.0",
"seiyria-bootstrap-slider": "~4.8.1",
"url-search-params": "~0.5.0",
"Leaflet.RestoreView": "makinacorpus/Leaflet.RestoreView#master",
"leaflet.locatecontrol": "^0.52.0",
"font-awesome": "^4.6.3"
"font-awesome": "^4.6.3",
"bootstrap-select": "^1.12.1",
"leaflet-sidebar": "^0.1.9"
},
"overrides": {
"leaflet": {
Expand Down Expand Up @@ -57,12 +59,16 @@
],
"dependencies": null
},
"bootstrap-select": {
"main": [
"dist/js/bootstrap-select.js",
"dist/css/bootstrap-select.css"
]
},
"bootstrap": {
"main": [
"dist/js/bootstrap.js",
"dist/css/bootstrap.css",
"dist/css/bootstrap-theme.css",
"dist/fonts/*"
"dist/css/bootstrap.css"
]
},
"leaflet.elevation": {
Expand All @@ -75,8 +81,8 @@
},
"leaflet-control-geocoder": {
"main": [
"Control.Geocoder.js",
"Control.Geocoder.css",
"dist/Control.Geocoder.js",
"dist/Control.Geocoder.css",
"images/*.+(png|gif)"
]
},
Expand All @@ -92,9 +98,5 @@
"fonts/*"
]
}
},
"resolutions": {
"leaflet.elevation": "master",
"font-awesome": "^4.6.3"
}
}
4 changes: 2 additions & 2 deletions config.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
'car-test'
];

BR.conf.host = 'http://localhost:17777';
BR.conf.host = 'http://0.0.0.0:17777';

// Pre-loading selected profile disabled locally. Needs brouter-web to run on a
// local web server with the profiles in a subdirectory or allowing file access
// local web server with the profiles in a subdirectory or allowing file access
// in the Browser (security!), see
// https://github.com/mrdoob/three.js/wiki/How-to-run-things-locally
//BR.conf.profilesUrl = 'http://localhost:8000/profiles2/';
Expand Down
Loading

0 comments on commit 9939806

Please sign in to comment.