diff --git a/data/lists.json b/data/lists.json index 7a07c4e..c7b5097 100644 --- a/data/lists.json +++ b/data/lists.json @@ -182,9 +182,19 @@ "quote":"A true champion never stops training. You gotta keep moving forward, or else you could get stuck exactly where you are.", "quotee":"Johnny Lawrence", "source":"Cobra Kai" + }, + { + "quote":"Some convictions are so strong that the world must break to accommodate them.", + "card":"Vindicate", + "multiverseid":"19135" + }, + { + "quote":"Madness and genius are separated only by degrees of success.", + "quotee":"Sidar Jabari", + "card":"Inspiration", + "multiverseid":"3642" } - ] }, "words":{ @@ -503,6 +513,18 @@ { "name":"Sublime Epiphany", "multiverseid":"485397" + }, + { + "name":"Ponder", + "multiverseid":"519160" + }, + { + "name":"Force of Will", + "multiverseid":"489724" + }, + { + "name":"Niv Mizzet, the Firemind", + "multiverseid":"96952" } ] }, @@ -513,6 +535,10 @@ "name":"Divination", "multiverseid":"447187" }, + { + "name":"Syr Elenora, the Discerning", + "multiverseid":"473029" + }, { "name":"Serra Angel", "multiverseid":"370602" @@ -552,6 +578,42 @@ { "name":"Auramancer", "multiverseid":"441995" + }, + { + "name":"Wall of Frost", + "multiverseid":"383432" + }, + { + "name":"Gift of Orzhova", + "multiverseid":"366339" + }, + { + "name":"Fylgja", + "multiverseid":"2686" + }, + { + "name":"Call to Mind", + "multiverseid":"208218" + }, + { + "name":"Thassa's Bounty", + "multiverseid":"373662" + }, + { + "name":"Ephara, God of the Polis", + "multiverseid":"378517" + }, + { + "name":"Ephara's Radiance", + "multiverseid":"378381" + }, + { + "name":"Stream of Unconsciousness", + "multiverseid":"152720" + }, + { + "name":"Hana Kami", + "multiverseid":"370475" } ] }, @@ -562,6 +624,10 @@ "name":"Cheatyface", "multiverseid":"479416" }, + { + "name":"Pestilence", + "multiverseid":"2119" + }, { "name":"Underworld Connections", "multiverseid":"545758" @@ -570,10 +636,6 @@ "name":"Isochron Scepter", "multiverseid":"292752" }, - { - "name":"Triton Fortune Hunter", - "multiverseid":"373531" - }, { "name":"Cramped Bunker", "multiverseid":"439518" @@ -601,11 +663,91 @@ { "name":"Aetherflux Reservoir", "multiverseid":"417765" + }, + { + "name":"Lighthouse Chronologist", + "multiverseid":"193590" + }, + { + "name":"Intruder Alarm", + "multiverseid":"5174" + }, + { + "name":"Lobber Crew", + "multiverseid":"289218" + }, + { + "name":"Dream Halls", + "multiverseid":"397553" + }, + { + "name":"Arcane Melee", + "multiverseid":"376246" + }, + { + "name":"Disruptive Student", + "multiverseid":"21123" + }, + { + "name":"The Magic Mirror", + "multiverseid":"473013" + }, + { + "name":"Chalice of Life / Chalice of Death", + "multiverseid":["226735","226721"] + }, + { + "name":"Ovinomancer", + "multiverseid":"108863" + }, + { + "name":"Talrand, Sky Summoner", + "multiverseid":"253701" + }, + { + "name":"Odric, Master Tactician", + "multiverseid":"259670" + }, + { + "name":"Quicksilver Dagger", + "multiverseid":"292757" + }, + { + "name":"Young Pyromancer", + "multiverseid":"370600" + }, + { + "name":"Koth of the Hammer", + "multiverseid":"266362" + }, + { + "name":"Curiosity", + "multiverseid":"489304" + }, + { + "name":"Censorship", + "multiverseid":"9747" + }, + { + "name":"Bureaucracy", + "multiverseid":"9778" + }, + { + "name":"Stuffy Doll", + "multiverseid":"509639" + }, + { + "name":"Epic Struggle", + "multiverseid":"33697" + }, + { + "name":"Azor's Elocutors", + "multiverseid":"265418" } ] }, { - "title":"Best Flavor", + "title":"Best Flavor Text", "list":[ { "name":"Ornithopter of Paradise", @@ -622,6 +764,23 @@ { "name":"Oviya Pashiri, Sage Lifecrafter", "multiverseid":"417738" + }, + { + "name":"Vindicate", + "image":"https://c1.scryfall.com/file/scryfall-cards/large/front/2/c/2c2d88dd-813a-4cd5-9a6a-ca6f80564078.jpg?1561756842", + "link":"https://scryfall.com/card/g07/4/vindicate" + }, + { + "name":"Raging Goblin", + "multiverseid":"393980" + }, + { + "name":"Inspiration", + "multiverseid":"3642" + }, + { + "name":"Pygmy Giant", + "multiverseid":"74333" } ] }, @@ -657,9 +816,271 @@ "name":"Stroke", "image":"https://i.redd.it/onnf1xqgk7d51.png", "link":"https://www.reddit.com/r/MTGLardFetcher/comments/hy8vk7/stroke/" + }, + { + "name":"Enter the Finite", + "image":"https://i.redd.it/5hi1qup8l7661.jpg", + "link":"https://www.reddit.com/r/MTGLardFetcher/comments/kggc1a/enter_the_finite/" + }, + { + "name":"[V]indicate", + "image":"https://i.redd.it/k4ng1j106dw71.jpg", + "link":"https://www.reddit.com/r/MTGLardFetcher/comments/qi9haz/indicate/" + }, + { + "name":"Crip Moon", + "image":"https://i.redd.it/9zwqyay1aiz71.png", + "link":"https://www.reddit.com/r/MTGLardFetcher/comments/qtjwg3/an_idea_that_came_to_me_visionlike/" + }, + { + "name":"Krenko's Command", + "image":"https://i.redd.it/7w67a5ml3wb51.png", + "link":"https://www.reddit.com/r/MTGLardFetcher/comments/hu9ij2/krenkos_command/" + }, + { + "name":"Strict Denial", + "image":"https://i.redd.it/2mp6r83ywlc41.jpg", + "link":"https://www.reddit.com/r/MTGLardFetcher/comments/et0vjw/strict_denial/" } ] } ] + }, + "movies":{ + "title":"My Favorite Movies", + "description":"This list has most of the movies I consider to be my favorites, except for the ones I forgot to add. I am not much of a film buff, so if something is missing that it seems should be on here, it's either because I forgot it or because I haven't seen it.", + "type":"gallery", + "subtype":"movie", + "list":[ + { + "title":"The Road to El Dorado", + "year":"2000", + "poster":"https://m.media-amazon.com/images/M/MV5BOTEzNWIwMzctOTE1YS00YjIyLTgwZGEtMTMxZDAzNzlmODMxXkEyXkFqcGdeQXVyMjgyMDk1MzY@._V1_FMjpg_UX1000_.jpg" + }, + { + "title":"Shrek", + "year":"2001", + "poster":"https://m.media-amazon.com/images/M/MV5BOGZhM2FhNTItODAzNi00YjA0LWEyN2UtNjJlYWQzYzU1MDg5L2ltYWdlL2ltYWdlXkEyXkFqcGdeQXVyMTQxNzMzNDI@._V1_FMjpg_UX1007_.jpg" + }, + { + "title":"Click", + "year":"2006", + "poster":"https://m.media-amazon.com/images/M/MV5BMTA1MTUxNDY4NzReQTJeQWpwZ15BbWU2MDE3ODAxNw@@._V1_FMjpg_UX450_.jpg" + }, + { + "title":"Princess Mononoke", + "year":"1997", + "poster":"https://m.media-amazon.com/images/M/MV5BNGIzY2IzODQtNThmMi00ZDE4LWI5YzAtNzNlZTM1ZjYyYjUyXkEyXkFqcGdeQXVyODEzNjM5OTQ@._V1_.jpg" + }, + { + "title":"Spirited Away", + "year":"2001", + "poster":"https://m.media-amazon.com/images/M/MV5BMjlmZmI5MDctNDE2YS00YWE0LWE5ZWItZDBhYWQ0NTcxNWRhXkEyXkFqcGdeQXVyMTMxODk2OTU@._V1_.jpg" + }, + { + "title":"Fight Club", + "year":"1999", + "poster":"https://m.media-amazon.com/images/M/MV5BMmEzNTkxYjQtZTc0MC00YTVjLTg5ZTEtZWMwOWVlYzY0NWIwXkEyXkFqcGdeQXVyNzkwMjQ5NzM@._V1_.jpg" + }, + { + "title":"Shrek 2", + "year":"2002", + "poster":"https://m.media-amazon.com/images/M/MV5BMDJhMGRjN2QtNDUxYy00NGM3LThjNGQtMmZiZTRhNjM4YzUxL2ltYWdlL2ltYWdlXkEyXkFqcGdeQXVyMTQxNzMzNDI@._V1_.jpg" + }, + { + "title":"Elf", + "year":"2003", + "poster":"https://m.media-amazon.com/images/M/MV5BMzUxNzkzMzQtYjIxZC00NzU0LThkYTQtZjNhNTljMTA1MDA1L2ltYWdlL2ltYWdlXkEyXkFqcGdeQXVyMTMxODk2OTU@._V1_FMjpg_UX1000_.jpg" + }, + { + "title":"Die Hard", + "year":"1988", + "poster":"https://m.media-amazon.com/images/M/MV5BZjRlNDUxZjAtOGQ4OC00OTNlLTgxNmQtYTBmMDgwZmNmNjkxXkEyXkFqcGdeQXVyNzkwMjQ5NzM@._V1_.jpg" + }, + { + "title":"The Karate Kid", + "year":"1984", + "poster":"https://m.media-amazon.com/images/M/MV5BNTkzY2YzNmYtY2ViMS00MThiLWFlYTEtOWQ1OTBiOGEwMTdhXkEyXkFqcGdeQXVyMTQxNzMzNDI@._V1_.jpg" + }, + { + "title":"Tim and Eric's Billion Dollar Movie", + "year":"2012", + "poster":"https://m.media-amazon.com/images/M/MV5BMTU0NTQ5NDYwMV5BMl5BanBnXkFtZTcwNjUzNzUxNw@@._V1_.jpg" + }, + { + "title":"Monty Python and the Holy Grail", + "year":"1975", + "poster":"https://m.media-amazon.com/images/M/MV5BN2IyNTE4YzUtZWU0Mi00MGIwLTgyMmQtMzQ4YzQxYWNlYWE2XkEyXkFqcGdeQXVyNjU0OTQ0OTY@._V1_.jpg" + }, + { + "title":"Dragon Quest: Your Story", + "year":"2019", + "poster":"https://m.media-amazon.com/images/M/MV5BM2Q5YTI0NTQtOGFlOC00MTEzLTg2NDYtM2VhNDk1ZTllNTNiXkEyXkFqcGdeQXVyMjU0ODQ5NTA@._V1_FMjpg_UX1000_.jpg" + }, + { + "title":"Dune", + "year":"2021", + "poster":"https://m.media-amazon.com/images/M/MV5BN2FjNmEyNWMtYzM0ZS00NjIyLTg5YzYtYThlMGVjNzE1OGViXkEyXkFqcGdeQXVyMTkxNjUyNQ@@._V1_.jpg" + }, + { + "title":"The Princess Bride", + "year":"1987", + "poster":"https://m.media-amazon.com/images/M/MV5BMGM4M2Q5N2MtNThkZS00NTc1LTk1NTItNWEyZjJjNDRmNDk5XkEyXkFqcGdeQXVyMjA0MDQ0Mjc@._V1_.jpg" + }, + { + "title":"Sky High", + "year":"2005", + "poster":"https://m.media-amazon.com/images/M/MV5BZjA2NmY1OTQtMjE4Mi00NGRkLWFmODUtM2Q3ZTRlYjZhNWYwXkEyXkFqcGdeQXVyMTQxNzMzNDI@._V1_.jpg" + }, + { + "title":"The Pacifier", + "year":"2005", + "poster":"https://m.media-amazon.com/images/M/MV5BMTE5MTcxOTQxNl5BMl5BanBnXkFtZTYwMzk3Nzg2._V1_FMjpg_UX1000_.jpg" + }, + { + "title":"Back to the Future", + "year":"1985", + "poster":"https://m.media-amazon.com/images/M/MV5BZmU0M2Y1OGUtZjIxNi00ZjBkLTg1MjgtOWIyNThiZWIwYjRiXkEyXkFqcGdeQXVyMTQxNzMzNDI@._V1_.jpg" + }, + { + "title":"Matilda", + "year":"1996", + "poster":"https://m.media-amazon.com/images/M/MV5BNzRhYmZhOWEtZjA4NC00MTU1LWE1ODgtN2Q5Y2QxN2JlNDljXkEyXkFqcGdeQXVyMjUzOTY1NTc@._V1_.jpg" + }, + { + "title":"Kung Fu Panda", + "year":"2008", + "poster":"https://m.media-amazon.com/images/M/MV5BODJkZTZhMWItMDI3Yy00ZWZlLTk4NjQtOTI1ZjU5NjBjZTVjXkEyXkFqcGdeQXVyODE5NzE3OTE@._V1_.jpg" + }, + { + "title":"Megamind", + "year":"2010", + "poster":"https://m.media-amazon.com/images/M/MV5BMTAzMzI0NTMzNDBeQTJeQWpwZ15BbWU3MDM3NTAyOTM@._V1_.jpg" + }, + { + "title":"Labyrinth", + "year":"1986", + "poster":"https://m.media-amazon.com/images/M/MV5BMjM2MDE4OTQwOV5BMl5BanBnXkFtZTgwNjgxMTg2NzE@._V1_.jpg" + }, + { + "title":"Frozen", + "year":"2013", + "poster":"https://m.media-amazon.com/images/M/MV5BMTQ1MjQwMTE5OF5BMl5BanBnXkFtZTgwNjk3MTcyMDE@._V1_.jpg" + }, + { + "title":"Tangled", + "year":"2010", + "poster":"https://m.media-amazon.com/images/M/MV5BMTAxNDYxMjg0MjNeQTJeQWpwZ15BbWU3MDcyNTk2OTM@._V1_.jpg" + }, + { + "title":"Cloudy with a Chance of Meatballs", + "year":"2009", + "poster":"https://m.media-amazon.com/images/M/MV5BMTg0MjAwNDI5MV5BMl5BanBnXkFtZTcwODkyMzg2Mg@@._V1_.jpg" + }, + { + "title":"Joe Dirt", + "year":"2001", + "poster":"https://m.media-amazon.com/images/M/MV5BMTE5NDgxNzU1MV5BMl5BanBnXkFtZTYwODQ4ODE3._V1_.jpg" + }, + { + "title":"Star Wars III: Revenge of the Sith", + "year":"2005", + "poster":"https://m.media-amazon.com/images/M/MV5BNTc4MTc3NTQ5OF5BMl5BanBnXkFtZTcwOTg0NjI4NA@@._V1_.jpg" + }, + { + "title":"Deadpool", + "year":"2016", + "poster":"https://m.media-amazon.com/images/M/MV5BYzE5MjY1ZDgtMTkyNC00MTMyLThhMjAtZGI5OTE1NzFlZGJjXkEyXkFqcGdeQXVyNjU0OTQ0OTY@._V1_FMjpg_UX1000_.jpg" + }, + { + "title":"Kung Pow: Enter the Fist", + "year":"2002", + "poster":"https://m.media-amazon.com/images/M/MV5BMGQxZDEwZDctMjNkMi00YmIxLTgyN2MtYmJhYjEzZGY0NjljXkEyXkFqcGdeQXVyMTQxNzMzNDI@._V1_FMjpg_UX1000_.jpg" + }, + { + "title":"Django Unchained", + "year":"2012", + "poster":"https://m.media-amazon.com/images/M/MV5BMjIyNTQ5NjQ1OV5BMl5BanBnXkFtZTcwODg1MDU4OA@@._V1_.jpg" + }, + { + "title":"The Prestige", + "year":"2006", + "poster":"https://m.media-amazon.com/images/M/MV5BMjA4NDI0MTIxNF5BMl5BanBnXkFtZTYwNTM0MzY2._V1_FMjpg_UX1000_.jpg" + }, + { + "title":"Oldboy", + "year":"2003", + "poster":"https://m.media-amazon.com/images/M/MV5BMTI3NTQyMzU5M15BMl5BanBnXkFtZTcwMTM2MjgyMQ@@._V1_FMjpg_UX1000_.jpg" + }, + { + "title":"Zombieland", + "year":"2009", + "poster":"https://m.media-amazon.com/images/M/MV5BMTU5MDg0NTQ1N15BMl5BanBnXkFtZTcwMjA4Mjg3Mg@@._V1_FMjpg_UX1000_.jpg" + } + ] + }, + "countries":{ + "title":"Countries I've Visited", + "description":"This list does not include countries that I have been in but not outside an airport (e.g. Germany).", + "list":["United States","Canada","Mexico","Belize","Puerto Rico","Jamaica","Bahamas","Japan","India"] + }, + "links":{ + "title":"Guide to the Internet", + "description":"This is a collection of all of the websites on the Internet I like to use.", + "type":"key-value", + "sections":[ + { + "title":"Computer Science Resources", + "description":"When I was in middle school, I taught myself how to program using various tutorials and resources on the Internet. Here are the resources that I've found useful over the years.", + "sections":[ + { + "title":"General Purpose", + "list":[ + {"k":"StackOverflow","link":"https://stackoverflow.com/","v":"A Q&A forum about all things computer science. If you're trying to figure out how to do something, Google it, and most of the time you'll find a StackOverflow thread about it. If you're trying to debug an error, just paste the error into Google and again, StackOverflow will probably have the answer."}, + {"k":"Codecademy","link":"https://www.codecademy.com/","v":"This was my starting point for learning most of the languages I know. Codecademy has courses of tutorials to get you up and running with almost all of the most popular languages. It has in-browser interpreters/compilers, which are really convenient. In the last few years, a lot of the content has become paid, which is really a travesty, but the free courses can still get you started."}, + {"k":"GitHub","link":"https://github.com/","v":"The most popular platform for hosting code. GitHub allows developers to manage and track changes with a version control software called Git."}, + {"k":"Esolang Wiki","v":"A Wiki about esoteric programming languages (esolangs). Many of these languages were created as jokes, but trying to use these languages can be a genuinely beneficial exercise. Because of how different esolangs are from normal languages, they make you approach problems in new and creative ways.","link":"https://esolangs.org/"}, + {"k":"Atom Editor","link":"https://atom.io/","v":"Atom is my IDE of choice. It's free, open-source, has a nice, uncluttered UI (as compared to something like Eclipse). Some of the packages I've found that improve my Atom experience are:","list":[ + {"script":"By far the most important Atom package, script allows you to run code from most popular languages within the Atom editor. Hit CTRL+SHIFT+B and the console will pop up at the bottom and your code will do its thing. Go to the settings and change the first setting (CWD) to \"Directory of the script\"."}, + {"autoclose-html":"Pretty self-explanatory; this package will automatically create the corresponding close tag when you type in an open HTML tag. If you don't want the close tag on the next line, then type the wildcard (*) in the Force Inline field."}, + {"markdown-preview-plus":"Will render Markdown syntax in a new pane when you press CTRL+SHIFT+M. If you want to include LaTeX-formatted math script in your Markdown, tick \"Enable Math Rendering By Default\" in the Math Options."}, + {"minimap":"Shows a zoomed-out view of your code, which can be helpful for moving through a long script, especially if you know what regions of the code look like."}, + {"pentagons":"Animates floating polygons in the background of the code, just for fun :)"}, + {"php-server":"Allows you to spin up a localhost PHP server in the directory of your choosing, which is really convenient for if you want to develop PHP and actually be able to run it."}, + {"sync-settings":"Allows you to sync your Atom settings and installed packages across multiple devices/installations by storing data in a private GitHub gist."} + ]} + ] + }, + { + "title":"Web Development", + "list":[ + {"k":"W3Schools","link":"https://www.w3schools.com/","v":"The best documentation for learning JavaScript, HTML, and CSS. You can often learn a lot by just browsing through documentation to learn what you can do with the language."} + ] + }, + { + "title":"Home Server", + "list":[ + {"k":"Certbot","link":"https://certbot.eff.org/instructions","v":"A free SSL/TLS certificate generator application. Just follow the instructions, and Certbot will take care of the rest for you. Make sure you renew your certificate periodically or set up automatic renewal."} + ] + } + ] + }, + { + "title":"Digital Acquisitions", + "description":"Useful links for all you 21st century swashbucklers out there.", + "list":[ + {"k":"Library Genesis (libgen)","link":"https://libgen.is/","v":"Textbooks, comic books, novels, you name it and there's a good chance that libgen has it."}, + {"k":"SciHub","link":"https://sci-hub.se/","v":"Paste in the link or DOI of a scientific article, SciHub will almost always get the PDF for you. Research is paid for by your tax dollars; you deserve access to the scientific knowledge you fund."}, + {"k":"YT1s","link":"https://yt1s.com/","v":"Allows you to download videos or audio files from YouTube."}, + {"k":"WatchCartoonOnline","link":"https://www.wcostream.com/","v":"This has my site for cartoons and anime since around 2013."}, + {"k":"Nyaa","link":"https://nyaa.si/","v":"The best magnets for torrenting anime."}, + {"k":"AnimeShow","link":"https://www2.animeshow.tv/","v":"The only site I've found for watching raw (unsubtitled) anime, in case you want to practice your Japanese listening comprehension."}, + {"k":"AQ Stream","link":"https://aqstream.com/jp","v":"For streaming live Japanese television. It only has a few channels, but they're the big ones: TV Asahi, TV Tokyo, Fuji TV, TBS, NHK, and a few others."}, + {"k":"Lj Video Downloader","v":"This is an app for Android, but it is the best video downloader I've found. Paste in any website with a video in it, and Lj will find the m3u8 link and let you download the video.","link":"https://play.google.com/store/apps/details?id=com.leavjenn.m3u8downloader&hl=en_US&gl=US"}, + {"k":"r/Piracy","link":"https://www.reddit.com/r/Piracy/","v":"If you're trying to figure out how to pirate something, chances are that somebody else has tried too. Maybe they posted about it in the Piracy subreddit."}, + {"k":"Internet Archive","link":"https://archive.org/","v":"The Internet Archive isn't traditionally considered a piracy website, but if you can rent a book, you can flip through all the pages and get scans of them in your browser cache. If your browser is Chrome, you can use ChromeCacheView to extract those scans. Then, just use an image to PDF converter, like this one I made, and you're in business."} + ] + } + ] } } diff --git a/pages/about.html b/pages/about.html index 2e8aae4..c8b5d30 100644 --- a/pages/about.html +++ b/pages/about.html @@ -2,46 +2,5 @@

About

Coming soon! - diff --git a/scripts/lists.js b/scripts/lists.js index 47319d4..f36c55b 100644 --- a/scripts/lists.js +++ b/scripts/lists.js @@ -212,46 +212,101 @@ function gen_item_html(item,type="default",subtype=null){ item_html = `${item["k"]}`; } item_html += ` — ${item["v"]}`; - item_html = `
  • ${item_html}
    • `; + + if(item.hasOwnProperty("list") && Array.isArray(item.list)){ + //Sublist time, baby! + var temp = { + "title":item_html, + "list":item.list, + "ordered": (item.hasOwnProperty("ordered")) ? item.ordered:false + }; + //If a key-value pair has a list key with an array attribute, then reformat it as a sublist whose title is the kv pair and whose list is the array. + item_html = gen_item_html(temp,type="sublist") + } else { + item_html = `
  • ${item_html}
    • `; + } break; case "exhibit": - var tooltip, alt, text, img_src; - tooltip = text = img_src = ""; + var tooltip, alt, text, img_src, image; + tooltip = text = img_src = image = ""; + classes = {"div":[],"img":[],"a":[]} switch(subtype){ case "album": tooltip = `${item.title} (${item.year}) - ${item.artist}`; alt = tooltip; img_src = item.cover; - text = `${item.title}
    ${item.artist}
    ${item.year}`; + text = `${item.title}
    ${item.artist}
    (${item.year})`; + break; + case "movie": + tooltip = `${item.title} (${item.year})`; + alt = tooltip; + img_src = item.poster; + text = `${item.title}
    (${item.year})`; break; case "mtg-card": + var gatherer_link = "https://gatherer.wizards.com/pages/card/Details.aspx?multiverseid="; + var gatherer_image = "https://gatherer.wizards.com/Handlers/Image.ashx?multiverseid="; + if(item.hasOwnProperty("multiverseid")&&!item.hasOwnProperty("link")){ - item.link = `https://gatherer.wizards.com/pages/card/Details.aspx?multiverseid=${item.multiverseid}`; + if(Array.isArray(item.multiverseid)){ + //If the multiverseid is an array, treat it as a transform card and link to the Gatherer page for the front half. + item.link = gatherer_link+item.multiverseid[0]; + } else { + item.link = gatherer_link+item.multiverseid; + } //If there's no alternate link specified, then use the multiverseid to generate the Gatherer link. } if(item.hasOwnProperty("multiverseid")&&!item.hasOwnProperty("image")){ - img_src = `https://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=${item.multiverseid}&type=card`; + if(Array.isArray(item.multiverseid)){ + img_src = []; + for(id of item.multiverseid){ + img_src.push(gatherer_image+id+"&type=card") + } + //If there are multiple (two) multiverseids, make a link src for each of them for convenience. + } else { + img_src = gatherer_image+item.multiverseid+"&type=card"; + } //If there's no alternate link specified, then use the multiverseid to generate the Gatherer link for the image. } else { - img_src = item.image; + if(Array.isArray(item.image)){ + img_src=[]; + for(src of item.image){ + img_src.push(src); + } + //If multiple (two) image sources are specified, create an array of both. + } else { + img_src = item.image; + } } if(item.hasOwnProperty("name")){ alt = tooltip = item.name; } + + if(Array.isArray(img_src)){ + image = `${tooltip}${tooltip}` + //Two srcs are to be treated as those of a transform card, which switches on hover. + classes.div.push("card-transform"); + } + + break; default: } - var image = `${tooltip}`; + + if(image==""||!image){ + image = image = `${tooltip}`; + //If the image variable is not already defined, then generate it. + } //Gallery items must have an image. if(item.hasOwnProperty("link")){ - image = `${image}`; + image = `${image}`; //If there's a link associated with the exhibit, put it on the image. } item_html = (text=="") ? image : `${image}
    ${text}`; //If there's no text, then there's no need for a line break. - item_html = `
    ${item_html}
    ` + item_html = `
    ${item_html}
    ` break; diff --git a/styles/common.css b/styles/common.css index 9102cae..600fbd1 100644 --- a/styles/common.css +++ b/styles/common.css @@ -40,11 +40,6 @@ src: url('fonts/Adventure.ttf'); } -@font-face { - font-family: Fira; - src: url('fonts/FiraSans-Regular.ttf'); -} - @font-face { font-family: Oxygen; src: url('fonts/OxygenMono-Regular.ttf'); diff --git a/styles/layout.css b/styles/layout.css index e9e1351..79ed6ec 100644 --- a/styles/layout.css +++ b/styles/layout.css @@ -87,12 +87,15 @@ details{ } summary{ - padding:0.8em; - margin-bottom:0.25em; text-align:left; padding-left:1em; } +details.heading summary{ + margin-bottom:0.25em; + padding:0.5em; +} + summary h2, summary h3, summary h4, summary h5, summary h6 { display:inline; } diff --git a/styles/lists.css b/styles/lists.css index 6cb2f45..ab5aa84 100644 --- a/styles/lists.css +++ b/styles/lists.css @@ -10,7 +10,6 @@ div.gallery{ vertical-align:top; /*In case of aforementioned overflow, ensure the tops of all album covers in each given row are aligned.*/ } - img.gallery{ } @@ -22,7 +21,6 @@ div.exhibit-album{ margin:0.75em; /*Put some space between the albums*/ } - img.exhibit-album{ width:10em; height:10em; @@ -35,3 +33,25 @@ img.exhibit-album{ width:12.5em; height:17.5em; } +div.card-transform{ + overflow:hidden; +} +div.card-transform:hover img.card-front{ + display:none; +} + + +div.exhibit-movie{ + width:10em; + /*Set the width of the div equal to the width of the album cover so that long album titles or artist names overflow onto the next line.*/ + margin:0.42em; + /*Put some space between the albums*/ + +} +img.exhibit-movie{ + width:10em; +} + +/*Look into 'masonry' for quote board: +https://w3bits.com/css-masonry/ +*/ diff --git a/styles/theme.css b/styles/theme.css index 020e2be..a515c03 100644 --- a/styles/theme.css +++ b/styles/theme.css @@ -115,7 +115,7 @@ ul li ul li ul{ } u{ - text-underline-offset: 0.14em; + text-underline-offset: 0.15em; /*Without this, underlines won't show under descender characters (g,y,j,p,q)*/ } @@ -131,10 +131,13 @@ summary{ padding-left:0.4rem; padding-right:0.4rem; - background: var(--silver-right); } +details.heading summary{ + background: var(--silver-right); +} + .no-highlight{ user-select:none; -webkit-tap-highlight-color: rgba(0,0,0,0);