Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Zoom and slider #13

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Zoom and slider #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e2c127
Branch set up with assets
meghankelly-cartography Apr 19, 2016
a34fde9
Zoom functional but only in Firefox (?)
meghankelly-cartography Apr 19, 2016
b7d8765
Constrained zoom.
meghankelly-cartography Apr 19, 2016
442c37f
Attempted to link slider to base map
meghankelly-cartography Apr 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 86 additions & 0 deletions main/css/d3.slider.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
.d3-slider {
position: relative;
font-family: Verdana,Arial,sans-serif;
font-size: 1.1em;
border: 1px solid #aaaaaa;
z-index: 2;
}

.d3-slider-horizontal {
height: .8em;
}

.d3-slider-range {
background:#2980b9;
left:0px;
right:0px;
height: 0.8em;
position: absolute;
}

.d3-slider-range-vertical {
background:#2980b9;
left:0px;
right:0px;
position: absolute;
top:0;
}

.d3-slider-vertical {
width: .8em;
height: 100px;
}

.d3-slider-handle {
position: absolute;
width: 1.2em;
height: 1.2em;
border: 1px solid #d3d3d3;
border-radius: 4px;
background: #eee;
background: linear-gradient(to bottom, #eee 0%, #ddd 100%);
z-index: 3;
}

.d3-slider-handle:hover {
border: 1px solid #999999;
}

.d3-slider-horizontal .d3-slider-handle {
top: -.3em;
margin-left: -.6em;
}

.d3-slider-axis {
position: relative;
z-index: 1;
}

.d3-slider-axis-bottom {
top: .8em;
}

.d3-slider-axis-right {
left: .8em;
}

.d3-slider-axis path {
stroke-width: 0;
fill: none;
}

.d3-slider-axis line {
fill: none;
stroke: #aaa;
shape-rendering: crispEdges;
}

.d3-slider-axis text {
font-size: 11px;
}

.d3-slider-vertical .d3-slider-handle {
left: -.25em;
margin-left: 0;
margin-bottom: -.6em;
}
82 changes: 75 additions & 7 deletions main/css/style.css
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
}

.countries_1783{
fill: gray;
stroke: black;
fill: #d7c7ad;
stroke: #766951;
stroke-width: .5px;
}

.countries_1815{
fill: gray;
stroke: black;
fill: #d7c7ad;
stroke: #766951;
stroke-width: .5px;
}

Expand All @@ -29,13 +29,81 @@

.dropdown {
position: absolute;
top: 40px;
left: 425px;
top: 80px;
left: 20px;
z-index: 10;
font-family: baskerville;
font-size: 1em;
font-weight: bold;
padding: 2px;
border: 1px solid #999;
box-shadow: 2px 2px 4px #999;
}
}

.dropdownProjections{
position: absolute;
top: 130px;
left: 20px;
z-index: 10;
font-family: baskerville;
font-size: 1em;
font-weight: bold;
padding: 2px;
border: 1px solid #999;
box-shadow: 2px 2px 4px #999;
}

#controls{
height: 10%;;
}

#slider{
padding-top: 100px;

}

#map {
height: 90%;
}

body {
background-color: white;
font-size: 14px;
font-family: 'Raleway', sans-serif;
}

p {
color: white;
margin: 50px;
}

a {
color: #4FDEF2;
}

.axis {
fill: gray;
-webkit-user-select: none;
-moz-user-select: none;
user-select: none;
}

.axis .halo {
stroke: gray;
stroke-width: 4px;
stroke-linecap: round;
}

.slider .handle path {
stroke: black;
stroke-width: 3px;
stroke-linecap: round;
pointer-events: none;
}

.slider .handle text {
fill: gray;
text-align: center;
font-size: 18px;
}

Empty file modified main/data/land.topojson
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified main/data/prepros.cfg
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified main/data/worldCountries.topojson
100644 → 100755
View file
Open in desktop
Empty file.
56 changes: 34 additions & 22 deletions main/index.html
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,41 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<title>Wooden Ships</title>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<title>Wooden Ships</title>
<!-- Bootstrap -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">

<!-- Optional theme -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css" integrity="sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r" crossorigin="anonymous">

<!--put your external stylesheet links here-->
<link rel="stylesheet" href="css/d3.slider.css"/>
<link rel="stylesheet" href="css/style.css"/>

<!--put your external stylesheet links here-->
<link rel="stylesheet" href="css/style.css"/>
<!--[if IE<9]>
<link rel="stylesheet" href="css/style.ie.css">
<![endif]-->
</head>
</head>

<body>
<body>

<h2>Wooden Ships</h2>

<!--My Libraries-->
<script type="text/javascript" src="lib/d3.min.js"></script>
<script type="text/javascript" src="lib/d3-queue.v2.min.js"></script>
<script type="text/javascript" src="lib/topojson.v1.min.js"></script>
<script type="text/javascript" src="lib/d3.geo.projection.min.js"></script>
<script type="text/javascript" src="lib/underscore-min.js"></script>
<div id='controls' class='row'></div> <!-- dropdowns go here-->
<div id='slider' class='row'></div> <!-- time slider goes here-->
<div id='map' class='row'></div><!-- map goes here-->

<!--My Libraries-->
<!-- Latest compiled and minified JavaScript -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>

<script type="text/javascript" src="lib/d3.min.js"></script>
<script type="text/javascript" src="lib/d3-queue.v2.min.js"></script>
<script type="text/javascript" src="lib/topojson.v1.min.js"></script>
<script type="text/javascript" src="lib/d3.geo.projection.min.js"></script>
<script type="text/javascript" src="lib/underscore-min.js"></script>
<script type="text/javascript" src="lib/d3.slider.js"></script>

<!--My Script-->
<script type="text/javascript" src="js/main.js"></script>
</body>
</html>
<!--My Script-->
<script type="text/javascript" src="js/main.js"></script>
</body>
</html>
Loading