add Bootstrap:

- 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

View file

@ -2,6 +2,8 @@
<html>
<head>
<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>
<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-search/dist/leaflet-search.min.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" />
</head>
<body>
@ -80,6 +83,9 @@
<script src="bower_components/Leaflet.Elevation/src/L.Control.Elevation.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>
// global package prefix for BRouter web application
BR = {};