Skip to content

Commit

Permalink
Using one united json menu (lingonsaft#497)
Browse files Browse the repository at this point in the history
* Added a unified menu in JSON format

* Added the new menu to our html files

* Hotfix - added menu.js to index.html
  • Loading branch information
cnettelblad authored and BennyCarlsson committed Oct 6, 2018
1 parent 7ebf07b commit 8a79c6a
Show file tree
Hide file tree
Showing 9 changed files with 141 additions and 253 deletions.
34 changes: 3 additions & 31 deletions Fireworks.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,36 +33,8 @@
</button>

<div class="collapse navbar-collapse" id="navbarColor01">
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a class="nav-link" href="./index.html">Home</a>
</li>
<li class="nav-item active">
<a class="nav-link" href="./helpful-material.html">Helpful Material</a>
</li>
<li class="nav-item">
<a class="nav-link" href="./contributors.html">Contributors</a>
</li>
<li class="dropdown drop">
<a href="#" class="dropdown-toggle " data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Others
<span class="caret"></span></a>
<ul class="dropdown-menu">
<li class="nav-item"> <a class="nav-link-drop" href="https://cultofthepartyparrot.com/">PARROTS?!</a> </li>
<li class="nav-item"> <a class="nav-link-drop" id="twist" href="#">The twist</a> </li>
<li class="nav-item"> <a class="nav-link-drop" href="./potato.html">Potato</a> </li>
<li class="nav-item"> <a class="nav-link-drop" href="./cheese.html">Cheese!</a> </li>
<li class="nav-item "><a class="nav-link-drop" id="learn" href="./Fireworks.html">Fireworks</a></li>
<li class="nav-item"> <a class="nav-link-drop" href="./wow.html">Learn!</a> </li>
<li class="nav-item"> <a class="nav-link-drop" id="tools" href="./tools.html">Tools</a> </li>
<li class="nav-item"> <a class="nav-link-drop" href="./gifheaven.html">Gif heaven!</a> </li>
<li class="nav-item"><a class="nav-link-drop" href="./trylearnhowtoprogram.html">Program for newcomers to learn!</a></li>
<li class="nav-item"> <a class="nav-link-drop" href="./values.html">Values</a> </li>
<li class="nav-item"> <a class="nav-link-drop" href="./snek.html">SNEK!</a> </li>
<li class="nav-item"> <a class="nav-link-drop" href="./canoi.html">Canoi</a> </li>
<li class="nav-item"> <a class="nav-link" href="https://hacktoberfestchecker.herokuapp.com/">Hacktoberfest Checker</a> </li>
<li class="nav-item ml-lg-auto"> <a class="nav-link-drop" id="invert-btn" href="#">Invert</a> </li>
</ul>
</li>
<ul class="navbar-nav mr-auto" id="menu">
<!-- MENU -->
</ul>
</div>
</nav>
Expand Down Expand Up @@ -103,7 +75,7 @@
</a>
</div>
</footer>

<script src="./scripts/menu.js"></script>

</body>

Expand Down
32 changes: 3 additions & 29 deletions cheese.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,35 +32,8 @@
</button>

<div class="collapse navbar-collapse" id="navbarColor01">
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a class="nav-link" href="./index.html">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="./helpful-material.html">Helpful Material</a>
</li>
<li class="nav-item">
<a class="nav-link" href="./contributors.html">Contributors</a>
</li>
<li class="dropdown drop">
<a href="#" class="dropdown-toggle " data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Others
<span class="caret"></span></a>
<ul class="dropdown-menu">
<li class="nav-item"> <a class="nav-link-drop" href="https://cultofthepartyparrot.com/">PARROTS?!</a> </li>
<li class="nav-item"> <a class="nav-link-drop" id="twist" href="#">The twist</a> </li>
<li class="nav-item"> <a class="nav-link-drop" href="./potato.html">Potato</a> </li>
<li class="nav-item"> <a class="nav-link-drop" href="./cheese.html">Cheese!</a> </li>
<li class="nav-item "><a class="nav-link-drop" id="learn" href="/Fireworks">Fireworks</a></li>
<li class="nav-item"> <a class="nav-link-drop" href="./wow.html">Learn!</a> </li>
<li class="nav-item"> <a class="nav-link-drop" id="tools" href="./tools.html">Tools</a> </li>
<li class="nav-item"> <a class="nav-link-drop" href="./gifheaven.html">Gif heaven!</a> </li>
<li class="nav-item"><a class="nav-link-drop" href="./trylearnhowtoprogram.html">Program for newcomers to learn!</a></li>
<li class="nav-item"> <a class="nav-link-drop" href="./values.html">Values</a> </li>
<li class="nav-item"> <a class="nav-link-drop" href="./snek.html">SNEK!</a> </li>
<li class="nav-item"> <a class="nav-link-drop" href="./canoi.html">Canoi</a> </li>
<li class="nav-item ml-lg-auto"> <a class="nav-link-drop" id="invert-btn" href="#">Invert</a> </li>
</ul>
</li>
<ul class="navbar-nav mr-auto" id="menu">
<!-- Menu -->
</ul>


Expand Down Expand Up @@ -177,6 +150,7 @@ <h3><span id="toggle-social-btn">Social Links <i class="fa fa-arrow-up"></i></sp
</div>
</div>
</footer>
<script src="./scripts/menu.js"></script>

<button id="backToTop" type="button" title="Back to Top">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 511.189 511.189">
Expand Down
27 changes: 4 additions & 23 deletions contributors.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,29 +28,8 @@
<path class="st0" d="M0.7,0.7v298.7h298.7V0.7H0.7z M197.8,271.4l-32-32v-95.6l-31.4,31.4v79l-17.3,17.3L99.8,254V70.4L95,65.6 L73,87.7L61.7,76.5l47.8-47.8l0.1,0.1l0,0l1.9,1.8l22.8,22.8V136l31.4-31.4V70.2L150,54.4l25.8-25.8l24.7,24.7v169.1l12.1,12.1 l14.7-14.7l11.1,11.1L197.8,271.4z"></path>
</svg>
</a>
<ul class="top-nav--secondary">
<li><a href="./idex.html">Hacktoberfest</a></li>
<li><a href="./helpful-material.html">Helpful Material</a></li>
<li><a class="active" href="./contributors.html">Contributors</a></li>
<li class="dropdown drop">
<a href="#" class="dropdown-toggle " data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Others
<span class="caret"></span></a>
<ul class="dropdown-menu">
<li class="nav-item"> <a class="nav-link-drop" href="https://cultofthepartyparrot.com/">PARROTS?!</a> </li>
<li class="nav-item"> <a class="nav-link-drop" id="twist" href="#">The twist</a> </li>
<li class="nav-item"> <a class="nav-link-drop" href="./potato.html">Potato</a> </li>
<li class="nav-item"> <a class="nav-link-drop" href="./cheese.html">Cheese!</a> </li>
<li class="nav-item "><a class="nav-link-drop" id="learn" href="/Fireworks">Fireworks</a></li>
<li class="nav-item"> <a class="nav-link-drop" href="./wow.html">Learn!</a> </li>
<li class="nav-item"> <a class="nav-link-drop" id="tools" href="./tools.html">Tools</a> </li>
<li class="nav-item"> <a class="nav-link-drop" href="./gifheaven.html">Gif heaven!</a> </li>
<li class="nav-item"><a class="nav-link-drop" href="./trylearnhowtoprogram.html">Program for newcomers to learn!</a></li>
<li class="nav-item"> <a class="nav-link-drop" href="./values.html">Values</a> </li>
<li class="nav-item"> <a class="nav-link-drop" href="./snek.html">SNEK!</a> </li>
<li class="nav-item"> <a class="nav-link-drop" href="./canoi.html">Canoi</a> </li>
<li class="nav-item ml-lg-auto"> <a class="nav-link-drop" id="invert-btn" href="#">Invert</a> </li>
</ul>
</li>
<ul class="top-nav--secondary" id="menu">
<!-- Menu -->
</ul>
</nav>
</header>
Expand Down Expand Up @@ -206,6 +185,8 @@ <h1>Contributors <a href="https://github.com/lingonsaft/hacktoberfest">(Github r
</svg>
</a>

<script src="./scripts/menu.js"></script>

<button id="backToTop" type="button" title="Back to Top">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" width="512px" height="512px" viewBox="0 0 284.929 284.929" style="enable-background:new 0 0 284.929 284.929;" xml:space="preserve">
<g><path d="M282.082,195.285L149.028,62.24c-1.901-1.903-4.088-2.856-6.562-2.856s-4.665,0.953-6.567,2.856L2.856,195.285 C0.95,197.191,0,199.378,0,201.853c0,2.474,0.953,4.664,2.856,6.566l14.272,14.271c1.903,1.903,4.093,2.854,6.567,2.854 c2.474,0,4.664-0.951,6.567-2.854l112.204-112.202l112.208,112.209c1.902,1.903,4.093,2.848,6.563,2.848 c2.478,0,4.668-0.951,6.57-2.848l14.274-14.277c1.902-1.902,2.847-4.093,2.847-6.566 C284.929,199.378,283.984,197.188,282.082,195.285z" fill="#FFFFFF"/></g>
Expand Down
92 changes: 31 additions & 61 deletions helpful-material.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,46 +28,19 @@
<link rel="shortcut icon" href="./images/sh_icon.png" />

<body>
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
<a class="navbar-brand" href="./index.html">Hacktoberfest</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor01" aria-controls="navbarColor01"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarColor01">
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a class="nav-link" href="./index.html">Home</a>
</li>
<li class="nav-item active">
<a class="nav-link" href="./helpful-material.html">Helpful Material</a>
</li>
<li class="nav-item">
<a class="nav-link" href="./contributors.html">Contributors</a>
</li>
<li class="nav-item">
<a class="nav-link" id="twist" href="#">The twist</a>
</li>
<li class="nav-item">
<a class="nav-link" href="./cheese.html">Cheese!</a>
</li>
<li class="nav-item ">
<a class="nav-link" id="tools" href="./tools.html">Tools</a>
</li>
<li class="nav-item ">
<a class="nav-link" id="learn" href="./wow.html">Learn!</a>
</li>
</ul>
</div>
</nav>

<div class="heart"></div>

<div id="content" class="container">
<h2 class="mt-4">Projects</h2>
<p>Feel free to add any of your own projects.</p>
<h3 class="mt-4">Beginner Friendly Projects</h3>
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
<a class="navbar-brand" href="/">Hacktoberfest</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor01" aria-controls="navbarColor01"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarColor01">
<ul class="navbar-nav mr-auto" id="menu">
<!-- Menu -->
</ul>
</div>
</nav>

<div class="list beginnerProjects">
<a data-difficulty="1" href="https://github.com/publiclab/plots2" target="_blank" class="list-item easyProjectItem">public lab</a>
Expand Down Expand Up @@ -248,27 +221,24 @@ <h2 class="mt-4">Guides</h2>
</div>
</footer>

<button id="backToTop" type="button" title="Back to Top">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" width="512px" height="512px" viewBox="0 0 284.929 284.929" style="enable-background:new 0 0 284.929 284.929;" xml:space="preserve">
<g><path d="M282.082,195.285L149.028,62.24c-1.901-1.903-4.088-2.856-6.562-2.856s-4.665,0.953-6.567,2.856L2.856,195.285 C0.95,197.191,0,199.378,0,201.853c0,2.474,0.953,4.664,2.856,6.566l14.272,14.271c1.903,1.903,4.093,2.854,6.567,2.854 c2.474,0,4.664-0.951,6.567-2.854l112.204-112.202l112.208,112.209c1.902,1.903,4.093,2.848,6.563,2.848 c2.478,0,4.668-0.951,6.57-2.848l14.274-14.277c1.902-1.902,2.847-4.093,2.847-6.566 C284.929,199.378,283.984,197.188,282.082,195.285z" fill="#FFFFFF"/></g>
</svg>
</button>

<!-- Latest compiled JavaScript -->
<script src="./scripts/scroll.js"></script>
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy"
crossorigin="anonymous"></script>
<script type="text/javascript" src="https://unpkg.com/[email protected]/dist/aos.js"></script>
<script type="application/javascript" charset="utf-8" src="register.js"></script>
<script type="application/javascript" charset="utf-8" src="sw.js"></script>
<script src="./scripts/helpful-material.js"></script>

<script>
AOS.init();
</script>

<button id="backToTop" type="button" title="Back to Top">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 511.189 511.189"><g fill="#ff0844"><path d="M364.858 157.935l-98.59-145.28c-8.547-12.586-22.158-12.331-30.25.526l-90.88 144.228c-8.093 12.857-2.56 23.381 12.302 23.381h26.639v50.148c0 15.7 12.742 28.445 28.445 28.445h85.333c15.73 0 28.445-12.743 28.445-28.445V180.79h27.008c14.875 0 20.109-10.269 11.547-22.855M51.115 338.627H19.641C5.774 338.627 0 328.502 0 318.702c0-10.097 7.225-19.91 19.641-19.91h106.226c12.43 0 19.655 9.813 19.655 19.91 0 9.8-5.773 19.925-19.655 19.925h-31.46v144.91c0 14.45-9.23 22.528-21.646 22.528s-21.646-8.079-21.646-22.527v-144.91zM300.559 401.561c0-34.93-18.19-66.417-54.273-66.417-36.096 0-54.286 31.487-54.286 66.417 0 35.214 17.621 66.389 54.286 66.389s54.273-31.175 54.273-66.389m-153.587 0c0-60.046 40.406-106.253 99.314-106.253 58.013 0 99.3 47.658 99.3 106.253 0 59.748-40.121 106.254-99.3 106.254-58.61 0-99.314-46.506-99.314-106.254M406.983 398.091h29.453c18.177 0 29.71-13.284 29.71-30.592 0-17.338-11.534-30.62-29.71-30.62h-29.453v61.212zm-43.32-76.786c0-13.582 8.092-22.5 22.542-22.5h51.073c42.453 0 73.912 27.691 73.912 68.978 0 42.14-32.611 68.422-72.164 68.422h-32.042v47.346c0 14.435-9.23 22.528-21.633 22.528-12.445 0-21.688-8.093-21.688-22.528V321.305z"/></g></svg>
</button>

<script src="./scripts/menu.js"></script>

<!-- Latest compiled JavaScript -->
<script src="./scripts/scroll.js"></script>
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
<script type="text/javascript" src="https://unpkg.com/[email protected]/dist/aos.js"></script>
<script type="application/javascript" charset="utf-8" src="register.js"></script>
<script type="application/javascript" charset="utf-8" src="sw.js"></script>
<script src="./scripts/helpful-material.js"></script>

<script>
AOS.init();
</script>
</body>

</html>
Loading

0 comments on commit 8a79c6a

Please sign in to comment.