Merge pull request #672 from bolt/refactor/use-setcontent-in-backend

Refactor: use setcontent in backend
bolt · Oct 14, 2019 · 4e437f3 · 4e437f3
2 parents f8791c0 + 4fc452a
commit 4e437f3
Show file tree

Hide file tree

Showing 24 changed files with 285 additions and 271 deletions.
diff --git a/assets/scss/modules/base/_pagination.scss b/assets/scss/modules/base/_pagination.scss
diff --git a/assets/scss/modules/base/base.scss b/assets/scss/modules/base/base.scss
@@ -1,6 +1,5 @@
 //** Base Modules
 
 @import '_status';
-@import '_pagination';
 @import '_notification';
 @import '_buttons';
diff --git a/assets/scss/modules/listing/_filter.scss b/assets/scss/modules/listing/_filter.scss
@@ -13,12 +13,6 @@
     margin-bottom: $spacer;
   }
 
-  .pagination {
-    nav {
-      height: 100%;
-    }
-  }
-
   &--controls {
     flex: 1 1 100%;
     text-align: right;

diff --git a/assets/scss/vendor/bootstrap/bootstrap.scss b/assets/scss/vendor/bootstrap/bootstrap.scss
@@ -22,6 +22,7 @@
 @import "~bootstrap/scss/modal";
 @import "~bootstrap/scss/close";
 @import "~bootstrap/scss/progress";
+@import "~bootstrap/scss/pagination";
 @import "~bootstrap/scss/nav";
 @import "~bootstrap/scss/tooltip";
 @import "~bootstrap/scss/toasts";

diff --git a/config/bolt/contenttypes.yaml b/config/bolt/contenttypes.yaml
@@ -293,6 +293,8 @@ blocks:
     icon_many: "fa:cubes"
     icon_one: "fa:cube"
     sort: title
+    records_per_page: 12
+
 
 # This contenttype is here to use for (automated) tests.
 tests: