Skip to content

Commit

Permalink
Merge develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Tsuna-mi committed Mar 31, 2018
2 parents 2717d99 + deff508 commit 35a976d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dist/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="author" content="Ana Gamito"><meta name="description" content="Restaurant Reviews App for Udacity Mobile Web Specialist Nanodegree"><meta name="keywords" content="restaurant, responsive, accessible, offline, offline-first, udacity, google, nanodegree"><meta name="theme-color" content="#ffa500"><title>Restaurant Reviews</title><!--[if IE]><link rel="shortcut icon" href="./assets/img/favicon.ico"><![endif]--><link rel="icon" href="./assets/img/favicon.png"><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.0/normalize.min.css"><link rel="stylesheet" href="./assets/css/styles.css"><link rel="manifest" href="./manifest.json"></head><body><header><a href="#filter" class="skip-link">Skip to Filter Section→</a><nav><h1><a href="/">Restaurant Reviews</a></h1></nav></header><main class="maincontent" aria-label="content"><section class="map-container"><div class="map" id="map" aria-hidden="true" role="application" tabindex="-1"></div></section><section id="filter" tabindex="-1" role="search"><div class="filter-options"><h2>Filter Results</h2><div class="filter"><label for="neighborhoods-select">Select neighborhood:</label> <select id="neighborhoods-select" name="neighborhoods" onchange="updateRestaurants()"><option value="all">All Neighborhoods</option></select> <label for="cuisines-select">Select cuisine:</label> <select id="cuisines-select" name="cuisines" onchange="updateRestaurants()"><option value="all">All Cuisines</option></select></div></div><ul class="cards flex-layout" id="restaurants-list" role="list"></ul></section></main><footer class="footer">Copyright (c) 2018 <a href="/"><strong>Restaurant Reviews</strong></a> All Rights Reserved.</footer><script charset="utf-8" src="js/registerSW.js"></script><script charset="utf-8" src="js/dbhelper.js"></script><script charset="utf-8" src="js/main.js"></script><script async defer="defer" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBnvFIs5H8nHN4bXNVbcnhfV-sfEUgErj8&libraries=places&callback=initMap" async defer="defer"></script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="author" content="Ana Gamito"><meta name="description" content="Restaurant Reviews App for Udacity Mobile Web Specialist Nanodegree"><meta name="keywords" content="restaurant, responsive, accessible, offline, offline-first, udacity, google, nanodegree"><meta name="theme-color" content="#ffa500"><title>Restaurant Reviews</title><!--[if IE]><link rel="shortcut icon" href="./assets/img/favicon.ico"><![endif]--><link rel="icon" href="./assets/img/favicon.png"><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.0/normalize.min.css"><link rel="stylesheet" href="./assets/css/styles.css"><link rel="manifest" href="./manifest.json"></head><body><header><a href="#filter" class="skip-link">Skip to Filter Section→</a><nav><h1><a href="./index.html">Restaurant Reviews</a></h1></nav></header><main class="maincontent" aria-label="content"><section class="map-container"><div class="map" id="map" aria-hidden="true" role="application" tabindex="-1"></div></section><section id="filter" tabindex="-1" role="search"><div class="filter-options"><h2>Filter Results</h2><div class="filter"><label for="neighborhoods-select">Select neighborhood:</label> <select id="neighborhoods-select" name="neighborhoods" onchange="updateRestaurants()"><option value="all">All Neighborhoods</option></select> <label for="cuisines-select">Select cuisine:</label> <select id="cuisines-select" name="cuisines" onchange="updateRestaurants()"><option value="all">All Cuisines</option></select></div></div><ul class="cards flex-layout" id="restaurants-list" role="list"></ul></section></main><footer class="footer">Copyright (c) 2018 <a href="./index.html"><strong>Restaurant Reviews</strong></a> All Rights Reserved.</footer><script charset="utf-8" src="js/registerSW.js"></script><script charset="utf-8" src="js/dbhelper.js"></script><script charset="utf-8" src="js/main.js"></script><script async defer="defer" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBnvFIs5H8nHN4bXNVbcnhfV-sfEUgErj8&libraries=places&callback=initMap" async defer="defer"></script></body></html>
2 changes: 1 addition & 1 deletion dist/restaurant.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="author" content="Ana Gamito"><meta name="description" content="Restaurant Reviews App for Udacity Mobile Web Specialist Nanodegree"><meta name="keywords" content="restaurant, responsive, accessible, offline, offline-first, udacity, google, nanodegree"><meta name="theme-color" content="#ffa500"><title>Restaurant Info</title><!--[if IE]><link rel="shortcut icon" href="./assets/img/favicon.ico"><![endif]--><link rel="icon" href="./assets/img/favicon.png"><!-- Normalize.css for better cross-browser consistency --><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.0/normalize.min.css"><!-- Main CSS file --><link rel="stylesheet" href="./assets/css/styles.css"><link rel="manifest" href="./manifest.json"></head><body class="inside"><!-- Beginning header --><header><a href="#restaurant-container" class="skip-link">Skip to Maincontent →</a><!-- Beginning nav --><nav><h1><a href="/">Restaurant Reviews</a></h1></nav><!-- Beginning breadcrumb --><ul class="breadcrumb" id="breadcrumb" aria-label="breadcrumbs" role="navigation"><li><a href="/">Home</a></li></ul><!-- End breadcrumb --><!-- End nav --></header><!-- End header --><!-- Beginning main --><main class="maincontent" aria-label="content"><!-- Beginning map --><section class="map-container review"><div class="map" id="map" aria-hidden="true" role="application" tabindex="-1"></div></section><!-- End map --><!-- Beginning restaurant --><section class="restaurant-container" id="restaurant-container" tabindex="-1" role="contentinfo"><h2 class="restaurant-name" id="restaurant-name"></h2><div class="card__img rounded" id="restaurant-detail"><img id="restaurant-img"><p class="restaurant-cuisine fade-caption" id="restaurant-cuisine"></p></div><p class="restaurant-address" id="restaurant-address"></p><table class="restaurant-hours" id="restaurant-hours" summary="Information about Restaurant opening hours"></table></section><!-- end restaurant --><!-- Beginning reviews --><section class="reviews-container" id="reviews-container"><ul class="reviews-list flex-layout" id="reviews-list"></ul></section><!-- End reviews --></main><!-- End main --><!-- Beginning footer --><footer class="footer">Copyright (c) 2018 <a href="/"><strong>Restaurant Reviews</strong></a> All Rights Reserved.</footer><!-- End footer --><!-- Beginning scripts --><!-- Register Service Worker --><script charset="utf-8" src="js/registerSW.js"></script><!-- Database helpers --><script src="./js/dbhelper.js"></script><!-- Main javascript file --><script src="./js/restaurant_info.js"></script><!-- Google Maps --><script async defer="defer" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBnvFIs5H8nHN4bXNVbcnhfV-sfEUgErj8&libraries=places&callback=initMap" async defer="defer"></script><!-- End scripts --></body></html>
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="author" content="Ana Gamito"><meta name="description" content="Restaurant Reviews App for Udacity Mobile Web Specialist Nanodegree"><meta name="keywords" content="restaurant, responsive, accessible, offline, offline-first, udacity, google, nanodegree"><meta name="theme-color" content="#ffa500"><title>Restaurant Info</title><!--[if IE]><link rel="shortcut icon" href="./assets/img/favicon.ico"><![endif]--><link rel="icon" href="./assets/img/favicon.png"><!-- Normalize.css for better cross-browser consistency --><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.0/normalize.min.css"><!-- Main CSS file --><link rel="stylesheet" href="./assets/css/styles.css"><link rel="manifest" href="./manifest.json"></head><body class="inside"><!-- Beginning header --><header><a href="#restaurant-container" class="skip-link">Skip to Maincontent →</a><!-- Beginning nav --><nav><h1><a href="./index.html">Restaurant Reviews</a></h1></nav><!-- Beginning breadcrumb --><ul class="breadcrumb" id="breadcrumb" aria-label="breadcrumbs" role="navigation"><li><a href="./index.html">Home</a></li></ul><!-- End breadcrumb --><!-- End nav --></header><!-- End header --><!-- Beginning main --><main class="maincontent" aria-label="content"><!-- Beginning map --><section class="map-container review"><div class="map" id="map" aria-hidden="true" role="application" tabindex="-1"></div></section><!-- End map --><!-- Beginning restaurant --><section class="restaurant-container" id="restaurant-container" tabindex="-1" role="contentinfo"><h2 class="restaurant-name" id="restaurant-name"></h2><div class="card__img rounded" id="restaurant-detail"><img id="restaurant-img"><p class="restaurant-cuisine fade-caption" id="restaurant-cuisine"></p></div><p class="restaurant-address" id="restaurant-address"></p><table class="restaurant-hours" id="restaurant-hours" summary="Information about Restaurant opening hours"></table></section><!-- end restaurant --><!-- Beginning reviews --><section class="reviews-container" id="reviews-container"><ul class="reviews-list flex-layout" id="reviews-list"></ul></section><!-- End reviews --></main><!-- End main --><!-- Beginning footer --><footer class="footer">Copyright (c) 2018 <a href="./index.html"><strong>Restaurant Reviews</strong></a> All Rights Reserved.</footer><!-- End footer --><!-- Beginning scripts --><!-- Register Service Worker --><script charset="utf-8" src="js/registerSW.js"></script><!-- Database helpers --><script src="./js/dbhelper.js"></script><!-- Main javascript file --><script src="./js/restaurant_info.js"></script><!-- Google Maps --><script async defer="defer" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBnvFIs5H8nHN4bXNVbcnhfV-sfEUgErj8&libraries=places&callback=initMap" async defer="defer"></script><!-- End scripts --></body></html>
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<header>
<a href="#filter" class="skip-link">Skip to Filter Section→</a>
<nav>
<h1><a href="/">Restaurant Reviews</a></h1>
<h1><a href="./index.html">Restaurant Reviews</a></h1>
</nav>
</header>

