Merge branch 'release/2.9'

WP-for-Church · Dec 1, 2017 · deff764 · deff764
2 parents 99c2856 + 4470239
commit deff764
Show file tree

Hide file tree

Showing 81 changed files with 6,307 additions and 5,037 deletions.
diff --git a/assets/css/admin-icon.css b/assets/css/admin-icon.css
diff --git a/assets/css/admin-icon.css.map b/assets/css/admin-icon.css.map
diff --git a/assets/css/admin.css b/assets/css/admin.css
diff --git a/assets/css/admin.css.map b/assets/css/admin.css.map
diff --git a/assets/css/admin.scss b/assets/css/admin.scss
@@ -0,0 +1,14 @@
+// all sermons page
+body.edit-php.post-type-wpfc_sermon {
+  @import 'all-sermons';
+}
+
+// settings page
+body.wpfc_sermon_page_sm-settings {
+  @import 'settings';
+}
+
+// import export page
+body.wpfc_sermon_page_sm-import-export {
+  @import 'import-export';
+}
diff --git a/assets/css/all-sermons.css b/assets/css/all-sermons.css
diff --git a/assets/css/all-sermons.css.map b/assets/css/all-sermons.css.map
diff --git a/assets/css/all-sermons.scss b/assets/css/all-sermons.scss
@@ -0,0 +1,13 @@
+.fixed {
+  .column-preacher, .column-preached {
+    width: 10%;
+  }
+
+  .column-series, .column-topics {
+    width: 15%;
+  }
+
+  .column-views {
+    width: 7%;
+  }
+}