Updated for new version

praxisnetau · Sep 22, 2017 · 2e526eb · 2e526eb
1 parent 6e5448c
commit 2e526eb
Show file tree

Hide file tree

Showing 45 changed files with 1,847 additions and 634 deletions.
diff --git a/_config/buttons.yml b/_config/buttons.yml
@@ -0,0 +1,17 @@
+---
+Name: silverware-buttons
+---
+
+# Define Button Types:
+
+SilverWare\Extensions\Style\ButtonStyle:
+  button_types:
+    primary: Primary
+    secondary: Secondary
+    success: Success
+    info: Info
+    warning: Warning
+    danger: Danger
+    light: Light
+    dark: Dark
+    link: Link
diff --git a/_config/controller.yml b/_config/controller.yml
@@ -34,7 +34,6 @@ SilverStripe\CMS\Controllers\ContentController:
   load_themed_js: true
   load_themed_css: false
   load_custom_css: true
-  load_component_requirements: true
   disable_cache: true
 
 ---
@@ -51,5 +50,4 @@ SilverStripe\CMS\Controllers\ContentController:
   load_themed_js: true
   load_themed_css: true
   load_custom_css: true
-  load_component_requirements: false
   disable_cache: false
diff --git a/_config/styles.yml b/_config/styles.yml
@@ -32,6 +32,30 @@ SilverWare\Grid\Frameworks\Bootstrap\Framework:
       white: bg-white
       light: bg-light
       dark: bg-dark
+    button:
+      button: btn
+      primary: btn-primary
+      secondary: btn-secondary
+      success: btn-success
+      danger: btn-danger
+      warning: btn-warning
+      info: btn-info
+      light: btn-light
+      dark: btn-dark
+      link: btn-link
+      outline-primary: btn-outline-primary
+      outline-secondary: btn-outline-secondary
+      outline-success: btn-outline-success
+      outline-danger: btn-outline-danger
+      outline-warning: btn-outline-warning
+      outline-info: btn-outline-info
+      outline-light: btn-outline-light
+      outline-dark: btn-outline-dark
+      small: btn-sm
+      large: btn-lg
+    content:
+      content: content
+      typography: typography
     feature:
       body: card-body
       feature: card

diff --git a/admin/client/dist/images/icons/Button.png b/admin/client/dist/images/icons/Button.png
diff --git a/admin/client/dist/js/bundle.js b/admin/client/dist/js/bundle.js
diff --git a/admin/client/dist/styles/bundle.css b/admin/client/dist/styles/bundle.css
diff --git a/admin/client/src/entwine/ListViewExtension.js b/admin/client/src/entwine/ListViewExtension.js
@@ -36,11 +36,11 @@ $.entwine('silverware.listviewextension', function($) {
     },
 
     getPaginateItemsField: function() {
-      return $(this).find('#Form_EditForm_ListPaginateItems');
+      return $(this).find('#Form_EditForm_List_PaginateItems');
     },
 
     getPaginationHolder: function() {
-      return $(this).find('#Form_EditForm_ListItemsPerPage_Holder');
+      return $(this).find('#Form_EditForm_List_ItemsPerPage_Holder');
     }
 
   });

diff --git a/admin/client/src/images/icons/Button.png b/admin/client/src/images/icons/Button.png
diff --git a/admin/client/src/styles/_admin.scss b/admin/client/src/styles/_admin.scss
@@ -67,6 +67,12 @@
     }
   }
 
+  &.fieldgroup {
+    > .hidden {
+      display: none;
+    }
+  }
+
 }
 
 // Badge Styles: