Merge branch 'master' into master

This commit is contained in:
Stefano 2022-04-06 08:48:55 -07:00 committed by GitHub
commit 7bf513234f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 469 additions and 165 deletions

View file

@ -35,7 +35,7 @@ To contribute to the map, we require a certain format for artwork region and lab
### Map Edits
1. Create a fork of our repo.
2. Enter your data into the `web/_js/atlas.json` file, with the correct format and ID number.
2. Enter your data into the `web/atlas.json` file, with the correct format and ID number.
3. Create a Pull Request against the `cleanup` branch.
### Cleaning Contributions

View file

@ -78,7 +78,8 @@ var atlas = null;
init();
async function init(){
// For Reviewing Reddit Changes
//let resp = await fetch("../tools/temp_atlas.json");
let resp = await fetch("./atlas.json");
atlas = await resp.json();
atlas.sort(function (a, b) {

View file

@ -34,7 +34,7 @@
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1">
<link href="./_css/style.css?version=1.0.32" rel="stylesheet" type="text/css" media="all">
<link href="./_css/style.css?version=1.0.33" rel="stylesheet" type="text/css" media="all">
</head>
<body>
<div id="wrapper">

File diff suppressed because it is too large Load diff

View file

@ -36,7 +36,7 @@
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no">
<meta name="mobile-web-app-capable" content="yes">
<link href="./_css/style.css?version=1.0.32" rel="stylesheet" type="text/css" media="all">
<link href="./_css/style.css?version=1.0.33" rel="stylesheet" type="text/css" media="all">
<script type="application/ld+json">
{
@ -79,7 +79,7 @@
by reddit and the like as the thumbnail for the site.
The original is only 5.9kB, which wouldn't get much
smaller by reducing the actualy size. -->
<h1 id="title">The /r/place Atlas</h1>
<h1 id="title">The 2022 /r/place Atlas</h1>
</a>
</header>