Skip to content

Commit

Permalink
Code clean-up
Browse files Browse the repository at this point in the history
  • Loading branch information
Kate Lovett committed Aug 24, 2018
1 parent 7e9c8ba commit 23b22f5
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 68 deletions.
63 changes: 0 additions & 63 deletions app/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,7 @@ h1, h2, h3, h4, h5, h6 {
hr {
width:80%;
}
/*article, aside, canvas, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
display: block;
}*/
#maincontent {
/*background-color: #f3f3f3;*/
min-height: 100%;
}
#footer {
Expand All @@ -63,7 +59,6 @@ nav {
nav h1 {
margin: auto;
padding: 15px;
/*max-width:900px;*/
}
nav h1 a {
color: #fff;
Expand All @@ -78,27 +73,22 @@ nav h1 a {
background-color: #eee;
font-size: 14px;
margin: 0;
/*max-width: 900px*/
}

/* Display list items side by side */
#breadcrumb li {
display: inline;
}

/* Add a slash symbol (/) before/behind each list item */
#breadcrumb li+li:before {
padding: 8px;
color: black;
content: "/\00a0";
}

/* Add a color to all links inside the list */
#breadcrumb li a {
color: #024C92;
text-decoration: none;
}

/* Add a color on mouse-over */
#breadcrumb li a:hover {
color: #01447e;
Expand All @@ -113,13 +103,11 @@ nav h1 a {
/* ====================== Restaurant Filtering ====================== */
.filter-options {
width: 100%;
/*height: 50px;*/
background-color: #252831;
align-items: center;
}
.filter-options h2 {
color: white;
/*font-size: 1rem;*/
font-weight: normal;
line-height: 1.5em;
margin: 0 20px;
Expand Down Expand Up @@ -147,10 +135,6 @@ nav h1 a {
margin: 0;
padding: 30px 15px 60px;
text-align: center;
/*display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: center;*/
}
#restaurants-list li {
background-color: #fff;
Expand All @@ -160,8 +144,6 @@ nav h1 a {
min-height: 380px;
padding: 10px;
max-width: 310px;
/*display: inline-flex;
/*flex-direction:column;*/
display:inline-block;
text-align: center;
}
Expand Down Expand Up @@ -202,27 +184,15 @@ nav h1 a {

/* ====================== Restaurant Details ====================== */
.inside header {
/*position: fixed;*/
top: 0;
max-width: 100%;
/*z-index: 1000;*/
}
.inside #map-container {
background: blue none repeat scroll 0 0;
/*height: 87%;
position: fixed;
right: 0;
top: 80px;*/
max-width: 100%;
}
/*.inside #map {
background-color: #ccc;
height: 100%;
width: 100%;
}*/
.inside #footer {
bottom: 0;
/*position: absolute;*/
}
#restaurant-name {
color: #8A4600;
Expand Down Expand Up @@ -264,36 +234,23 @@ nav h1 a {
margin-right: auto;
text-align: left;
padding-bottom:15px;
/*max-width: 80%;*/
}
#restaurant-hours th {
line-height: 1.2em;
}
#restaurant-container, #reviews-container {
border-bottom: 1px solid #d9d9d9;
border-top: 1px solid #fff;
/*padding-bottom:30px;
padding: 140px 40px 30px;*/
/*width: 50%;*/
}
/*#reviews-container {
padding: 30px 40px;
}*/
#reviews-container h3 {
color: #8A4600;
font-size: 24pt;
font-weight: 300;
text-align: center;
/*letter-spacing: -1px;*/
padding-bottom: 5px;
padding-top: 5px;
line-height:1.5em;
}
/*#reviews-list {
margin: 0;
padding: 0;
}*/

#reviews-list {
padding:0px;
}
Expand All @@ -303,9 +260,7 @@ nav h1 a {
display: block;
list-style-type: none;
padding:0px;
/*margin: 0 0 30px;*/
overflow: hidden;
/*padding: 0 20px 20px;*/
position: relative;
width: 85%;
max-width:600px;
Expand All @@ -320,7 +275,6 @@ nav h1 a {
#restaurant-hours td {
color: #666;
}

#reviewer-name {
background-color: #333;
color: #ddd;
Expand All @@ -330,24 +284,7 @@ nav h1 a {
width: 100%;
border-radius: 10px 0px 0px 0px;
}

#reviewer-comments {
padding-left: 15px;
padding-right: 15px;
}

/* Media Queries
@media screen and (min-width: 834px) {
li {
max-width: 350px;
}
}*/

/*@media screen and (min-width: 900px) {
body {
width: 1200px;
margin-left: auto;
margin-right: auto;
}
}*/
3 changes: 1 addition & 2 deletions app/sw.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ var cacheFiles = [
'/index.html',
'/restaurant.html',
'/css/styles.css',
//'/data/restaurants.json',
'/img/',
'/js/dbhelper.js',
'/js/main.js',
Expand All @@ -21,7 +20,7 @@ var cacheFiles = [
// Event Listener for install - caching the files
self.addEventListener("install", function(event) {

console.log('In eventListener for install, event: ', event)
//console.log('In eventListener for install, event: ', event)
event.waitUntil(caches.open(myCache).then(function(cache) {

return cache.addAll(cacheFiles)
Expand Down
2 changes: 1 addition & 1 deletion dist/sw.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ gulp.task('sw', () => {

gulp.task('scripts', () => {
return gulp.src('app/js/*.js')
// .pipe(babel())
.pipe(uglify())
// .on('error', function (err) {
// gutil.log(gutil.colors.red('[Error]'), err.toString());
Expand Down Expand Up @@ -102,7 +101,6 @@ gulp.task('icons-folder', () => {
});

// Build - just for building app for dist
// *** NEEDS Manifest and icon tasks
gulp.task('build', [
'sw',
'scripts',
Expand Down

0 comments on commit 23b22f5

Please sign in to comment.