Skip to content

Commit

Permalink
redesigned front page and readded title to map
Browse files Browse the repository at this point in the history
  • Loading branch information
pat committed Apr 5, 2018
1 parent 0884976 commit 120cb3b
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 60 deletions.
2 changes: 1 addition & 1 deletion css/cover.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,6 @@ body {
.masthead,
.mastfoot,
.cover-container {
width: 700px;
width: 100%;
}
}
4 changes: 2 additions & 2 deletions css/starter-template.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ body {
margin-right: 1.0rem;
}
#map{
height:90vh;
height:50vh;
}
.legend {
padding: 6px 8px;
Expand All @@ -38,4 +38,4 @@ body {
box-shadow: 0 0 15px rgba(0,0,0,0.2);
border-radius: 5px;
color: #555;
}
}
118 changes: 65 additions & 53 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
<!-- Custom styles for this template -->
<link href="css/cover.css" rel="stylesheet">
<link href="css/starter-template.css" rel="stylesheet">
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.1/dist/leaflet.css"
integrity="sha512-Rksm5RenBEKSKFjgI3a41vrjkw4EVPlJ3+OiI65vTjIdo9brlAacEuKOiQ5OFh7cOI1bkDwLqdLw3Zg0cRJAAQ=="
crossorigin=""/>
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
Expand All @@ -32,61 +35,66 @@

<div class="site-wrapper-inner">

<div class="cover-container">
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container">
<div class="nav navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html">Patrick Noll</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<!--<ul class="nav navbar-nav">
<li class="active"><a href="index.html">Home</a></li>
<li><a href="design.html">Design</a></li>
<li><a href="stress analysis.html">Stress Analysis</a></li>
<li><a href="3d modeling.html">3D Modeling</a></li>
<li><a href="programming.html">Programming</a></li>
<li><a href="work history.html">Work History</a></li>
</ul> -->
</div><!--/.nav-collapse -->
</div>
</nav>


<div class="inner cover">
<div class="starter-template">
<div class="row">
<div class="col-sm-6">
<a href="software.html" class="thumbnail">
<img class="img-responsive" src="images/Konsole_icon.svg" alt="..." width="82%">
<div class="caption"> <h3>Software</h3></div>
</a>
</div>
<div class="col-sm-6">
<a href="design.html" class="thumbnail">
<img class="img-responsive" src="images/GEARS.svg" alt="...">

<div class="caption"> <h3>Mechanical</h3></div>
</a>
</div>
<div class="container">
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container">
<div class="nav navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html">Patrick Noll</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<!--<ul class="nav navbar-nav">
<li class="active"><a href="index.html">Home</a></li>
<li><a href="design.html">Design</a></li>
<li><a href="stress analysis.html">Stress Analysis</a></li>
<li><a href="3d modeling.html">3D Modeling</a></li>
<li><a href="programming.html">Programming</a></li>
<li><a href="work history.html">Work History</a></li>
</ul> -->
</div><!--/.nav-collapse -->
</div>
</nav>


</div>
</div>
</div>
<div class="mastfoot">
<div class="inner">
<p>Contact me via <a href="mailto:patricknoll.com@respectmyprivacy.com">email</a> or <a href="https://www.linkedin.com/in/patricknoll">LinkedIn</a><br>
Work examples are mainly personal or non-profit projects due to NDAs with employers.</p>
<div class="inner cover">
<div class="starter-template">
<div class="row">
<div class="col-sm-6">
<h3></h3>
<h3>Latest</h3>
First Pull Request merged for Lib.reviews<br>
<h3>Contact</h3>
<a href="mailto:patricknoll.com@respectmyprivacy.com">Email</a><br>
<a href="https://www.linkedin.com/in/patricknoll">LinkedIn</a><br>
<a href="https://github.com/pnoll1">Github</a><br>
<a href="https://www.openstreetmap.org/user/patrick noll">OpenStreetMap</a><br>
</div>
<div class="col-sm-6" id="map">
</div>
</div>
<h2>Portfolios</h2>
<div class="row">
<div class="col-sm-6">
<a href="software.html" class="thumbnail">
<img class="img-responsive" src="images/Konsole_icon.svg" alt="..." width="45%">
<div class="caption"> <h3>Software</h3></div>
</a>
</div>
<div class="col-sm-6">
<a href="design.html" class="thumbnail">
<img class="img-responsive" src="images/GEARS.svg" alt="..." width="55%">
<div class="caption"> <h3>Mechanical</h3></div>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- <button type="button" class="btn btn-default btn-lg">
<span class="glyphicon glyphicon-console" ></span> Software
Expand All @@ -99,6 +107,10 @@
<!-- Placed at the end of the document so the pages load faster -->
<script src="js/jquery.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="https://unpkg.com/leaflet@1.3.1/dist/leaflet.js"
integrity="sha512-/Nsx9X4HebavoBvEBuyp3I7od5tA0UzAxs+j83KgC8PU0kgB4XiK4Lfe4y4cgBtaRJQEIFCW+oC506aPT2L1zw=="
crossorigin=""></script>
<script src="js/map.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="js/ie10-viewport-bug-workaround.js"></script>
</body>
Expand Down
8 changes: 4 additions & 4 deletions js/map.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ $.getJSON('edits.geojson',function (data) {
featureCount = data.features.length.toString();
var controls_layers = L.control.layers(baselayers, overlays);
controls_layers.addTo(mymap);
legend.addTo(mymap);
counter.addTo(mymap);
});
/*

var legend = L.control({position: 'bottomright'});
legend.onAdd = function (mymap) {
var div = L.DomUtil.create('div', 'legend');
div.innerHTML = 'OSM Edits';
div.innerHTML = 'OSM Last Touched Edits';
return div;
};
legend.addTo(mymap);
*/

var counter = L.control({position: 'bottomright'});
counter.onAdd = function(mymap) {
var divCounter = L.DomUtil.create('div', 'counter');
Expand Down

0 comments on commit 120cb3b

Please sign in to comment.