develop #23

Manually merged
timw4mail merged 7 commits from develop into master 2019-08-16 10:39:59 -04:00
6 changed files with 19 additions and 15 deletions
Showing only changes of commit 3fae7fe9d6 - Show all commits

View File

@ -1,4 +1,6 @@
<main>
<h1>404</h1>
<h2><?= $message ?></h2>
<pre>(╯°□°)╯︵ ┻━┻
┬─┬ノ( º _ ºノ)</pre>
</main>

View File

@ -4,11 +4,11 @@ use function Aviat\AnimeClient\getLocalImg;
use Aviat\AnimeClient\API\Kitsu;
?>
<main class="details fixed">
<main class="character-page details fixed">
<section class="flex flex-no-wrap">
<div>
<aside>
<?= $helper->picture("images/characters/{$data['id']}-original.webp") ?>
</div>
</aside>
<div>
<h2 class="toph"><?= $data['name'] ?></h2>
<?php foreach ($data['names'] as $name): ?>

View File

@ -10,12 +10,12 @@
</div>
</div>
</section>
<script nomodule src="https://polyfill.io/v3/polyfill.min.js?features=es5%2CObject.assign"></script>
<script nomodule="nomodule" src="https://polyfill.io/v3/polyfill.min.js?features=es5%2CObject.assign"></script>
<?php if ($auth->isAuthenticated()): ?>
<script nomodule async="async" defer="defer" src="<?= $urlGenerator->assetUrl('js/scripts-authed.min.js') ?>"></script>
<script nomodule='nomodule' async="async" defer="defer" src="<?= $urlGenerator->assetUrl('js/scripts-authed.min.js') ?>"></script>
<script type="module" src="<?= $urlGenerator->assetUrl('js/src/index-authed.js') ?>"></script>
<?php else: ?>
<script nomodule async="async" defer="defer" src="<?= $urlGenerator->assetUrl('js/scripts.min.js') ?>"></script>
<script nomodule="nomodule" async="async" defer="defer" src="<?= $urlGenerator->assetUrl('js/scripts.min.js') ?>"></script>
<script type="module" src="<?= $urlGenerator->assetUrl('js/src/index.js') ?>"></script>
<?php endif ?>
</body>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -682,10 +682,11 @@ picture.cover {
font-size: inherit;
}
.description {
/* max-width: 80rem;*/
/* .description {
max-width: 80rem;
columns: 4 28rem;
columns: 4 28em;
margin-bottom: 1.6em;
margin-bottom: 1.6rem;
}
@ -697,11 +698,12 @@ p.description br + br {
break-inside: avoid;
break-after: auto;
break-before: avoid;
}
} */
.fixed {
/* max-width: 100rem; */
max-width: 80%;
max-width: 115em;
max-width: 115rem;
/* max-width: 80%; */
margin: 0 auto;
}
@ -821,7 +823,7 @@ aside.info {
max-width: 33%;
}
.fixed aside.info {
.fixed aside {
max-width: 390px;
}
@ -829,7 +831,7 @@ aside.info {
max-width: inherit;
} */
aside.info picture, aside.info img {
aside picture, aside img {
display: block;
margin: 0 auto;
}