From a55d03c01620f29d6dc4a0d02c189ed9d6531c8a Mon Sep 17 00:00:00 2001 From: Felix Hamann Date: Tue, 12 Feb 2019 21:28:23 +0100 Subject: [PATCH] cleanup of static files --- src/Foundation.hs | 18 +++++++++--------- static/css/{ => utils}/tabber.css | 0 static/css/{ => vendor}/flatpickr.css | 0 static/css/{ => vendor}/fontawesome.css | 0 static/js/{ => polyfills}/fetchPolyfill.js | 0 static/js/{ => polyfills}/urlPolyfill.js | 0 static/js/{ => utils}/featureChecker.js | 0 static/js/{ => utils}/tabber.js | 0 static/js/{ => vendor}/flatpickr.js | 0 static/js/{ => vendor}/zepto.js | 0 10 files changed, 9 insertions(+), 9 deletions(-) rename static/css/{ => utils}/tabber.css (100%) rename static/css/{ => vendor}/flatpickr.css (100%) rename static/css/{ => vendor}/fontawesome.css (100%) rename static/js/{ => polyfills}/fetchPolyfill.js (100%) rename static/js/{ => polyfills}/urlPolyfill.js (100%) rename static/js/{ => utils}/featureChecker.js (100%) rename static/js/{ => utils}/tabber.js (100%) rename static/js/{ => vendor}/flatpickr.js (100%) rename static/js/{ => vendor}/zepto.js (100%) diff --git a/src/Foundation.hs b/src/Foundation.hs index 4938141d6..6cb21a242 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -974,16 +974,16 @@ siteLayout headingOverride widget = do hasPrimaryPageActions = any (is _PageActionPrime) $ toListOf (traverse . _1 . _menuItemType) menuTypes pc <- widgetToPageContent $ do - addScript $ StaticR js_zepto_js - addScript $ StaticR js_fetchPolyfill_js - addScript $ StaticR js_urlPolyfill_js - addScript $ StaticR js_featureChecker_js - addScript $ StaticR js_flatpickr_js - addScript $ StaticR js_tabber_js - addStylesheet $ StaticR css_flatpickr_css - addStylesheet $ StaticR css_tabber_css + addScript $ StaticR js_vendor_zepto_js + addScript $ StaticR js_vendor_flatpickr_js + addScript $ StaticR js_polyfills_fetchPolyfill_js + addScript $ StaticR js_polyfills_urlPolyfill_js + addScript $ StaticR js_utils_featureChecker_js + addScript $ StaticR js_utils_tabber_js + addStylesheet $ StaticR css_vendor_flatpickr_css + addStylesheet $ StaticR css_vendor_fontawesome_css addStylesheet $ StaticR css_fonts_css - addStylesheet $ StaticR css_fontawesome_css + addStylesheet $ StaticR css_utils_tabber_css $(widgetFile "default-layout") $(widgetFile "standalone/modal") $(widgetFile "standalone/showHide") diff --git a/static/css/tabber.css b/static/css/utils/tabber.css similarity index 100% rename from static/css/tabber.css rename to static/css/utils/tabber.css diff --git a/static/css/flatpickr.css b/static/css/vendor/flatpickr.css similarity index 100% rename from static/css/flatpickr.css rename to static/css/vendor/flatpickr.css diff --git a/static/css/fontawesome.css b/static/css/vendor/fontawesome.css similarity index 100% rename from static/css/fontawesome.css rename to static/css/vendor/fontawesome.css diff --git a/static/js/fetchPolyfill.js b/static/js/polyfills/fetchPolyfill.js similarity index 100% rename from static/js/fetchPolyfill.js rename to static/js/polyfills/fetchPolyfill.js diff --git a/static/js/urlPolyfill.js b/static/js/polyfills/urlPolyfill.js similarity index 100% rename from static/js/urlPolyfill.js rename to static/js/polyfills/urlPolyfill.js diff --git a/static/js/featureChecker.js b/static/js/utils/featureChecker.js similarity index 100% rename from static/js/featureChecker.js rename to static/js/utils/featureChecker.js diff --git a/static/js/tabber.js b/static/js/utils/tabber.js similarity index 100% rename from static/js/tabber.js rename to static/js/utils/tabber.js diff --git a/static/js/flatpickr.js b/static/js/vendor/flatpickr.js similarity index 100% rename from static/js/flatpickr.js rename to static/js/vendor/flatpickr.js diff --git a/static/js/zepto.js b/static/js/vendor/zepto.js similarity index 100% rename from static/js/zepto.js rename to static/js/vendor/zepto.js