#319: Add Kodekit UI

web/administrator/templates/elysio/bower.json

@@ -16,7 +16,6 @@
     "footable": "2.0.3",
     "floatThead": "1.3.0",
     "modernizr": "https://github.com/Modernizr/Modernizr.git#2.8.3",
-    "magnific-popup": "1.0.0",
-    "kodekit-ui": "timble/kodekit-ui"
+    "magnific-popup": "1.0.0"
   }
 }

web/administrator/templates/elysio/gruntfile.js

@@ -35,7 +35,11 @@ module.exports = function(grunt) {
         // Compile sass files
         sass: {
             options: {
-                outputStyle: 'compact'
+                outputStyle: 'compact',
+                includePaths: [
+                    'bower_components', // bower
+                    'node_modules' // npm
+                ]
             },
             dist: {
                 files: {
@@ -86,7 +90,7 @@ module.exports = function(grunt) {
                     ]
                 },
                 options: {
-                    proxy: "http://joomla.box/joomla-platform/web/administrator/",
+                    proxy: "http://joomla.box/joomlatools-platform/web/administrator/",
                     port: bsport,
                     open: true,
                     notify: false,
@@ -149,4 +153,4 @@ module.exports = function(grunt) {
     // The dev task will be used during development
     grunt.registerTask('default', ['shell', 'browserSync', 'watch']);
 
-};
+};

web/administrator/templates/elysio/package.json

@@ -9,11 +9,12 @@
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-uglify": "^2.3.0",
     "grunt-contrib-watch": "^1.0.0",
-    "grunt-string-replace": "^1.2.0",
     "grunt-sass": "^2.0.0",
     "grunt-shell": "^2.1.0",
+    "grunt-string-replace": "^1.2.0",
     "grunt-webfont": "^1.6.0",
     "jit-grunt": "^0.10.0",
+    "kodekit-ui": "timble/kodekit-ui",
     "time-grunt": "^1.0.0"
   }
-}
+}

web/administrator/templates/elysio/scss/admin.scss

@@ -5,6 +5,9 @@
 // Import default Joomla styling (Joomlatools framework)
 @import "nooku/admin";
 
+// Import default Joomla styling (Joomlatools framework)
+@import "kodekit-ui/src/scss/admin-ui.scss";
+
 // Basic html and body setup
 @import "utilities/setup";
 

web/administrator/templates/elysio/yarn.lock

@@ -414,17 +414,7 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@^1.0.0, chalk@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.0.0.tgz#b3cf4ed0ff5397c99c75b8f679db2f52831f96dc"
-  dependencies:
-    ansi-styles "^2.0.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^1.0.3"
-    strip-ansi "^2.0.1"
-    supports-color "^1.3.0"
-
-chalk@^1.1.1, chalk@^1.1.3, chalk@~1.1.1:
+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3, chalk@~1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -434,6 +424,16 @@ chalk@^1.1.1, chalk@^1.1.3, chalk@~1.1.1:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.0.0.tgz#b3cf4ed0ff5397c99c75b8f679db2f52831f96dc"
+  dependencies:
+    ansi-styles "^2.0.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^1.0.3"
+    strip-ansi "^2.0.1"
+    supports-color "^1.3.0"
+
 chokidar@1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.6.1.tgz#2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2"
@@ -1578,6 +1578,10 @@ klaw@^1.0.0:
   optionalDependencies:
     graceful-fs "^4.1.9"
 
+kodekit-ui@timble/kodekit-ui:
+  version "0.1.0"
+  resolved "https://codeload.github.com/timble/kodekit-ui/tar.gz/cf8be3fc0bcbc32371c49d6c427f1251025e8418"
+
 lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"