Fix resources (again)

craftcms · Oct 24, 2018 · fe89844 · fe89844
1 parent c781300
commit fe89844
Show file tree

Hide file tree

Showing 24 changed files with 2,659 additions and 7 deletions.
diff --git a/feedme/config.codekit3 b/feedme/config.codekit3
diff --git a/feedme/resources/dist/css/feed-me.css b/feedme/resources/dist/css/feed-me.css
diff --git a/feedme/resources/dist/css/font-awesome.css b/feedme/resources/dist/css/font-awesome.css
diff --git a/feedme/resources/css/fonts/FontAwesome.otf → .../resources/dist/css/fonts/FontAwesome.otf b/feedme/resources/css/fonts/FontAwesome.otf → .../resources/dist/css/fonts/FontAwesome.otf
diff --git a/...sources/css/fonts/fontawesome-webfont.eot → ...es/dist/css/fonts/fontawesome-webfont.eot b/...sources/css/fonts/fontawesome-webfont.eot → ...es/dist/css/fonts/fontawesome-webfont.eot
diff --git a/...sources/css/fonts/fontawesome-webfont.svg → ...es/dist/css/fonts/fontawesome-webfont.svg b/...sources/css/fonts/fontawesome-webfont.svg → ...es/dist/css/fonts/fontawesome-webfont.svg
diff --git a/...sources/css/fonts/fontawesome-webfont.ttf → ...es/dist/css/fonts/fontawesome-webfont.ttf b/...sources/css/fonts/fontawesome-webfont.ttf → ...es/dist/css/fonts/fontawesome-webfont.ttf
diff --git a/...ources/css/fonts/fontawesome-webfont.woff → ...s/dist/css/fonts/fontawesome-webfont.woff b/...ources/css/fonts/fontawesome-webfont.woff → ...s/dist/css/fonts/fontawesome-webfont.woff
diff --git a/...urces/css/fonts/fontawesome-webfont.woff2 → .../dist/css/fonts/fontawesome-webfont.woff2 b/...urces/css/fonts/fontawesome-webfont.woff2 → .../dist/css/fonts/fontawesome-webfont.woff2
diff --git a/feedme/resources/dist/js/feed-me-help.js b/feedme/resources/dist/js/feed-me-help.js
diff --git a/feedme/resources/dist/js/feed-me-license-form.js b/feedme/resources/dist/js/feed-me-license-form.js
diff --git a/feedme/resources/dist/js/feed-me.js b/feedme/resources/dist/js/feed-me.js
diff --git a/feedme/resources/dist/js/selectize.js b/feedme/resources/dist/js/selectize.js
diff --git a/feedme/resources/js/FeedMeHelp.js → feedme/resources/src/js/feed-me-help.js b/feedme/resources/js/FeedMeHelp.js → feedme/resources/src/js/feed-me-help.js
diff --git a/feedme/resources/js/FeedMeLicenseForm.js → .../resources/src/js/feed-me-license-form.js b/feedme/resources/js/FeedMeLicenseForm.js → .../resources/src/js/feed-me-license-form.js
diff --git a/feedme/resources/js/FeedMe.js → feedme/resources/src/js/feed-me.js b/feedme/resources/js/FeedMe.js → feedme/resources/src/js/feed-me.js
diff --git a/feedme/resources/js/selectize.js → feedme/resources/src/js/selectize.js b/feedme/resources/js/selectize.js → feedme/resources/src/js/selectize.js
diff --git a/feedme/resources/src/scss/.sass-cache/1dfb488e268e399832d817eb1ced2665c64cdcf5/feed-me.scssc b/feedme/resources/src/scss/.sass-cache/1dfb488e268e399832d817eb1ced2665c64cdcf5/feed-me.scssc
diff --git a/...esources/src/scss/.sass-cache/1dfb488e268e399832d817eb1ced2665c64cdcf5/font-awesome.scssc b/...esources/src/scss/.sass-cache/1dfb488e268e399832d817eb1ced2665c64cdcf5/font-awesome.scssc
diff --git a/feedme/resources/css/FeedMe.css → feedme/resources/src/scss/feed-me.scss b/feedme/resources/css/FeedMe.css → feedme/resources/src/scss/feed-me.scss
diff --git a/feedme/resources/css/font-awesome.min.css → feedme/resources/src/scss/font-awesome.scss b/feedme/resources/css/font-awesome.min.css → feedme/resources/src/scss/font-awesome.scss
diff --git a/feedme/templates/_layouts/index.html b/feedme/templates/_layouts/index.html
@@ -3,12 +3,12 @@
 {% import "_includes/forms" as forms %}
 {% import "feedme/_macros" as feedMeMacro %}
 
-{% includeCssResource 'feedme/css/font-awesome.min.css' %}
-{% includeCssResource 'feedme/css/feedme.css' %}
+{% includeCssResource 'feedme/dist/css/font-awesome.css' %}
+{% includeCssResource 'feedme/dist/css/feed-me.css' %}
 
-{% includeJsResource 'feedme/js/selectize.js' %}
-{% includeJsResource 'feedme/js/feedme.js' %}
-{% includeJsResource 'feedme/js/feedmehelp.js' %}
+{% includeJsResource 'feedme/dist/js/selectize.js' %}
+{% includeJsResource 'feedme/dist/js/feed-me.js' %}
+{% includeJsResource 'feedme/dist/js/feed-me-help.js' %}
 
 {% if noTabs is not defined %}
     {% set tabs = craft.feedme.getTabs() %}

diff --git a/feedme/templates/feeds/_direct.html b/feedme/templates/feeds/_direct.html
@@ -8,7 +8,7 @@
 
     <!-- CSS -->
     {% includeCssResource 'css/craft.css' %}
-    {% includeCssResource 'feedme/css/feedme.css' %}
+    {% includeCssResource 'feedme/dist/css/feed-me.css' %}
 </head>
 <body class="message feedme-message">
 

diff --git a/feedme/templates/settings/license.html b/feedme/templates/settings/license.html
@@ -95,7 +95,7 @@ <h5 class="heading">{{ "License Key" | t }}</h5>
 </div>
 {% endblock %}
 
-{% includejsresource 'feedme/js/feedmelicenseform.js' %}
+{% includejsresource 'feedme/dist/js/feed-me-license-form.js' %}
 {% includejs %}
     window.regForm = new Craft.FeedMe.LicenseForm({{ hasLicenseKey ? 'true' : 'false' }});
 {% endincludejs %}