Compare commits

..

3 Commits

Author SHA1 Message Date
Said Achmiz
fa1ccf6bde Added no-hyphens CSS class 2020-02-27 00:20:15 -05:00
Said Achmiz
098d77eae1 Uncoupled general images CSS from image-focus 2020-02-16 18:57:14 -05:00
Said Achmiz
f891cd84ae Disabled no-cache for JS/CSS 2020-02-16 17:45:51 -05:00
7 changed files with 46 additions and 87 deletions

View File

@ -1,9 +1,9 @@
AddCharset utf-8 .shtml .html .css .php .txt .js AddCharset utf-8 .shtml .html .css .php .txt .js
# Disable caching of CSS and JS (for testing only). # Disable caching of CSS and JS (for testing only).
<filesMatch ".(css|js)$"> # <filesMatch ".(css|js)$">
Header set Cache-Control "max-age=0, public" # Header set Cache-Control "max-age=0, public"
</filesMatch> # </filesMatch>
Options +Includes Options +Includes
AddType text/html .shtml AddType text/html .shtml

View File

@ -5,21 +5,11 @@
/*=========*/ /*=========*/
body.home-page { body.home-page {
--deus-body-padding: 5rem 5rem 10rem 5rem; --deus-body-padding: 2rem;
width: 100%; width: 100%;
height: 100vh; height: 100vh;
} }
@media only screen and (max-width: 960px) {
body.home-page {
--deus-body-padding: 4rem 4rem 8rem 4rem;
}
}
@media only screen and (max-width: 520px) {
body.home-page {
--deus-body-padding: 3rem 3rem 8rem 3rem;
}
}
body.home-page::before { body.home-page::before {
content: none; content: none;
} }
@ -46,77 +36,35 @@ body.home-page #splash-image img {
height: 100%; height: 100%;
object-fit: contain; object-fit: contain;
} }
body.home-page #splash-image img.tall {
display: none;
}
@media only screen and (max-width: 960px) {
body.home-page #splash-image img.tall {
display: initial;
}
body.home-page #splash-image img.wide {
display: none;
}
}
/*================*/ /*================*/
/* Navigation UI. */ /* Navigation UI. */
/*================*/ /*================*/
body.home-page #main-nav { body.home-page #main-nav {
top: unset; top: -2rem;
bottom: -2rem;
opacity: 0.0; opacity: 0.0;
border-bottom: none;
box-shadow: none;
background-color: transparent;
font-size: 1.75em;
justify-content: center;
} }
body.home-page #main-nav.shown { body.home-page #main-nav.shown {
bottom: 0; top: 0;
opacity: 1.0; opacity: 1.0;
transition: transition:
bottom 1s ease, top 1s ease,
opacity 1s ease; opacity 1s ease;
} }
body.home-page #main-nav a.text {
margin: 0 0.75em;
width: 4em;
}
body.home-page #main-nav .social-buttons {
position: fixed;
top: 0;
right: 0;
font-size: 0.75em;
padding: 0.5em;
}
@media only screen and (max-width: 520px) {
body.home-page #main-nav .social-buttons {
flex-flow: column nowrap;
}
body.home-page #main-nav .social-buttons a + a {
margin: 0.5em 0 0 0;
}
}
body.home-page #main-nav .logo {
display: none;
}
/*===================*/ /*===================*/
/* Copyright notice. */ /* Copyright notice. */
/*===================*/ /*===================*/
body.home-page #copyright { body.home-page #copyright {
top: -0.75rem; bottom: -0.625rem;
opacity: 0.0; opacity: 0.0;
} }
body.home-page #copyright.shown { body.home-page #copyright.shown {
top: 0.75rem; bottom: 0.625rem;
opacity: 0.5; opacity: 0.5;
transition: transition:
top 1s ease, bottom 1s ease,
opacity 1s ease; opacity 1s ease;
} }

View File

@ -6,11 +6,11 @@
/*= Hover styles =*/ /*= Hover styles =*/
/*=--------------=*/ /*=--------------=*/
.img img:hover { .image-wrapper img:hover {
filter: drop-shadow(0 0 3px #777); filter: drop-shadow(0 0 3px #777);
cursor: zoom-in; cursor: zoom-in;
} }
.img img:active { .image-wrapper img:active {
transform: scale(0.975); transform: scale(0.975);
} }

View File

@ -324,6 +324,12 @@ hr {
clear: both; clear: both;
} }
.no-hyphens {
-webkit-hyphens: none !important;
-moz-hyphens: none !important;
hyphens: none !important;
}
/*=-----------------=*/ /*=-----------------=*/
/* Copyright notice. */ /* Copyright notice. */
/*=-----------------=*/ /*=-----------------=*/

View File

