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
5 changed files with 34 additions and 25 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

@ -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();
}); });