ben/brouter-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

add Bootstrap:

Browse source 
- remove normalize.css, included
- adjust to Bootstrap's "box-sizing: border-box"
- conflict with Leaflet "label" class
This commit is contained in:
Norbert Renner 2014-08-27 17:01:00 +02:00
parent 32cde2b8e9
commit 5a277b0a34
5 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -54,7 +54,7 @@ Copyright 2012 Jacob Toye; [MIT License](https://github.com/Leaflet/Leaflet.draw
Copyright (c) 2013 Stefano Cudini; [MIT License](https://github.com/stefanocudini/leaflet-search/blob/master/LICENSE.txt) Copyright (c) 2013 Stefano Cudini; [MIT License](https://github.com/stefanocudini/leaflet-search/blob/master/LICENSE.txt)
* [leaflet-plugins](https://github.com/shramov/leaflet-plugins) * [leaflet-plugins](https://github.com/shramov/leaflet-plugins)
Copyright (c) 2011-2012, Pavel Shramov; [2-clause BSD License](https://github.com/shramov/leaflet-plugins/blob/master/LICENSE) Copyright (c) 2011-2012, Pavel Shramov; [2-clause BSD License](https://github.com/shramov/leaflet-plugins/blob/master/LICENSE)
* [normalize.css](https://github.com/necolas/normalize.css)
Copyright (c) Nicolas Gallagher and Jonathan Neal; [MIT License](https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
* [Async.js](https://github.com/caolan/async) * [Async.js](https://github.com/caolan/async)
Copyright (c) 2010-2014 Caolan McMahon; [MIT License](https://github.com/caolan/async/blob/master/LICENSE) Copyright (c) 2010-2014 Caolan McMahon; [MIT License](https://github.com/caolan/async/blob/master/LICENSE)
* [Bootstrap](http://getbootstrap.com/)
Copyright (c) 2011-2014 Twitter, Inc; [MIT License](https://github.com/twbs/bootstrap/blob/master/LICENSE)

1
bower.json
View file

@ -7,7 +7,6 @@
"bower_components" "bower_components"
], ],
"dependencies": { "dependencies": {
"normalize-css": "*",
"leaflet-search": "*", "leaflet-search": "*",
"leaflet-plugins": "*", "leaflet-plugins": "*",
"leaflet-routing": "nrenner/leaflet-routing#styles", "leaflet-routing": "nrenner/leaflet-routing#styles",

16
css/style.css
View file

@ -45,7 +45,7 @@ div.elevation {
.title { .title {
padding-top: 4px; padding-top: 4px;
/* normalize height, for absolute Profile control positioning */ /* normalize height, for absolute Profile control positioning */
height: 17px; height: 21px;
} }
.title-name { .title-name {
font-size: larger; font-size: larger;
@ -121,7 +121,7 @@ td {
.leaflet-leftpane .leaflet-control { .leaflet-leftpane .leaflet-control {
margin: 3px 5px; margin: 3px 5px;
width: 370px; width: 386px;
} }
/* Profile Control */ /* Profile Control */
@ -185,3 +185,15 @@ textarea:focus {
stroke-dashoffset: 0; stroke-dashoffset: 0;
} }
} }
/* override Bootstrap label for Leaflet layer switcher */
.leaflet-control-layers label {
max-width: none;
margin-bottom: 0px;
font-weight: normal;
/* normalize label height
| Firefox | Chrome |
Leaflet only | 21 | 20 |
Bootstrap | 23 | 22 |*/
height: 21px;
}

8
index.html
View file

@ -2,6 +2,8 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>BRouter web client</title> <title>BRouter web client</title>
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" /> <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" />
@ -12,7 +14,8 @@
<link rel="stylesheet" href="bower_components/Leaflet.Elevation/dist/Leaflet.Elevation-0.0.2.css" /> <link rel="stylesheet" href="bower_components/Leaflet.Elevation/dist/Leaflet.Elevation-0.0.2.css" />
<link rel="stylesheet" href="bower_components/leaflet-search/dist/leaflet-search.min.css" /> <link rel="stylesheet" href="bower_components/leaflet-search/dist/leaflet-search.min.css" />
<link rel="stylesheet" href="css/leaflet-routing.css" /> <link rel="stylesheet" href="css/leaflet-routing.css" />
<link rel="stylesheet" href="bower_components/normalize-css/normalize.css" /> <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="css/style.css" /> <link rel="stylesheet" href="css/style.css" />
</head> </head>
<body> <body>
@ -80,6 +83,9 @@
<script src="bower_components/Leaflet.Elevation/src/L.Control.Elevation.js"></script> <script src="bower_components/Leaflet.Elevation/src/L.Control.Elevation.js"></script>
<script src="bower_components/async/lib/async.js"></script> <script src="bower_components/async/lib/async.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
<script> <script>
// global package prefix for BRouter web application // global package prefix for BRouter web application
BR = {}; BR = {};

2
js/plugin/Routing.js
View file

@ -33,7 +33,7 @@ BR.Routing = L.Routing.extend({
this._edit._mouseMarker.setIcon(L.divIcon({ this._edit._mouseMarker.setIcon(L.divIcon({
className: 'line-mouse-marker' className: 'line-mouse-marker'
,iconAnchor: [8, 8] // size/2 + border/2 ,iconAnchor: [8, 8] // size/2 + border/2
,iconSize: [8, 8] ,iconSize: [16, 16]
})); }));
this._draw.on('enabled', function() { this._draw.on('enabled', function() {