-
-
Notifications
You must be signed in to change notification settings - Fork 474
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/placeAtlas/atlas into cle…
…anup
- Loading branch information
Showing
23 changed files
with
760 additions
and
631 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,7 @@ | ||
|
|
||
| <!-- | ||
| The 2022 r/place Atlas | ||
| Copyright (c) 2017 Roland Rytz <[email protected]> | ||
| Copyright (c) 2022 Place Atlas contributors | ||
| Copyright (c) 2022 Place Atlas Initiative and contributors | ||
| Licensed under AGPL-3.0 (https://2022.place-atlas.stefanocoding.me/license.txt) | ||
| --> | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| /*! | ||
| * The 2022 r/place Atlas | ||
| * Copyright (c) 2017 Roland Rytz <[email protected]> | ||
| * Copyright (c) 2022 Place Atlas contributors | ||
| * Copyright (c) 2022 Place Atlas Initiative and contributors | ||
| * Licensed under AGPL-3.0 (https://2022.place-atlas.stefanocoding.me/license.txt) | ||
| */ | ||
|
|
||
|
|
@@ -52,6 +52,14 @@ body[data-mode] { | |
| padding-left: env(safe-area-inset-left); | ||
| } | ||
|
|
||
| .opacity-0 { | ||
| opacity: 0; | ||
| } | ||
|
|
||
| .transition-opacity { | ||
| transition: opacity .15s linear; | ||
| } | ||
|
|
||
| @supports (backdrop-filter: blur()) or (-webkit-backdrop-filter: blur()) { | ||
| .navbar, .offcanvas { | ||
| -webkit-backdrop-filter: saturate(180%) blur(15px); | ||
|
|
@@ -258,12 +266,12 @@ body[data-init-done] .listTransitioning #innerContainer { | |
| } | ||
|
|
||
| #variantControls { | ||
| flex: 1 0 auto; | ||
| flex: 2 0 auto; | ||
| } | ||
|
|
||
| #timeControls { | ||
| position: relative; | ||
| flex: 6 0 300px; | ||
| flex: 12 0 300px; | ||
| } | ||
|
|
||
| #bottomBar.no-time-slider #timeControls { | ||
|
|
@@ -440,13 +448,25 @@ body:not([data-dev]) .show-only-on-dev { | |
| display: none !important | ||
| } | ||
|
|
||
| #objectsList, | ||
| #offcanvasList, | ||
| #offcanvasDraw, | ||
| #closeObjectsListButton { | ||
| margin-top: var(--global-top-padding); | ||
| } | ||
|
|
||
| .copyleft { | ||
| display: inline-block; | ||
| transform: rotateY(180deg); | ||
| } | ||
|
|
||
| /* about.html */ | ||
|
|
||
| #credits a { | ||
| #entry-contributors-wrapper a { | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| #credits a:hover { | ||
| #entry-contributors-wrapper a:hover { | ||
| text-decoration: underline; | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,21 @@ | ||
| /* | ||
| Access-Control-Allow-Origin: * | ||
|
|
||
| /_img/canvas/*/*.png | ||
| cache-control: public, max-age=604800 | ||
|
|
||
| # Hashed resources: 1 year and immutable | ||
|
|
||
| /_js/* | ||
| Cache-Control: public, immutable, max-age=31536000 | ||
|
|
||
| /_css/* | ||
| Cache-Control: public, immutable, max-age=31536000 | ||
|
|
||
| # Canvas images: 1 year | ||
|
|
||
| /_img/canvas/* | ||
| Cache-Control: public, max-age=31536000 | ||
|
|
||
| /_img/canvas/*.png | ||
| cache-control: public, max-age=604800 | ||
| Cache-Control: public, max-age=31536000 | ||
|
|
||
| /_img/canvas/*/*.png | ||
| Cache-Control: public, max-age=31536000 |
Oops, something went wrong.