Permalink
Browse files

Upgrade Mapbox and prepare for staging

  • Loading branch information...
nickmcintyre committed Aug 28, 2017
1 parent bc4eaeb commit f4847d0ce2406cf0f5cd1b3a2cd4967e32357eb9
View
@@ -0,0 +1,4 @@
.DS_Store
.vagrant
*.log
CNAME
View
21 LICENSE
@@ -0,0 +1,21 @@
MIT License
Copyright (c) 2017 OpenStreetMap India, Tailwind Labs LLC, Marine Weather and Climate LLC
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
View

This file was deleted.

Oops, something went wrong.
View
@@ -0,0 +1,26 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = "2"
$script = <<SCRIPT
sudo apt-get update -y
sudo apt-get upgrade -y
pushd /home/ubuntu
mkdir .local
curl -o node.tar.xz https://nodejs.org/dist/v6.10.2/node-v6.10.2-linux-x64.tar.xz
tar xf node.tar.xz -C .local --strip-components=1
rm node.tar.xz
npm install -g surge
popd
SCRIPT
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "ubuntu/xenial64"
config.vm.provider "virtualbox" do |vb|
vb.cpus = 2
vb.memory = 2048
end
config.vm.provision "shell", inline: $script, privileged: false
end
View
Binary file not shown.
View
Binary file not shown.
View
BIN apple-touch-icon.png 100755 → 100644
Binary file not shown.
View
7 browserconfig.xml 100755 → 100644
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Please read: https://msdn.microsoft.com/en-us/library/ie/dn455106.aspx -->
<browserconfig>
<msapplication>
<tile>
<square70x70logo src="tile.png"/>
<square150x150logo src="tile.png"/>
<wide310x150logo src="tile-wide.png"/>
<square310x310logo src="tile.png"/>
<square150x150logo src="/mstile-150x150.png"/>
<TileColor>#da532c</TileColor>
</tile>
</msapplication>
</browserconfig>
View
@@ -24,7 +24,7 @@ h1 {
overflow: hidden;
}
@media only screen and (max-width: 620px) {
@media only screen and (max-width: 670px) {
#sidebar {
display: none;
}

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
@@ -3,13 +3,19 @@
<head>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title>Flood Maps</title>
<meta name="description" content="">
<title>Galveston Flood Map</title>
<meta name="description" content="Crowdsourced flood mapping from the U-Flood project.">
<meta name='viewport' content='initial-scale=1,maximum-scale=1,user-scalable=no' />
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/manifest.json">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
<meta name="theme-color" content="#ffffff">
<link href="https://www.mapbox.com/base/latest/base.css" rel="stylesheet">
<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.4/mapbox-gl.js'></script>
<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.4/mapbox-gl.css' rel='stylesheet' />
<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.15.0/mapbox-gl.js'></script>
<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.15.0/mapbox-gl.css' rel='stylesheet' />
<link rel="stylesheet" href="../css/normalize.css">
<link rel="stylesheet" href="../css/main.css">
<link rel="stylesheet" href="../css/mCustomScrollbar.min.css">
@@ -27,13 +33,13 @@
<div id='sidebar' class='pin-left col3 pad2 dark fill-navy'>
<h1>U-Flood</h1>
<h2><a href='.'>Street Map</a></h2>
<h1><a href='/'>U-Flood</a></h1>
<h2>Street Map</h2>
<p>
<strong>
<span id="feature-count">...</span>
</strong> inundated roads reported</p>
<p>This is a crowdsourced effort to map inundated roads in Houston. Report a flooded (or cleared) street by zooming into the map and clicking it. All the data is <a href="https://github.com/tailwindlabs/flood-map">open</a>.</p>
<p>This is a crowdsourced effort to map inundated roads in Galveston. Report a flooded (or cleared) street by zooming into the map and clicking it. All the data is <a href="https://github.com/tailwindlabs/flood-map">open</a>.</p>
<p>Big thanks to OpenStreetMap India for the code!</p>
@@ -67,10 +73,8 @@ <h5>Highlight <a href="#" class="truncate strong bloxk small" onclick='mapHighli
</div>
<span id='map-query'></span>
<div class="pad2 col8 space-bottom2 dark" style="position: absolute; z-index: 1000; bottom: 0; right: 0">
<div id="copy" class="pad2 fill-darken3 round prose prose-big col12" style="display: block;">Help the community track flooding problems by contributing to this map. <a href="https://github.com/tailwindlabs/flood-map">Learn more</a>.</div>
<div id="copy" class="pad2 fill-darken3 round prose col12" style="display: block;">Zoom in to your street, click and help the community track flooding problems. <a href="https://github.com/tailwindlabs/flood-map/blob/gh-pages/README.md">Learn more</a>.</div>
</div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
View
@@ -3,13 +3,19 @@
<head>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title>Flood Maps</title>
<meta name="description" content="">
<title>Houston Flood Map</title>
<meta name="description" content="Crowdsourced flood mapping from the U-Flood project.">
<meta name='viewport' content='initial-scale=1,maximum-scale=1,user-scalable=no' />
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/manifest.json">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
<meta name="theme-color" content="#ffffff">
<link href="https://www.mapbox.com/base/latest/base.css" rel="stylesheet">
<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.4/mapbox-gl.js'></script>
<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.4/mapbox-gl.css' rel='stylesheet' />
<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.15.0/mapbox-gl.js'></script>
<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.15.0/mapbox-gl.css' rel='stylesheet' />
<link rel="stylesheet" href="../css/normalize.css">
<link rel="stylesheet" href="../css/main.css">
<link rel="stylesheet" href="../css/mCustomScrollbar.min.css">
@@ -27,8 +33,8 @@
<div id='sidebar' class='pin-left col3 pad2 dark fill-navy'>
<h1>U-Flood</h1>
<h2><a href='.'>Street Map</a></h2>
<h1><a href='/'>U-Flood</a></h1>
<h2>Street Map</h2>
<p>
<strong>
<span id="feature-count">...</span>
@@ -67,10 +73,8 @@ <h5>Highlight <a href="#" class="truncate strong bloxk small" onclick='mapHighli
</div>
<span id='map-query'></span>
<div class="pad2 col8 space-bottom2 dark" style="position: absolute; z-index: 1000; bottom: 0; right: 0">
<div id="copy" class="pad2 fill-darken3 round prose prose-big col12" style="display: block;">Help the community track flooding problems by contributing to this map. <a href="https://github.com/tailwindlabs/flood-map">Learn more</a>.</div>
<div id="copy" class="pad2 fill-darken3 round prose col12" style="display: block;">Zoom in to your street, click and help the community track flooding problems. <a href="https://github.com/tailwindlabs/flood-map/blob/gh-pages/README.md">Learn more</a>.</div>
</div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
View
No changes.
View
Binary file not shown.
View
Binary file not shown.
View
@@ -1,19 +1,25 @@
<!doctype html>
<html class="no-js" lang="">
<html class="no-js" lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title>Flood Maps</title>
<meta name="description" content="">
<title>U-Flood Maps</title>
<meta name="description" content="Crowdsourced flood mapping from the U-Flood Project">
<meta name='viewport' content='initial-scale=1,maximum-scale=1,user-scalable=no' />
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/manifest.json">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
<meta name="theme-color" content="#ffffff">
<link href="https://www.mapbox.com/base/latest/base.css" rel="stylesheet">
<link rel="stylesheet" href="css/normalize.css">
<link rel="stylesheet" href="css/main.css">
<script src="js/vendor/modernizr-2.8.3.min.js"></script>
<style>
html{
background-image: url('img/background.jpeg');
background-image: url('img/background.jpg');
background-repeat: no-repeat;
}
body{
@@ -31,7 +37,7 @@
<!-- Content -->
<div class='limiter'>
<h1 class='fancy'>Flood Maps</h1>
<h1 class='fancy'>U-Flood Maps</h1>
<div class='col12 clearfix space-bottom4'>
@@ -44,7 +50,7 @@ <h2>Houston</h3>
<div class='col6 pad2 prose dark fill-navy keyline-right'>
<h2>Galveston</h3>
<p>The island is currently being flooded by rains from Hurricane Harvey.</p>
<a class='button stroke' href='/galveston/index.html'>View Map</a>
<a class='button stroke' href='/galveston/'>View Map</a>
</div>
</div>
Oops, something went wrong.

0 comments on commit f4847d0

Please sign in to comment.