@ -84,8 +84,8 @@ String.prototype.hasPrefix = function (prefix) {
function imageFocusSetup() { function imageFocusSetup() {
if (typeof GW.imageFocus == "undefined") if (typeof GW.imageFocus == "undefined")
GW.imageFocus = { GW.imageFocus = {
contentImagesSelector: "article img, .gallery img", contentImagesSelector: ".gallery img",
focusedImageSelector: "article img.focused, .gallery img.focused", focusedImageSelector: ".gallery img.focused",
shrinkRatio: 0.975, shrinkRatio: 0.975,
hideUITimerDuration: 1500, hideUITimerDuration: 1500,
hideUITimerExpired: () => { hideUITimerExpired: () => {
@ -118,16 +118,13 @@ function imageFocusSetup() {
image.addEventListener("click", GW.imageClickedToFocus); image.addEventListener("click", GW.imageClickedToFocus);
}); });
// Wrap all images in a span. // Add image wrapper class.
document.querySelectorAll(GW.imageFocus.contentImagesSelector).forEach(image => { document.querySelectorAll(GW.imageFocus.contentImagesSelector).forEach(image => {
let wrapper = document.createElement("span"); let wrapper = image.closest(".img");
wrapper.classList.add("image-wrapper", "img"); if (wrapper)
image.parentElement.insertBefore(wrapper, image); wrapper.classList.add("image-wrapper");
wrapper.appendChild(image); });
wrapper.classList.add(...image.classList);
image.classList.remove(...image.classList);
});
// Create the image focus overlay. // Create the image focus overlay.
let imageFocusOverlay = addUIElement("<div id='image-focus-overlay'>" + let imageFocusOverlay = addUIElement("<div id='image-focus-overlay'>" +
`<div class='help-overlay'> `<div class='help-overlay'>
@ -603,10 +600,3 @@ function focusImageSpecifiedByURL() {
}); });
} }
} }
/******************/
/* INITIALIZATION */
/******************/
imageFocusSetup();
focusImageSpecifiedByURL();

View File

@ -456,10 +456,10 @@ registerInitializer('earlyInitialize', true, () => (query("#content") != null),
/*************************/ /*************************/
registerInitializer('pageLayoutFinished', false, () => (document.readyState == "complete"), () => { registerInitializer('pageLayoutFinished', false, () => (document.readyState == "complete"), () => {
GWLog("INITIALIZER pageLayoutFinished");
forceInitializer('earlyInitialize'); forceInitializer('earlyInitialize');
GWLog("INITIALIZER pageLayoutFinished");
// We pre-query the relevant elements, so we dont have to run queryAll on // We pre-query the relevant elements, so we dont have to run queryAll on
// every firing of the scroll listener. // every firing of the scroll listener.
GW.scrollState = { GW.scrollState = {
@ -472,5 +472,18 @@ registerInitializer('pageLayoutFinished', false, () => (document.readyState == "
GW.scrollState.siteNavUI.forEach(element => { GW.scrollState.siteNavUI.forEach(element => {
element.addEventListener("mouseover", () => { showSiteNavUI(); }); element.addEventListener("mouseover", () => { showSiteNavUI(); });
}); });
// Wrap all images in a span.
document.querySelectorAll("main > nav ~ * img").forEach(image => {
let wrapper = document.createElement("span");
wrapper.classList.add("img");
image.parentElement.insertBefore(wrapper, image);
wrapper.appendChild(image);
wrapper.classList.add(...image.classList);
image.classList.remove(...image.classList);
});
imageFocusSetup();
focusImageSpecifiedByURL();
}); });

View File

@ -7,8 +7,7 @@
</head> </head>
<body class='home-page'> <body class='home-page'>
<div id='splash-image' class='hidden'> <div id='splash-image' class='hidden'>
<img class='wide' src='/deus/assets/images/deus-logo-text-horizontal.png'> <img src='/deus/assets/images/deus-logo-text-horizontal.png'>
<img class='tall' src='/deus/assets/images/deus-logo-text.png'>
</div> </div>
<main> <main>
<!--#include virtual="/deus/includes/main-nav.html" --> <!--#include virtual="/deus/includes/main-nav.html" -->
@ -18,9 +17,12 @@
</body> </body>
<script> <script>
document.querySelector("#splash-image").classList.remove("hidden"); document.querySelector("#splash-image").classList.remove("hidden");
setTimeout(() => {
document.querySelector("#splash-image").classList.add("fade");
}, 2000);
setTimeout(() => { setTimeout(() => {
document.querySelector("#main-nav").classList.add("shown"); document.querySelector("#main-nav").classList.add("shown");
document.querySelector("#copyright").classList.add("shown"); document.querySelector("#copyright").classList.add("shown");
}, 1500); }, 2000);
</script> </script>
</html> </html>