From 959b5a20e39c2ba4a05c6e417c02184ca24804cd Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Thu, 26 Oct 2017 00:10:56 +1100 Subject: Inlined SVGs, fixed build --- demo/src/js/lib/sprite.js | 89 --------------------------------------- demo/src/js/main.js | 3 -- demo/src/less/layout/core.less | 12 ++++++ demo/src/less/settings/icons.less | 2 +- demo/src/sprite/icon-github.svg | 12 ------ demo/src/sprite/icon-twitter.svg | 11 ----- demo/src/sprite/icon-vimeo.svg | 9 ---- demo/src/sprite/icon-youtube.svg | 9 ---- 8 files changed, 13 insertions(+), 134 deletions(-) delete mode 100644 demo/src/js/lib/sprite.js delete mode 100755 demo/src/sprite/icon-github.svg delete mode 100755 demo/src/sprite/icon-twitter.svg delete mode 100755 demo/src/sprite/icon-vimeo.svg delete mode 100755 demo/src/sprite/icon-youtube.svg (limited to 'demo/src') diff --git a/demo/src/js/lib/sprite.js b/demo/src/js/lib/sprite.js deleted file mode 100644 index bcd8a0b7..00000000 --- a/demo/src/js/lib/sprite.js +++ /dev/null @@ -1,89 +0,0 @@ -// ========================================================================== -// SVG sprite loading and caching -// This file should be at the top of the body to avoid a flash -// Usage: loadSprite('https://cdn.com/path/to/sprite.svg', 'sprite-id'); -// The second argument is optional but prevents loading twice -// ========================================================================== - -(function() { - window.loadSprite = function(url, id) { - if (typeof url !== "string") { - return; - } - - var body = document.body; - var prefix = "cache-"; - var hasId = typeof id === "string"; - var isCached = false; - - // Check for *actual* storage support - var cacheSupported = (function() { - if (!hasId) { - return false; - } - var test = '___test'; - try { - localStorage.setItem(test, test); - localStorage.removeItem(test); - return true; - } catch (e) { - return false; - } - })(); - - function updateSprite(container, data) { - // Inject content - container.innerHTML = data; - - // Inject the SVG to the body - body.insertBefore(container, body.childNodes[0]); - } - - // Only load once - if (!hasId || document.querySelectorAll("#" + id).length === 0) { - // Create container - var container = document.createElement("div"); - container.setAttribute("hidden", ""); - - if (hasId) { - container.setAttribute("id", id); - } - - // Check in cache - if (cacheSupported) { - var cached = localStorage.getItem(prefix + id); - isCached = cached !== null; - - if (isCached) { - var data = JSON.parse(cached); - updateSprite(container, data.content); - } - } - - // ReSharper disable once InconsistentNaming - var xhr = new XMLHttpRequest(); - - // XHR for Chrome/Firefox/Opera/Safari - if ("withCredentials" in xhr) { - xhr.open("GET", url, true); - } - // Not supported - else { - return; - } - - // Once loaded, inject to container and body - xhr.onload = function() { - if (cacheSupported) { - localStorage.setItem(prefix + id, JSON.stringify({ - content: xhr.responseText - })); - } - - updateSprite(container, xhr.responseText); - }; - - xhr.send(); - } - } -})(); diff --git a/demo/src/js/main.js b/demo/src/js/main.js index 16c31f1c..981f691a 100644 --- a/demo/src/js/main.js +++ b/demo/src/js/main.js @@ -48,9 +48,6 @@ // Expose for testing window.player = player; - // Load demo sprite - window.loadSprite('dist/demo.svg', 'demo-sprite'); - // Setup type toggle var buttons = document.querySelectorAll('[data-source]'); var types = { diff --git a/demo/src/less/layout/core.less b/demo/src/less/layout/core.less index aca66952..3d3b15d2 100644 --- a/demo/src/less/layout/core.less +++ b/demo/src/less/layout/core.less @@ -27,6 +27,9 @@ main { } aside { + display: flex; + align-items: center; + justify-content: center; width: 100%; padding: (@spacing-base * 0.75); background: #fff; @@ -34,6 +37,15 @@ aside { color: @gray; text-shadow: none; + .icon { + margin-right: (@spacing-base / 2); + fill: @color-twitter; + } + + p { + margin: 0; + } + a { color: @color-twitter; diff --git a/demo/src/less/settings/icons.less b/demo/src/less/settings/icons.less index d0b09b0b..546607c7 100644 --- a/demo/src/less/settings/icons.less +++ b/demo/src/less/settings/icons.less @@ -2,4 +2,4 @@ // Icons // ========================================================================== -@icon-size: 18px; +@icon-size: 16px; diff --git a/demo/src/sprite/icon-github.svg b/demo/src/sprite/icon-github.svg deleted file mode 100755 index 685dd746..00000000 --- a/demo/src/sprite/icon-github.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/demo/src/sprite/icon-twitter.svg b/demo/src/sprite/icon-twitter.svg deleted file mode 100755 index b3f644b1..00000000 --- a/demo/src/sprite/icon-twitter.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - Twitter - - diff --git a/demo/src/sprite/icon-vimeo.svg b/demo/src/sprite/icon-vimeo.svg deleted file mode 100755 index 83dd3dc0..00000000 --- a/demo/src/sprite/icon-vimeo.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/demo/src/sprite/icon-youtube.svg b/demo/src/sprite/icon-youtube.svg deleted file mode 100755 index 8b5d6897..00000000 --- a/demo/src/sprite/icon-youtube.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - -- cgit v1.2.3