diff --git a/css/style.css b/css/style.css index 52f08ad..179f875 100644 --- a/css/style.css +++ b/css/style.css @@ -72,21 +72,6 @@ ol, ul { list-style: none; } -blockquote, q { - quotes: none; -} - -blockquote:before, blockquote:after, -q:before, q:after { - content: ''; - content: none; -} - -table { - border-collapse: collapse; - border-spacing: 0; -} - html { box-sizing: border-box; } @@ -152,16 +137,6 @@ button:active, button.active { background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIj48bGluZSB4MT0iMTIiIHkxPSI1IiB4Mj0iMTIiIHkyPSIxOSI+PC9saW5lPjxwb2x5bGluZSBwb2ludHM9IjE5IDEyIDEyIDE5IDUgMTIiPjwvcG9seWxpbmU+PC9zdmc+'); } -nav { - margin-top: 50px; - display: flex; - justify-content: space-between; -} - -nav button:last-child { - margin-right: 0; -} - aside { display: flex; flex-direction: row; @@ -201,11 +176,6 @@ main { font-size: 0; } -main > div { - font-size: 28px; - display: none; -} - ul { display: flex; flex-wrap: wrap; @@ -216,7 +186,6 @@ ul { li { border: 1px solid #bbb; border-radius: 5px; - display: inline-block; margin: 120px 10px 10px 10px; padding: 19px; width: 330px; diff --git a/js/current-films.js b/js/current-films.js index 76f5634..66a4607 100644 --- a/js/current-films.js +++ b/js/current-films.js @@ -3123,7 +3123,7 @@ var currentfilms = [ "description": "superpanchromatic film, probably Agfa Aviphot Pan 200", "launched": 2007, "datasheet": "datasheets/rollei-superpan-200.pdf", - "lomography" : "https://www.lomography.com/films/871957145-rollei-superpan-200/photos", + "lomography": "https://www.lomography.com/films/871957145-rollei-superpan-200/photos", "flickr": "https://www.flickr.com/search/?media=photos&text=%22Rollei%20Superpan%20200%22", "image": "rollei-superpan-200-135.png" }, @@ -3140,7 +3140,7 @@ var currentfilms = [ "description": "general purpose panchromatic film, could be Orwo UN54", "launched": 2019, "datasheet": "", - "lomography" : "https://www.lomography.com/films/871927716-shanghai-gp3-pan-100/photos", + "lomography": "https://www.lomography.com/films/871927716-shanghai-gp3-pan-100/photos", "flickr": "https://www.flickr.com/search/?media=photos&text=%22Shanghai%20GP3%20Pan%20100%22", "image": "shanghai-gp3-pan-100-120.png" }, @@ -3157,7 +3157,7 @@ var currentfilms = [ "description": "general purpose panchromatic film, could be Orwo UN54", "launched": 2019, "datasheet": "", - "lomography" : "https://www.lomography.com/films/871927716-shanghai-gp3-pan-100/photos", + "lomography": "https://www.lomography.com/films/871927716-shanghai-gp3-pan-100/photos", "flickr": "https://www.flickr.com/search/?media=photos&text=%22Shanghai%20GP3%20Pan%20100%22", "image": "shanghai-gp3-pan-100-135.png" }, @@ -3174,7 +3174,7 @@ var currentfilms = [ "description": "general purpose panchromatic film, could be Orwo N74", "launched": 2019, "datasheet": "", - "lomography" : "", + "lomography": "", "flickr": "https://www.flickr.com/search/?media=photos&text=%22Shanghai%20GP3%20Pan%20400%22", "image": "shanghai-gp3-pan-400-120.png" }, @@ -3191,7 +3191,7 @@ var currentfilms = [ "description": "general purpose panchromatic film, could be Orwo N74", "launched": 2019, "datasheet": "", - "lomography" : "", + "lomography": "", "flickr": "https://www.flickr.com/search/?media=photos&text=%22Shanghai%20GP3%20Pan%20400%22", "image": "shanghai-gp3-pan-400-135.png" }, @@ -3208,7 +3208,7 @@ var currentfilms = [ "description": "respooled motion picture cinema film Kodak Vision3 50D", "launched": 2018, "datasheet": "datasheets/silbersalz35-050d.pdf", - "lomography" : "https://www.lomography.com/films/871969233-silbersalz-50d/photos", + "lomography": "https://www.lomography.com/films/871969233-silbersalz-50d/photos", "flickr": "https://www.flickr.com/search/?media=photos&text=%22Silbersalz35%20050D%22", "image": "silbersalz35-050d-135.png" }, @@ -3225,7 +3225,7 @@ var currentfilms = [ "description": "respooled motion picture cinema film Kodak Vision3 200T", "launched": 2018, "datasheet": "datasheets/silbersalz35-200t.pdf", - "lomography" : "https://www.lomography.com/films/871968492-silbersalz-200t/photos", + "lomography": "https://www.lomography.com/films/871968492-silbersalz-200t/photos", "flickr": "https://www.flickr.com/search/?media=photos&text=%22Silbersalz35%20200T%22", "image": "silbersalz35-200t-135.png" }, @@ -3242,7 +3242,7 @@ var currentfilms = [ "description": "respooled motion picture cinema film Kodak Vision3 250D", "launched": 2018, "datasheet": "datasheets/silbersalz35-250d.pdf", - "lomography" : "https://www.lomography.com/films/871968254-silbersalz-250d/photos", + "lomography": "https://www.lomography.com/films/871968254-silbersalz-250d/photos", "flickr": "https://www.flickr.com/search/?media=photos&text=%22Silbersalz35%20250D%22", "image": "silbersalz35-250d-135.png" }, @@ -3259,7 +3259,7 @@ var currentfilms = [ "description": "respooled motion picture cinema film Kodak Vision3 500T", "launched": 2018, "datasheet": "datasheets/silbersalz35-500t.pdf", - "lomography" : "https://www.lomography.com/films/871969230-silbersalz-500t/photos", + "lomography": "https://www.lomography.com/films/871969230-silbersalz-500t/photos", "flickr": "https://www.flickr.com/search/?media=photos&text=%22Silbersalz35%20500T%22", "image": "silbersalz35-500t-135.png" }, diff --git a/js/script-index.js b/js/script-index.js index 01d1850..9085aff 100644 --- a/js/script-index.js +++ b/js/script-index.js @@ -13,8 +13,7 @@ const app = new Vue({ if(this.search) { var search = this.search.toLowerCase(); return this.currentfilms.filter(function (film) { - return film.name.toLowerCase().indexOf(search) !== -1 || - film.description.toLowerCase().indexOf(search) !== -1; + return film.name.toLowerCase().indexOf(search) !== -1 || film.description.toLowerCase().indexOf(search) !== -1; }); } else { return this.currentfilms; @@ -35,8 +34,7 @@ const app = new Vue({ }); } else { return this.searchedfilms.filter(function (film) { - return type === film.color + film.type && - format === film.format; + return type === film.color + film.type && format === film.format; }); } },