Merge pull request #136 from C-Lodder/switcher

Fix npm and grunt
joomla · Nov 9, 2016 · b21bbd8 · b21bbd8
2 parents bb1e977 + 8a54fd6
commit b21bbd8
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 18 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -81,7 +81,6 @@ module.exports = function(grunt) {
 					'media/vendor/tinymce/themes/*',
 					'media/vendor/punycode/*',
 					'media/vendor/codemirror/*',
-					'media/vendor/autocomplete/*',
 					'media/vendor/mediaelement/*',
 					'media/vendor/chosenjs/*',
 					'media/vendor/awesomplete/*',
@@ -160,8 +159,6 @@ module.exports = function(grunt) {
 					{ expand: true, cwd: 'build/assets_tmp/node_modules/cropperjs/dist', src: ['*.css'], dest: 'media/vendor/cropperjs/css/', filter: 'isFile'},
 					// Cropperjs js files
 					{ expand: true, cwd: 'build/assets_tmp/node_modules/cropperjs/dist', src: ['*.js'], dest: 'media/vendor/cropperjs/js/', filter: 'isFile'},
-					// autocomplete js files
-					{ expand: true, cwd: 'build/assets_tmp/tmp/autocomplete/dist', src: ['jquery.autocomplete.min.js', 'jquery.autocomplete.js', 'license.txt'], dest: 'media/vendor/autocomplete/js/', filter: 'isFile'},
 					//Font Awesome css files
 					{ expand: true, cwd: 'build/assets_tmp/node_modules/font-awesome/css/', src: ['**'], dest: 'media/vendor/font-awesome/css/', filter: 'isFile'},
 					//Font Awesome scss files
@@ -341,8 +338,6 @@ module.exports = function(grunt) {
 		[
 			'clean:assets',
 			'shell:update',
-			'curl:autoComplete',
-			'unzip:autoUnzip',
 			'concat:someFiles',
 			'copy:fromSource',
 			'sass:dist',

diff --git a/administrator/templates/atum/css/template.css b/administrator/templates/atum/css/template.css
@@ -8449,13 +8449,11 @@ small, .small {
     padding: 0.7rem 1.25rem;
     overflow: hidden; }
     .com_cpanel .list-group > li.published {
-      border-left: 5px solid #5cb85c;
       padding-left: .9rem;
-      padding-left: .9rem; }
+      border-left: 5px solid #5cb85c; }
     .com_cpanel .list-group > li.unpublished {
-      border-left: 5px solid #d9534f;
       padding-left: .9rem;
-      padding-left: .9rem; }
+      border-left: 5px solid #d9534f; }
   .com_cpanel .list-group:first-of-type {
     border-top: 0; }
 

diff --git a/administrator/templates/atum/css/template.css.map b/administrator/templates/atum/css/template.css.map
diff --git a/administrator/templates/atum/css/template.min.css b/administrator/templates/atum/css/template.min.css
diff --git a/grunt_settings.yaml b/grunt_settings.yaml
@@ -48,13 +48,6 @@ vendors:
                   'dependencies': ''
 
 
-### These are always fetced with curl ###
-
-
-    'autocomplete':
-                  'version': '1.2.26'
-                  'dependencies': ''
-
 ### The javascript polyfills
 polyfills:
         - 'Element.prototype.classList'

diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
     "grunt-contrib-copy": "latest",
     "grunt-contrib-cssmin": "latest",
     "grunt-contrib-uglify": "latest",
+    "grunt-postcss": "0.8.0",
     "grunt-scss-lint": "^0.5.0",
     "grunt-fetch-pages": "^2.0.0",
     "grunt-shell": "latest",