Expand All @@ -47,7 +47,7 @@ <h2>Filter Results</h2>
</main>

<footer class="footer">
Copyright (c) 2018 <a href="/"><strong>Restaurant Reviews</strong></a> All Rights Reserved.
Copyright (c) 2018 <a href="./index.html"><strong>Restaurant Reviews</strong></a> All Rights Reserved.
</footer>
<script charset="utf-8" src="js/registerSW.js"></script>
<script charset="utf-8" src="js/dbhelper.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions restaurant.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
<a href="#restaurant-container" class="skip-link">Skip to Maincontent →</a>
<!-- Beginning nav -->
<nav>
<h1><a href="/">Restaurant Reviews</a></h1>
<h1><a href="./index.html">Restaurant Reviews</a></h1>
</nav>
<!-- Beginning breadcrumb -->
<ul class="breadcrumb" id="breadcrumb" aria-label="breadcrumbs" role="navigation">
<li><a href="/">Home</a></li>
<li><a href="./index.html">Home</a></li>
</ul>
<!-- End breadcrumb -->
<!-- End nav -->
Expand Down Expand Up @@ -63,7 +63,7 @@ <h2 class="restaurant-name" id="restaurant-name"></h2>

<!-- Beginning footer -->
<footer class="footer">
Copyright (c) 2018 <a href="/"><strong>Restaurant Reviews</strong></a> All Rights Reserved.
Copyright (c) 2018 <a href="./index.html"><strong>Restaurant Reviews</strong></a> All Rights Reserved.
</footer>
<!-- End footer -->

Expand Down

0 comments on commit 35a976d

Please sign in to comment.