diff --git a/.gitignore b/.gitignore
index 3574b77..988bd45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
-/assets/scss/style.css
-/assets/scss/style.css.map
+/assets/sass/*.css
+*.map
+/OgreAlert
+OgreAlert.zip
diff --git a/.remote-sync.json b/.remote-sync.json
index e36ab96..fca0c73 100644
--- a/.remote-sync.json
+++ b/.remote-sync.json
@@ -7,13 +7,16 @@
"target": "public_html/wp-content/plugins/OgreAlert",
"ignore": [
".remote-sync.json",
- ".git/**"
+ ".git/**",
+ "Makefile",
+ "OgreAlert/**",
+ "OgreAlert.zip"
],
"username": "template",
"password": "?,GtD}MtPgF&",
"watch": [
- "/assets/scss/style.css",
- "/assets/scss/style.css.map"
+ "/assets/sass/style.css",
+ "/assets/sass/style.css.map"
],
"transport": "scp"
-}
\ No newline at end of file
+}
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..0235f58
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,31 @@
+PACKAGE = OgreAlert
+DIR = ./$(PACKAGE)
+
+all: $(PACKAGE).zip
+
+$(PACKAGE).zip: clean dir copy zip
+
+dir:
+ mkdir $(DIR)
+
+copy:
+ cp -RT ./assets $(DIR)/assets
+ cp -RT ./inc $(DIR)/inc
+ cp -RT ./lib $(DIR)/lib
+ cp -RT ./templates $(DIR)/templates
+ cp -f ./* $(DIR) || true
+
+ rm $(DIR)/Makefile
+ rm $(DIR)/$(PACKAGE).zip || true
+
+ rm -r $(DIR)/assets/sass/lib
+ rm $(DIR)/assets/sass/*.scss
+ rm $(DIR)/assets/sass/*.map
+
+zip:
+ zip -r ./$(PACKAGE).zip $(DIR)
+ rm -r $(DIR) || true
+
+clean:
+ rm -r $(DIR) || true
+ rm ./$(PACKAGE).zip || true
diff --git a/assets/scss/lib/bourbon/_bourbon-deprecated-upcoming.scss b/assets/sass/lib/bourbon/_bourbon-deprecated-upcoming.scss
similarity index 100%
rename from assets/scss/lib/bourbon/_bourbon-deprecated-upcoming.scss
rename to assets/sass/lib/bourbon/_bourbon-deprecated-upcoming.scss
diff --git a/assets/scss/lib/bourbon/_bourbon.scss b/assets/sass/lib/bourbon/_bourbon.scss
similarity index 100%
rename from assets/scss/lib/bourbon/_bourbon.scss
rename to assets/sass/lib/bourbon/_bourbon.scss
diff --git a/assets/scss/lib/bourbon/addons/_border-color.scss b/assets/sass/lib/bourbon/addons/_border-color.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_border-color.scss
rename to assets/sass/lib/bourbon/addons/_border-color.scss
diff --git a/assets/scss/lib/bourbon/addons/_border-radius.scss b/assets/sass/lib/bourbon/addons/_border-radius.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_border-radius.scss
rename to assets/sass/lib/bourbon/addons/_border-radius.scss
diff --git a/assets/scss/lib/bourbon/addons/_border-style.scss b/assets/sass/lib/bourbon/addons/_border-style.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_border-style.scss
rename to assets/sass/lib/bourbon/addons/_border-style.scss
diff --git a/assets/scss/lib/bourbon/addons/_border-width.scss b/assets/sass/lib/bourbon/addons/_border-width.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_border-width.scss
rename to assets/sass/lib/bourbon/addons/_border-width.scss
diff --git a/assets/scss/lib/bourbon/addons/_buttons.scss b/assets/sass/lib/bourbon/addons/_buttons.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_buttons.scss
rename to assets/sass/lib/bourbon/addons/_buttons.scss
diff --git a/assets/scss/lib/bourbon/addons/_clearfix.scss b/assets/sass/lib/bourbon/addons/_clearfix.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_clearfix.scss
rename to assets/sass/lib/bourbon/addons/_clearfix.scss
diff --git a/assets/scss/lib/bourbon/addons/_ellipsis.scss b/assets/sass/lib/bourbon/addons/_ellipsis.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_ellipsis.scss
rename to assets/sass/lib/bourbon/addons/_ellipsis.scss
diff --git a/assets/scss/lib/bourbon/addons/_font-stacks.scss b/assets/sass/lib/bourbon/addons/_font-stacks.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_font-stacks.scss
rename to assets/sass/lib/bourbon/addons/_font-stacks.scss
diff --git a/assets/scss/lib/bourbon/addons/_hide-text.scss b/assets/sass/lib/bourbon/addons/_hide-text.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_hide-text.scss
rename to assets/sass/lib/bourbon/addons/_hide-text.scss
diff --git a/assets/scss/lib/bourbon/addons/_margin.scss b/assets/sass/lib/bourbon/addons/_margin.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_margin.scss
rename to assets/sass/lib/bourbon/addons/_margin.scss
diff --git a/assets/scss/lib/bourbon/addons/_padding.scss b/assets/sass/lib/bourbon/addons/_padding.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_padding.scss
rename to assets/sass/lib/bourbon/addons/_padding.scss
diff --git a/assets/scss/lib/bourbon/addons/_position.scss b/assets/sass/lib/bourbon/addons/_position.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_position.scss
rename to assets/sass/lib/bourbon/addons/_position.scss
diff --git a/assets/scss/lib/bourbon/addons/_prefixer.scss b/assets/sass/lib/bourbon/addons/_prefixer.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_prefixer.scss
rename to assets/sass/lib/bourbon/addons/_prefixer.scss
diff --git a/assets/scss/lib/bourbon/addons/_retina-image.scss b/assets/sass/lib/bourbon/addons/_retina-image.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_retina-image.scss
rename to assets/sass/lib/bourbon/addons/_retina-image.scss
diff --git a/assets/scss/lib/bourbon/addons/_size.scss b/assets/sass/lib/bourbon/addons/_size.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_size.scss
rename to assets/sass/lib/bourbon/addons/_size.scss
diff --git a/assets/scss/lib/bourbon/addons/_text-inputs.scss b/assets/sass/lib/bourbon/addons/_text-inputs.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_text-inputs.scss
rename to assets/sass/lib/bourbon/addons/_text-inputs.scss
diff --git a/assets/scss/lib/bourbon/addons/_timing-functions.scss b/assets/sass/lib/bourbon/addons/_timing-functions.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_timing-functions.scss
rename to assets/sass/lib/bourbon/addons/_timing-functions.scss
diff --git a/assets/scss/lib/bourbon/addons/_triangle.scss b/assets/sass/lib/bourbon/addons/_triangle.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_triangle.scss
rename to assets/sass/lib/bourbon/addons/_triangle.scss
diff --git a/assets/scss/lib/bourbon/addons/_word-wrap.scss b/assets/sass/lib/bourbon/addons/_word-wrap.scss
similarity index 100%
rename from assets/scss/lib/bourbon/addons/_word-wrap.scss
rename to assets/sass/lib/bourbon/addons/_word-wrap.scss
diff --git a/assets/scss/lib/bourbon/css3/_animation.scss b/assets/sass/lib/bourbon/css3/_animation.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_animation.scss
rename to assets/sass/lib/bourbon/css3/_animation.scss
diff --git a/assets/scss/lib/bourbon/css3/_appearance.scss b/assets/sass/lib/bourbon/css3/_appearance.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_appearance.scss
rename to assets/sass/lib/bourbon/css3/_appearance.scss
diff --git a/assets/scss/lib/bourbon/css3/_backface-visibility.scss b/assets/sass/lib/bourbon/css3/_backface-visibility.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_backface-visibility.scss
rename to assets/sass/lib/bourbon/css3/_backface-visibility.scss
diff --git a/assets/scss/lib/bourbon/css3/_background-image.scss b/assets/sass/lib/bourbon/css3/_background-image.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_background-image.scss
rename to assets/sass/lib/bourbon/css3/_background-image.scss
diff --git a/assets/scss/lib/bourbon/css3/_background.scss b/assets/sass/lib/bourbon/css3/_background.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_background.scss
rename to assets/sass/lib/bourbon/css3/_background.scss
diff --git a/assets/scss/lib/bourbon/css3/_border-image.scss b/assets/sass/lib/bourbon/css3/_border-image.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_border-image.scss
rename to assets/sass/lib/bourbon/css3/_border-image.scss
diff --git a/assets/scss/lib/bourbon/css3/_calc.scss b/assets/sass/lib/bourbon/css3/_calc.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_calc.scss
rename to assets/sass/lib/bourbon/css3/_calc.scss
diff --git a/assets/scss/lib/bourbon/css3/_columns.scss b/assets/sass/lib/bourbon/css3/_columns.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_columns.scss
rename to assets/sass/lib/bourbon/css3/_columns.scss
diff --git a/assets/scss/lib/bourbon/css3/_filter.scss b/assets/sass/lib/bourbon/css3/_filter.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_filter.scss
rename to assets/sass/lib/bourbon/css3/_filter.scss
diff --git a/assets/scss/lib/bourbon/css3/_flex-box.scss b/assets/sass/lib/bourbon/css3/_flex-box.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_flex-box.scss
rename to assets/sass/lib/bourbon/css3/_flex-box.scss
diff --git a/assets/scss/lib/bourbon/css3/_font-face.scss b/assets/sass/lib/bourbon/css3/_font-face.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_font-face.scss
rename to assets/sass/lib/bourbon/css3/_font-face.scss
diff --git a/assets/scss/lib/bourbon/css3/_font-feature-settings.scss b/assets/sass/lib/bourbon/css3/_font-feature-settings.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_font-feature-settings.scss
rename to assets/sass/lib/bourbon/css3/_font-feature-settings.scss
diff --git a/assets/scss/lib/bourbon/css3/_hidpi-media-query.scss b/assets/sass/lib/bourbon/css3/_hidpi-media-query.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_hidpi-media-query.scss
rename to assets/sass/lib/bourbon/css3/_hidpi-media-query.scss
diff --git a/assets/scss/lib/bourbon/css3/_hyphens.scss b/assets/sass/lib/bourbon/css3/_hyphens.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_hyphens.scss
rename to assets/sass/lib/bourbon/css3/_hyphens.scss
diff --git a/assets/scss/lib/bourbon/css3/_image-rendering.scss b/assets/sass/lib/bourbon/css3/_image-rendering.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_image-rendering.scss
rename to assets/sass/lib/bourbon/css3/_image-rendering.scss
diff --git a/assets/scss/lib/bourbon/css3/_keyframes.scss b/assets/sass/lib/bourbon/css3/_keyframes.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_keyframes.scss
rename to assets/sass/lib/bourbon/css3/_keyframes.scss
diff --git a/assets/scss/lib/bourbon/css3/_linear-gradient.scss b/assets/sass/lib/bourbon/css3/_linear-gradient.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_linear-gradient.scss
rename to assets/sass/lib/bourbon/css3/_linear-gradient.scss
diff --git a/assets/scss/lib/bourbon/css3/_perspective.scss b/assets/sass/lib/bourbon/css3/_perspective.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_perspective.scss
rename to assets/sass/lib/bourbon/css3/_perspective.scss
diff --git a/assets/scss/lib/bourbon/css3/_placeholder.scss b/assets/sass/lib/bourbon/css3/_placeholder.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_placeholder.scss
rename to assets/sass/lib/bourbon/css3/_placeholder.scss
diff --git a/assets/scss/lib/bourbon/css3/_radial-gradient.scss b/assets/sass/lib/bourbon/css3/_radial-gradient.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_radial-gradient.scss
rename to assets/sass/lib/bourbon/css3/_radial-gradient.scss
diff --git a/assets/scss/lib/bourbon/css3/_selection.scss b/assets/sass/lib/bourbon/css3/_selection.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_selection.scss
rename to assets/sass/lib/bourbon/css3/_selection.scss
diff --git a/assets/scss/lib/bourbon/css3/_text-decoration.scss b/assets/sass/lib/bourbon/css3/_text-decoration.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_text-decoration.scss
rename to assets/sass/lib/bourbon/css3/_text-decoration.scss
diff --git a/assets/scss/lib/bourbon/css3/_transform.scss b/assets/sass/lib/bourbon/css3/_transform.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_transform.scss
rename to assets/sass/lib/bourbon/css3/_transform.scss
diff --git a/assets/scss/lib/bourbon/css3/_transition.scss b/assets/sass/lib/bourbon/css3/_transition.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_transition.scss
rename to assets/sass/lib/bourbon/css3/_transition.scss
diff --git a/assets/scss/lib/bourbon/css3/_user-select.scss b/assets/sass/lib/bourbon/css3/_user-select.scss
similarity index 100%
rename from assets/scss/lib/bourbon/css3/_user-select.scss
rename to assets/sass/lib/bourbon/css3/_user-select.scss
diff --git a/assets/scss/lib/bourbon/functions/_assign-inputs.scss b/assets/sass/lib/bourbon/functions/_assign-inputs.scss
similarity index 100%
rename from assets/scss/lib/bourbon/functions/_assign-inputs.scss
rename to assets/sass/lib/bourbon/functions/_assign-inputs.scss
diff --git a/assets/scss/lib/bourbon/functions/_contains-falsy.scss b/assets/sass/lib/bourbon/functions/_contains-falsy.scss
similarity index 100%
rename from assets/scss/lib/bourbon/functions/_contains-falsy.scss
rename to assets/sass/lib/bourbon/functions/_contains-falsy.scss
diff --git a/assets/scss/lib/bourbon/functions/_contains.scss b/assets/sass/lib/bourbon/functions/_contains.scss
similarity index 100%
rename from assets/scss/lib/bourbon/functions/_contains.scss
rename to assets/sass/lib/bourbon/functions/_contains.scss
diff --git a/assets/scss/lib/bourbon/functions/_is-length.scss b/assets/sass/lib/bourbon/functions/_is-length.scss
similarity index 100%
rename from assets/scss/lib/bourbon/functions/_is-length.scss
rename to assets/sass/lib/bourbon/functions/_is-length.scss
diff --git a/assets/scss/lib/bourbon/functions/_is-light.scss b/assets/sass/lib/bourbon/functions/_is-light.scss
similarity index 100%
rename from assets/scss/lib/bourbon/functions/_is-light.scss
rename to assets/sass/lib/bourbon/functions/_is-light.scss
diff --git a/assets/scss/lib/bourbon/functions/_is-number.scss b/assets/sass/lib/bourbon/functions/_is-number.scss
similarity index 100%
rename from assets/scss/lib/bourbon/functions/_is-number.scss
rename to assets/sass/lib/bourbon/functions/_is-number.scss
diff --git a/assets/scss/lib/bourbon/functions/_is-size.scss b/assets/sass/lib/bourbon/functions/_is-size.scss
similarity index 100%
rename from assets/scss/lib/bourbon/functions/_is-size.scss
rename to assets/sass/lib/bourbon/functions/_is-size.scss
diff --git a/assets/scss/lib/bourbon/functions/_modular-scale.scss b/assets/sass/lib/bourbon/functions/_modular-scale.scss
similarity index 100%
rename from assets/scss/lib/bourbon/functions/_modular-scale.scss
rename to assets/sass/lib/bourbon/functions/_modular-scale.scss
diff --git a/assets/scss/lib/bourbon/functions/_px-to-em.scss b/assets/sass/lib/bourbon/functions/_px-to-em.scss
similarity index 100%
rename from assets/scss/lib/bourbon/functions/_px-to-em.scss
rename to assets/sass/lib/bourbon/functions/_px-to-em.scss
diff --git a/assets/scss/lib/bourbon/functions/_px-to-rem.scss b/assets/sass/lib/bourbon/functions/_px-to-rem.scss
similarity index 100%
rename from assets/scss/lib/bourbon/functions/_px-to-rem.scss
rename to assets/sass/lib/bourbon/functions/_px-to-rem.scss
diff --git a/assets/scss/lib/bourbon/functions/_shade.scss b/assets/sass/lib/bourbon/functions/_shade.scss
similarity index 100%
rename from assets/scss/lib/bourbon/functions/_shade.scss
rename to assets/sass/lib/bourbon/functions/_shade.scss
diff --git a/assets/scss/lib/bourbon/functions/_strip-units.scss b/assets/sass/lib/bourbon/functions/_strip-units.scss
similarity index 100%
rename from assets/scss/lib/bourbon/functions/_strip-units.scss
rename to assets/sass/lib/bourbon/functions/_strip-units.scss
diff --git a/assets/scss/lib/bourbon/functions/_tint.scss b/assets/sass/lib/bourbon/functions/_tint.scss
similarity index 100%
rename from assets/scss/lib/bourbon/functions/_tint.scss
rename to assets/sass/lib/bourbon/functions/_tint.scss
diff --git a/assets/scss/lib/bourbon/functions/_transition-property-name.scss b/assets/sass/lib/bourbon/functions/_transition-property-name.scss
similarity index 100%
rename from assets/scss/lib/bourbon/functions/_transition-property-name.scss
rename to assets/sass/lib/bourbon/functions/_transition-property-name.scss
diff --git a/assets/scss/lib/bourbon/functions/_unpack.scss b/assets/sass/lib/bourbon/functions/_unpack.scss
similarity index 100%
rename from assets/scss/lib/bourbon/functions/_unpack.scss
rename to assets/sass/lib/bourbon/functions/_unpack.scss
diff --git a/assets/scss/lib/bourbon/helpers/_convert-units.scss b/assets/sass/lib/bourbon/helpers/_convert-units.scss
similarity index 100%
rename from assets/scss/lib/bourbon/helpers/_convert-units.scss
rename to assets/sass/lib/bourbon/helpers/_convert-units.scss
diff --git a/assets/scss/lib/bourbon/helpers/_directional-values.scss b/assets/sass/lib/bourbon/helpers/_directional-values.scss
similarity index 100%
rename from assets/scss/lib/bourbon/helpers/_directional-values.scss
rename to assets/sass/lib/bourbon/helpers/_directional-values.scss
diff --git a/assets/scss/lib/bourbon/helpers/_font-source-declaration.scss b/assets/sass/lib/bourbon/helpers/_font-source-declaration.scss
similarity index 85%
rename from assets/scss/lib/bourbon/helpers/_font-source-declaration.scss
rename to assets/sass/lib/bourbon/helpers/_font-source-declaration.scss
index eec82e2..f0c20b6 100644
--- a/assets/scss/lib/bourbon/helpers/_font-source-declaration.scss
+++ b/assets/sass/lib/bourbon/helpers/_font-source-declaration.scss
@@ -22,8 +22,7 @@
eot: "#{$file-path}.eot?#iefix" format("embedded-opentype"),
woff2: "#{$file-path}.woff2" format("woff2"),
woff: "#{$file-path}.woff" format("woff"),
- ttf: "#{$file-path}.ttf" format("truetype"),
- svg: "#{$file-path}.svg##{$font-family}" format("svg")
+ ttf: "#{$file-path}.ttf" format("truetype")
);
@each $key, $values in $formats-map {
diff --git a/assets/scss/lib/bourbon/helpers/_gradient-positions-parser.scss b/assets/sass/lib/bourbon/helpers/_gradient-positions-parser.scss
similarity index 100%
rename from assets/scss/lib/bourbon/helpers/_gradient-positions-parser.scss
rename to assets/sass/lib/bourbon/helpers/_gradient-positions-parser.scss
diff --git a/assets/scss/lib/bourbon/helpers/_linear-angle-parser.scss b/assets/sass/lib/bourbon/helpers/_linear-angle-parser.scss
similarity index 100%
rename from assets/scss/lib/bourbon/helpers/_linear-angle-parser.scss
rename to assets/sass/lib/bourbon/helpers/_linear-angle-parser.scss
diff --git a/assets/scss/lib/bourbon/helpers/_linear-gradient-parser.scss b/assets/sass/lib/bourbon/helpers/_linear-gradient-parser.scss
similarity index 100%
rename from assets/scss/lib/bourbon/helpers/_linear-gradient-parser.scss
rename to assets/sass/lib/bourbon/helpers/_linear-gradient-parser.scss
diff --git a/assets/scss/lib/bourbon/helpers/_linear-positions-parser.scss b/assets/sass/lib/bourbon/helpers/_linear-positions-parser.scss
similarity index 100%
rename from assets/scss/lib/bourbon/helpers/_linear-positions-parser.scss
rename to assets/sass/lib/bourbon/helpers/_linear-positions-parser.scss
diff --git a/assets/scss/lib/bourbon/helpers/_linear-side-corner-parser.scss b/assets/sass/lib/bourbon/helpers/_linear-side-corner-parser.scss
similarity index 100%
rename from assets/scss/lib/bourbon/helpers/_linear-side-corner-parser.scss
rename to assets/sass/lib/bourbon/helpers/_linear-side-corner-parser.scss
diff --git a/assets/scss/lib/bourbon/helpers/_radial-arg-parser.scss b/assets/sass/lib/bourbon/helpers/_radial-arg-parser.scss
similarity index 100%
rename from assets/scss/lib/bourbon/helpers/_radial-arg-parser.scss
rename to assets/sass/lib/bourbon/helpers/_radial-arg-parser.scss
diff --git a/assets/scss/lib/bourbon/helpers/_radial-gradient-parser.scss b/assets/sass/lib/bourbon/helpers/_radial-gradient-parser.scss
similarity index 100%
rename from assets/scss/lib/bourbon/helpers/_radial-gradient-parser.scss
rename to assets/sass/lib/bourbon/helpers/_radial-gradient-parser.scss
diff --git a/assets/scss/lib/bourbon/helpers/_radial-positions-parser.scss b/assets/sass/lib/bourbon/helpers/_radial-positions-parser.scss
similarity index 100%
rename from assets/scss/lib/bourbon/helpers/_radial-positions-parser.scss
rename to assets/sass/lib/bourbon/helpers/_radial-positions-parser.scss
diff --git a/assets/scss/lib/bourbon/helpers/_render-gradients.scss b/assets/sass/lib/bourbon/helpers/_render-gradients.scss
similarity index 100%
rename from assets/scss/lib/bourbon/helpers/_render-gradients.scss
rename to assets/sass/lib/bourbon/helpers/_render-gradients.scss
diff --git a/assets/scss/lib/bourbon/helpers/_shape-size-stripper.scss b/assets/sass/lib/bourbon/helpers/_shape-size-stripper.scss
similarity index 100%
rename from assets/scss/lib/bourbon/helpers/_shape-size-stripper.scss
rename to assets/sass/lib/bourbon/helpers/_shape-size-stripper.scss
diff --git a/assets/scss/lib/bourbon/helpers/_str-to-num.scss b/assets/sass/lib/bourbon/helpers/_str-to-num.scss
similarity index 100%
rename from assets/scss/lib/bourbon/helpers/_str-to-num.scss
rename to assets/sass/lib/bourbon/helpers/_str-to-num.scss
diff --git a/assets/scss/lib/bourbon/settings/_asset-pipeline.scss b/assets/sass/lib/bourbon/settings/_asset-pipeline.scss
similarity index 100%
rename from assets/scss/lib/bourbon/settings/_asset-pipeline.scss
rename to assets/sass/lib/bourbon/settings/_asset-pipeline.scss
diff --git a/assets/scss/lib/bourbon/settings/_prefixer.scss b/assets/sass/lib/bourbon/settings/_prefixer.scss
similarity index 100%
rename from assets/scss/lib/bourbon/settings/_prefixer.scss
rename to assets/sass/lib/bourbon/settings/_prefixer.scss
diff --git a/assets/scss/lib/bourbon/settings/_px-to-em.scss b/assets/sass/lib/bourbon/settings/_px-to-em.scss
similarity index 100%
rename from assets/scss/lib/bourbon/settings/_px-to-em.scss
rename to assets/sass/lib/bourbon/settings/_px-to-em.scss
diff --git a/assets/scss/lib/fontawesome/_animated.scss b/assets/sass/lib/fontawesome/_animated.scss
similarity index 100%
rename from assets/scss/lib/fontawesome/_animated.scss
rename to assets/sass/lib/fontawesome/_animated.scss
diff --git a/assets/scss/lib/fontawesome/_bordered-pulled.scss b/assets/sass/lib/fontawesome/_bordered-pulled.scss
similarity index 100%
rename from assets/scss/lib/fontawesome/_bordered-pulled.scss
rename to assets/sass/lib/fontawesome/_bordered-pulled.scss
diff --git a/assets/scss/lib/fontawesome/_core.scss b/assets/sass/lib/fontawesome/_core.scss
similarity index 100%
rename from assets/scss/lib/fontawesome/_core.scss
rename to assets/sass/lib/fontawesome/_core.scss
diff --git a/assets/scss/lib/fontawesome/_fa-brands.scss b/assets/sass/lib/fontawesome/_fa-brands.scss
similarity index 88%
rename from assets/scss/lib/fontawesome/_fa-brands.scss
rename to assets/sass/lib/fontawesome/_fa-brands.scss
index 5c3fefb..52bef4c 100644
--- a/assets/scss/lib/fontawesome/_fa-brands.scss
+++ b/assets/sass/lib/fontawesome/_fa-brands.scss
@@ -13,8 +13,7 @@
src: url('#{$fa-font-path}/fa-brands-400.eot?#iefix') format('embedded-opentype'),
url('#{$fa-font-path}/fa-brands-400.woff2') format('woff2'),
url('#{$fa-font-path}/fa-brands-400.woff') format('woff'),
- url('#{$fa-font-path}/fa-brands-400.ttf') format('truetype'),
- url('#{$fa-font-path}/fa-brands-400.svg#fontawesome') format('svg');
+ url('#{$fa-font-path}/fa-brands-400.ttf') format('truetype');
}
/*
diff --git a/assets/scss/lib/fontawesome/_fa-light.scss b/assets/sass/lib/fontawesome/_fa-light.scss
similarity index 89%
rename from assets/scss/lib/fontawesome/_fa-light.scss
rename to assets/sass/lib/fontawesome/_fa-light.scss
index 65b856c..ef3f280 100644
--- a/assets/scss/lib/fontawesome/_fa-light.scss
+++ b/assets/sass/lib/fontawesome/_fa-light.scss
@@ -13,8 +13,7 @@
src: url('#{$fa-font-path}/fa-light-300.eot?#iefix') format('embedded-opentype'),
url('#{$fa-font-path}/fa-light-300.woff2') format('woff2'),
url('#{$fa-font-path}/fa-light-300.woff') format('woff'),
- url('#{$fa-font-path}/fa-light-300.ttf') format('truetype'),
- url('#{$fa-font-path}/fa-light-300.svg#fontawesome') format('svg');
+ url('#{$fa-font-path}/fa-light-300.ttf') format('truetype');
}
/*
diff --git a/assets/scss/lib/fontawesome/_fa-regular.scss b/assets/sass/lib/fontawesome/_fa-regular.scss
similarity index 88%
rename from assets/scss/lib/fontawesome/_fa-regular.scss
rename to assets/sass/lib/fontawesome/_fa-regular.scss
index 160702c..0e1fdce 100644
--- a/assets/scss/lib/fontawesome/_fa-regular.scss
+++ b/assets/sass/lib/fontawesome/_fa-regular.scss
@@ -13,8 +13,7 @@
src: url('#{$fa-font-path}/fa-regular-400.eot?#iefix') format('embedded-opentype'),
url('#{$fa-font-path}/fa-regular-400.woff2') format('woff2'),
url('#{$fa-font-path}/fa-regular-400.woff') format('woff'),
- url('#{$fa-font-path}/fa-regular-400.ttf') format('truetype'),
- url('#{$fa-font-path}/fa-regular-400.svg#fontawesome') format('svg');
+ url('#{$fa-font-path}/fa-regular-400.ttf') format('truetype');
}
/*
diff --git a/assets/scss/lib/fontawesome/_fa-solid.scss b/assets/sass/lib/fontawesome/_fa-solid.scss
similarity index 89%
rename from assets/scss/lib/fontawesome/_fa-solid.scss
rename to assets/sass/lib/fontawesome/_fa-solid.scss
index 9063691..e7140b1 100644
--- a/assets/scss/lib/fontawesome/_fa-solid.scss
+++ b/assets/sass/lib/fontawesome/_fa-solid.scss
@@ -13,8 +13,7 @@
src: url('#{$fa-font-path}/fa-solid-900.eot?#iefix') format('embedded-opentype'),
url('#{$fa-font-path}/fa-solid-900.woff2') format('woff2'),
url('#{$fa-font-path}/fa-solid-900.woff') format('woff'),
- url('#{$fa-font-path}/fa-solid-900.ttf') format('truetype'),
- url('#{$fa-font-path}/fa-solid-900.svg#fontawesome') format('svg');
+ url('#{$fa-font-path}/fa-solid-900.ttf') format('truetype');
}
/*
diff --git a/assets/scss/lib/fontawesome/_fixed-width.scss b/assets/sass/lib/fontawesome/_fixed-width.scss
similarity index 100%
rename from assets/scss/lib/fontawesome/_fixed-width.scss
rename to assets/sass/lib/fontawesome/_fixed-width.scss
diff --git a/assets/scss/lib/fontawesome/_fontawesome.scss b/assets/sass/lib/fontawesome/_fontawesome.scss
similarity index 100%
rename from assets/scss/lib/fontawesome/_fontawesome.scss
rename to assets/sass/lib/fontawesome/_fontawesome.scss
diff --git a/assets/scss/lib/fontawesome/_icons.scss b/assets/sass/lib/fontawesome/_icons.scss
similarity index 100%
rename from assets/scss/lib/fontawesome/_icons.scss
rename to assets/sass/lib/fontawesome/_icons.scss
diff --git a/assets/scss/lib/fontawesome/_larger.scss b/assets/sass/lib/fontawesome/_larger.scss
similarity index 100%
rename from assets/scss/lib/fontawesome/_larger.scss
rename to assets/sass/lib/fontawesome/_larger.scss
diff --git a/assets/scss/lib/fontawesome/_list.scss b/assets/sass/lib/fontawesome/_list.scss
similarity index 100%
rename from assets/scss/lib/fontawesome/_list.scss
rename to assets/sass/lib/fontawesome/_list.scss
diff --git a/assets/scss/lib/fontawesome/_mixins.scss b/assets/sass/lib/fontawesome/_mixins.scss
similarity index 100%
rename from assets/scss/lib/fontawesome/_mixins.scss
rename to assets/sass/lib/fontawesome/_mixins.scss
diff --git a/assets/scss/lib/fontawesome/_rotated-flipped.scss b/assets/sass/lib/fontawesome/_rotated-flipped.scss
similarity index 100%
rename from assets/scss/lib/fontawesome/_rotated-flipped.scss
rename to assets/sass/lib/fontawesome/_rotated-flipped.scss
diff --git a/assets/scss/lib/fontawesome/_screen-reader.scss b/assets/sass/lib/fontawesome/_screen-reader.scss
similarity index 100%
rename from assets/scss/lib/fontawesome/_screen-reader.scss
rename to assets/sass/lib/fontawesome/_screen-reader.scss
diff --git a/assets/scss/lib/fontawesome/_shims.scss b/assets/sass/lib/fontawesome/_shims.scss
similarity index 100%
rename from assets/scss/lib/fontawesome/_shims.scss
rename to assets/sass/lib/fontawesome/_shims.scss
diff --git a/assets/scss/lib/fontawesome/_stacked.scss b/assets/sass/lib/fontawesome/_stacked.scss
similarity index 100%
rename from assets/scss/lib/fontawesome/_stacked.scss
rename to assets/sass/lib/fontawesome/_stacked.scss
diff --git a/assets/scss/lib/fontawesome/_variables.scss b/assets/sass/lib/fontawesome/_variables.scss
similarity index 99%
rename from assets/scss/lib/fontawesome/_variables.scss
rename to assets/sass/lib/fontawesome/_variables.scss
index 54011ee..c37598c 100644
--- a/assets/scss/lib/fontawesome/_variables.scss
+++ b/assets/sass/lib/fontawesome/_variables.scss
@@ -1,7 +1,7 @@
// Variables
// --------------------------
-$fa-font-path: "./lib/fontawesome/webfonts" !default;
+$fa-font-path: "../webfonts" !default;
$fa-font-size-base: 16px !default;
$fa-css-prefix: fa !default;
$fa-version: "5.2.0" !default;
diff --git a/assets/scss/style.scss b/assets/sass/style.scss
similarity index 99%
rename from assets/scss/style.scss
rename to assets/sass/style.scss
index 4362375..b353831 100644
--- a/assets/scss/style.scss
+++ b/assets/sass/style.scss
@@ -2,7 +2,7 @@
Plugin Name: OgreAlert
Plugin URI: https://plugins.cleverogre.com/plugin/ogrealert/
Description: OgreAlert is a plugin developed by CleverOgre in Pensacola, Florida.
-Version: 0.1.7
+Version: 0.1.8
Author: CleverOgre
Author URI: https://cleverogre.com/
Icon1x: https://plugins.cleverogre.com/plugin/ogrealert/?asset=icon-sm
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-brands-400.svg b/assets/scss/lib/fontawesome/webfonts/fa-brands-400.svg
deleted file mode 100644
index 1e292e3..0000000
--- a/assets/scss/lib/fontawesome/webfonts/fa-brands-400.svg
+++ /dev/null
@@ -1,1151 +0,0 @@
-
-
-
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-light-300.svg b/assets/scss/lib/fontawesome/webfonts/fa-light-300.svg
deleted file mode 100644
index 95293c2..0000000
--- a/assets/scss/lib/fontawesome/webfonts/fa-light-300.svg
+++ /dev/null
@@ -1,3287 +0,0 @@
-
-
-
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-regular-400.svg b/assets/scss/lib/fontawesome/webfonts/fa-regular-400.svg
deleted file mode 100644
index 199bbe6..0000000
--- a/assets/scss/lib/fontawesome/webfonts/fa-regular-400.svg
+++ /dev/null
@@ -1,3287 +0,0 @@
-
-
-
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-solid-900.svg b/assets/scss/lib/fontawesome/webfonts/fa-solid-900.svg
deleted file mode 100644
index e00038f..0000000
--- a/assets/scss/lib/fontawesome/webfonts/fa-solid-900.svg
+++ /dev/null
@@ -1,3287 +0,0 @@
-
-
-
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-brands-400.eot b/assets/webfonts/fa-brands-400.eot
similarity index 100%
rename from assets/scss/lib/fontawesome/webfonts/fa-brands-400.eot
rename to assets/webfonts/fa-brands-400.eot
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-brands-400.ttf b/assets/webfonts/fa-brands-400.ttf
similarity index 100%
rename from assets/scss/lib/fontawesome/webfonts/fa-brands-400.ttf
rename to assets/webfonts/fa-brands-400.ttf
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-brands-400.woff b/assets/webfonts/fa-brands-400.woff
similarity index 100%
rename from assets/scss/lib/fontawesome/webfonts/fa-brands-400.woff
rename to assets/webfonts/fa-brands-400.woff
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-brands-400.woff2 b/assets/webfonts/fa-brands-400.woff2
similarity index 100%
rename from assets/scss/lib/fontawesome/webfonts/fa-brands-400.woff2
rename to assets/webfonts/fa-brands-400.woff2
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-light-300.eot b/assets/webfonts/fa-light-300.eot
similarity index 100%
rename from assets/scss/lib/fontawesome/webfonts/fa-light-300.eot
rename to assets/webfonts/fa-light-300.eot
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-light-300.ttf b/assets/webfonts/fa-light-300.ttf
similarity index 100%
rename from assets/scss/lib/fontawesome/webfonts/fa-light-300.ttf
rename to assets/webfonts/fa-light-300.ttf
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-light-300.woff b/assets/webfonts/fa-light-300.woff
similarity index 100%
rename from assets/scss/lib/fontawesome/webfonts/fa-light-300.woff
rename to assets/webfonts/fa-light-300.woff
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-light-300.woff2 b/assets/webfonts/fa-light-300.woff2
similarity index 100%
rename from assets/scss/lib/fontawesome/webfonts/fa-light-300.woff2
rename to assets/webfonts/fa-light-300.woff2
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-regular-400.eot b/assets/webfonts/fa-regular-400.eot
similarity index 100%
rename from assets/scss/lib/fontawesome/webfonts/fa-regular-400.eot
rename to assets/webfonts/fa-regular-400.eot
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-regular-400.ttf b/assets/webfonts/fa-regular-400.ttf
similarity index 100%
rename from assets/scss/lib/fontawesome/webfonts/fa-regular-400.ttf
rename to assets/webfonts/fa-regular-400.ttf
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-regular-400.woff b/assets/webfonts/fa-regular-400.woff
similarity index 100%
rename from assets/scss/lib/fontawesome/webfonts/fa-regular-400.woff
rename to assets/webfonts/fa-regular-400.woff
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-regular-400.woff2 b/assets/webfonts/fa-regular-400.woff2
similarity index 100%
rename from assets/scss/lib/fontawesome/webfonts/fa-regular-400.woff2
rename to assets/webfonts/fa-regular-400.woff2
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-solid-900.eot b/assets/webfonts/fa-solid-900.eot
similarity index 100%
rename from assets/scss/lib/fontawesome/webfonts/fa-solid-900.eot
rename to assets/webfonts/fa-solid-900.eot
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-solid-900.ttf b/assets/webfonts/fa-solid-900.ttf
similarity index 100%
rename from assets/scss/lib/fontawesome/webfonts/fa-solid-900.ttf
rename to assets/webfonts/fa-solid-900.ttf
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-solid-900.woff b/assets/webfonts/fa-solid-900.woff
similarity index 100%
rename from assets/scss/lib/fontawesome/webfonts/fa-solid-900.woff
rename to assets/webfonts/fa-solid-900.woff
diff --git a/assets/scss/lib/fontawesome/webfonts/fa-solid-900.woff2 b/assets/webfonts/fa-solid-900.woff2
similarity index 100%
rename from assets/scss/lib/fontawesome/webfonts/fa-solid-900.woff2
rename to assets/webfonts/fa-solid-900.woff2
diff --git a/inc/alert.php b/inc/alert.php
index 3f718c5..d65ce67 100644
--- a/inc/alert.php
+++ b/inc/alert.php
@@ -361,7 +361,10 @@ class AlertMetaBox {
public static function field_label($args) {
if (!isset($args['title'])) return false;
- echo '';
diff --git a/inc/display.php b/inc/display.php
index 9b6a0f2..9aff867 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -2,7 +2,7 @@
/**
* @package CleverOgre
* @subpackage OgreAlert
- * @since OgreAlert 0.1.7
+ * @since OgreAlert 0.1.8
*/
namespace OgreAlert;
@@ -36,7 +36,7 @@ class Display {
}
static function enqueue_scripts() {
- wp_enqueue_style('ogrealert', \OgreAlert\Settings::get('dir') . 'assets/scss/style.css', array(), \OgreAlert\Settings::get('version'), 'all');
+ wp_enqueue_style('ogrealert', \OgreAlert\Settings::get('dir') . 'assets/sass/style.css', array(), \OgreAlert\Settings::get('version'), 'all');
wp_enqueue_script('ogrealert', \OgreAlert\Settings::get('dir') . 'assets/js/display.js', array('jquery'), \OgreAlert\Settings::get('version'), true);
wp_localize_script('ogrealert', 'ogrealert', array(
'text_color' => \OgreAlert\Settings::get('message_text_color'),
diff --git a/ogrealert.php b/ogrealert.php
index 4b8e118..cc069df 100644
--- a/ogrealert.php
+++ b/ogrealert.php
@@ -3,7 +3,7 @@
Plugin Name: OgreAlert
Plugin URI: https://plugins.cleverogre.com/plugin/ogrealert/
Description: OgreAlert is a plugin developed by CleverOgre in Pensacola, Florida.
-Version: 0.1.7
+Version: 0.1.8
Author: CleverOgre
Author URI: https://cleverogre.com/
Icon1x: https://plugins.cleverogre.com/plugin/ogrealert/?asset=icon-sm
@@ -45,7 +45,7 @@ class Plugin {
// Default Settings
\OgreAlert\Settings::set('name', 'OgreAlert');
- \OgreAlert\Settings::set('version', '0.1.7');
+ \OgreAlert\Settings::set('version', '0.1.8');
\OgreAlert\Settings::set('capability', 'edit_posts');
\OgreAlert\Settings::set('path', $path);
\OgreAlert\Settings::set('dir', self::get_dir(__FILE__));
diff --git a/readme.txt b/readme.txt
index 397ad14..0ca1f55 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,8 +3,8 @@ Contributors: ogrecooper
Donate link: https://cleverogre.com/
Tags: development, warning, modal, dismissable
Requires at least: 4.8.0
-Tested up to: 5.3.2
-Stable tag: 0.1.7
+Tested up to: 5.7.1
+Stable tag: 0.1.8
License: GPLv2 or later
License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -62,6 +62,12 @@ By default, the OgreAlert plugin will be able to update without an activated lic
== Changelog ==
+= 0.1.8 - 05-12-2021 =
+* DEV: Moved FontAwesome webfonts to separated folder in assets.
+* DEV: Added plugin packaging makefile.
+* DEV: Renamed "scss" folder to "sass".
+* DEV: Removed FontAwesome SVG assets to reduce package file size. Reduces compatibility with old IE versions.
+
= 0.1.7 - 04-06-2020 =
* Fixed posts column expiration date display bug.