Merge branch 'release/2.12.3'

WP-for-Church · Mar 19, 2018 · 7e51364 · 7e51364
2 parents 16766c8 + 62f3daa
commit 7e51364
Show file tree

Hide file tree

Showing 37 changed files with 4,986 additions and 1,010 deletions.
diff --git a/assets/css/_import-export.css b/assets/css/_import-export.css
diff --git a/assets/css/_import-export.css.map b/assets/css/_import-export.css.map
diff --git a/assets/css/admin-icon.css b/assets/css/admin-icon.css
@@ -1,9 +1,9 @@
 .dashicons-sermon-manager:before {
-  font-family: "SermonManager";
-  content: "\e900"; }
+  font-family: "SermonManager", serif;
+  content: "\e900";
+}
 
 @font-face {
   font-family: SermonManager;
-  src: url(../fonts/Sermon-Manager.ttf); }
-
-/*# sourceMappingURL=admin-icon.css.map */
+  src: url(../fonts/Sermon-Manager.ttf);
+}
diff --git a/assets/css/admin-icon.css.map b/assets/css/admin-icon.css.map
diff --git a/assets/css/admin-icon.scss b/assets/css/admin-icon.scss
diff --git a/assets/css/_add-edit-sermon.scss → .../css/admin-partials/_add-edit-sermon.scss b/assets/css/_add-edit-sermon.scss → .../css/admin-partials/_add-edit-sermon.scss
diff --git a/assets/css/_all-sermons.scss → assets/css/admin-partials/_all-sermons.scss b/assets/css/_all-sermons.scss → assets/css/admin-partials/_all-sermons.scss
diff --git a/assets/css/_import-export.scss → ...ts/css/admin-partials/_import-export.scss b/assets/css/_import-export.scss → ...ts/css/admin-partials/_import-export.scss
diff --git a/assets/css/_settings.scss → assets/css/admin-partials/_settings.scss b/assets/css/_settings.scss → assets/css/admin-partials/_settings.scss
diff --git a/assets/css/admin.css b/assets/css/admin.css