Updated dependencies and fixed issue with CMS tree filter

praxisnetau · Jun 15, 2017 · 1d26487 · 1d26487
1 parent cbd8711
commit 1d26487
Show file tree

Hide file tree

Showing 9 changed files with 245 additions and 186 deletions.
diff --git a/_config/config.yml b/_config/config.yml
@@ -2,15 +2,15 @@
 Name: silverware-datepicker
 ---
 
-# Configure Admin Extensions:
+# Configure Admin Requirements:
 
 SilverStripe\Admin\LeftAndMain:
   extra_requirements_css:
     - silverware-datepicker/client/dist/styles/bundle.css
   extra_requirements_javascript:
     - silverware-datepicker/client/dist/js/bundle.js
 
-# Configure DateField Extensions:
+# Configure Date Field:
 
 SilverStripe\Forms\DateField:
   extensions:

diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
diff --git a/client/src/styles/bundle.scss b/client/src/styles/bundle.scss
@@ -1,7 +1,7 @@
 /* SilverWare Datepicker Bundle
 ===================================================================================================================== */
 
-// Import Variables:
+// Import Local Variables:
 
 @import "variables";
 

diff --git a/client/src/styles/forms/DateFieldPolyfill.scss b/client/src/styles/forms/DateFieldPolyfill.scss
@@ -17,6 +17,18 @@
 
     }
 
+    table {
+
+      width: 100%;
+      margin: 0;
+
+      td {
+        font-size: 1em;
+        border-bottom: 0;
+      }
+
+    }
+
     td:hover {
       background: $background-hover-days none;
     }

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
   ],
   "require": {
     "php": ">=5.6.0",
-    "silverstripe/framework": "^4.0@dev"
+    "silverstripe/framework": "^4@dev"
   },
   "autoload": {
     "psr-4": {
@@ -31,7 +31,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "0.1.x-dev"
+      "dev-master": "1.0.x-dev"
     },
     "installer-name": "silverware-datepicker"
   },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "silverware-datepicker",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "description": "SilverWare Datepicker Module.",
   "homepage": "https://github.com/praxisnetau/silverware-datepicker",
   "keywords": [

diff --git a/webpack.config.js b/webpack.config.js
@@ -29,7 +29,7 @@ const style = (env, loaders) => {
   return (env === 'production') ? ExtractTextPlugin.extract({
     fallback: 'style-loader',
     use: loaders
-  }) : ['style-loader'].concat(loaders);
+  }) : [{ loader: 'style-loader' }].concat(loaders);
 };
 
 // Configure Rules:
@@ -161,8 +161,7 @@ const config = (env) => {
         ]
       },
       externals: {
-        jquery: 'jQuery',
-        jQuery: 'jQuery'
+        jquery: 'jQuery'
       }
     }
   ];