fomantic-ui 2.9.1-beta.30 → 2.9.1-beta.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fomantic-ui",
-  "version": "2.9.1-beta.30+42e4040",
+  "version": "2.9.1-beta.31+0b65a82",
   "description": "Fomantic empowers designers and developers by creating a shared vocabulary for UI.",
   "keywords": [
     "fomantic-ui",

package/src/theme.less

@@ -16,7 +16,9 @@
 @import "@{themesFolder}/default/globals/site.variables";
 
 /* Packaged site.variables */
-@import (optional) "@{themesFolder}/@{site}/globals/site.variables";
+& when not (@site = "default") {
+    @import (optional) "@{themesFolder}/@{site}/globals/site.variables";
+}
 
 /* Component's site.variables */
 & when not (@theme = "default") {
@@ -46,8 +48,18 @@
 /* Default */
 @import "@{themesFolder}/default/globals/colors.less";
 
+/* Packaged colors.less */
+& when not (@site = "default") {
+    @import (optional) "@{themesFolder}/@{site}/globals/colors.less";
+}
+
+/* Packaged Theme */
+& when not (@theme = "default") {
+    @import (optional) "@{themesFolder}/@{theme}/globals/colors.less";
+}
+
 /* Site Theme */
-@import (optional) "@{themesFolder}/@{site}/globals/colors.less";
+@import (optional) "@{siteFolder}/globals/colors.less";
 
 /*******************************
              Mix-ins

package/tasks/admin/components/init.js

@@ -24,7 +24,6 @@ const
     mkdirp    = require('mkdirp'),
 
     // admin files
-    github    = require('../../config/admin/github'),
     release   = require('../../config/admin/release'),
     project   = require('../../config/project/release'),
 
@@ -38,6 +37,8 @@ const
 ;
 
 module.exports = function (callback) {
+    const github = require('../../config/admin/github'); // eslint-disable-line global-require
+
     let
         index = -1,
         total = release.components.length,

package/tasks/admin/components/update.js

@@ -22,7 +22,6 @@ const
     git            = require('gulp-git'),
 
     // admin files
-    github         = require('../../config/admin/github'),
     release        = require('../../config/admin/release'),
     project        = require('../../config/project/release'),
 
@@ -36,6 +35,8 @@ const
 ;
 
 module.exports = function (callback) {
+    const github = require('../../config/admin/github'); // eslint-disable-line global-require
+
     let
         index = -1,
         total = release.components.length,
@@ -73,7 +74,7 @@ module.exports = function (callback) {
                 : '',
 
             componentPackage = fs.existsSync(outputDirectory + 'package.json')
-                ? require(outputDirectory + 'package.json') // eslint-disable-line import/no-dynamic-require
+                ? require(outputDirectory + 'package.json') // eslint-disable-line global-require, import/no-dynamic-require
                 : false,
 
             isNewVersion  = version && componentPackage.version !== version,

package/tasks/admin/distributions/init.js

@@ -24,7 +24,6 @@ const
     mkdirp    = require('mkdirp'),
 
     // admin files
-    github    = require('../../config/admin/github'),
     release   = require('../../config/admin/release'),
     project   = require('../../config/project/release'),
 
@@ -38,6 +37,8 @@ const
 ;
 
 module.exports = function (callback) {
+    const github = require('../../config/admin/github'); // eslint-disable-line global-require
+
     let
         index = -1,
         total = release.distributions.length,

package/tasks/admin/distributions/update.js

@@ -22,7 +22,6 @@ const
     git            = require('gulp-git'),
 
     // admin files
-    github         = require('../../config/admin/github'),
     release        = require('../../config/admin/release'),
     project        = require('../../config/project/release'),
 
@@ -36,6 +35,8 @@ const
 ;
 
 module.exports = function (callback) {
+    const github = require('../../config/admin/github'); // eslint-disable-line global-require
+
     let
         index = -1,
         total = release.distributions.length,
@@ -69,7 +70,7 @@ module.exports = function (callback) {
                 : '',
 
             distributionPackage = fs.existsSync(outputDirectory + 'package.json')
-                ? require(outputDirectory + 'package.json') // eslint-disable-line import/no-dynamic-require
+                ? require(outputDirectory + 'package.json') // eslint-disable-line global-require, import/no-dynamic-require
                 : false,
 
             isNewVersion  = version && distributionPackage.version !== version,

package/tasks/collections/admin.js

@@ -2,6 +2,22 @@
  *    Admin Task Collection
  *******************************/
 
+const
+    // less/css distributions
+    initComponents      = require('../admin/components/init'),
+    createComponents    = require('../admin/components/create'),
+    updateComponents    = require('../admin/components/update'),
+
+    // single component releases
+    initDistributions   = require('../admin/distributions/init'),
+    createDistributions = require('../admin/distributions/create'),
+    updateDistributions = require('../admin/distributions/update'),
+
+    release             = require('../admin/release'),
+    publish             = require('../admin/publish'),
+    register            = require('../admin/register')
+;
+
 /*
   This are tasks to be run by project maintainers
   - Creating Component Repos
@@ -14,22 +30,6 @@
  *******************************/
 
 module.exports = function (gulp) {
-    const
-        // less/css distributions
-        initComponents      = require('../admin/components/init'),
-        createComponents    = require('../admin/components/create'),
-        updateComponents    = require('../admin/components/update'),
-
-        // single component releases
-        initDistributions   = require('../admin/distributions/init'),
-        createDistributions = require('../admin/distributions/create'),
-        updateDistributions = require('../admin/distributions/update'),
-
-        release             = require('../admin/release'),
-        publish             = require('../admin/publish'),
-        register            = require('../admin/register')
-    ;
-
     /* Release */
     gulp.task('init distributions', initDistributions);
     gulp.task('init distributions').description = 'Grabs each component from GitHub';

package/tasks/collections/build.js

@@ -2,17 +2,16 @@
  *    Define Build Sub-Tasks
  *******************************/
 
-module.exports = function (gulp) {
-    // build sub-tasks
-    const
-        watch       = require('../watch'),
+const watch = require('../watch'),
 
-        build       = require('../build'),
-        buildJS     = require('../build/javascript'),
-        buildCSS    = require('../build/css'),
-        buildAssets = require('../build/assets')
-    ;
+    // build sub-tasks
+    build = require('../build'),
+    buildJS = require('../build/javascript'),
+    buildCSS = require('../build/css'),
+    buildAssets = require('../build/assets')
+;
 
+module.exports = function (gulp) {
     gulp.task('watch', watch);
     gulp.task('watch').description = 'Watch for site/theme changes';
 

package/tasks/collections/docs.js

@@ -2,17 +2,16 @@
  *     Define Docs Sub-Tasks
  *******************************/
 
+// docs tasks
+const buildDocs = require('../docs/build'),
+    serveDocs = require('../docs/serve')
+;
+
 /*
   Lets you serve files to a local documentation instance
   https://github.com/fomantic/Fomantic-UI-Docs/
 */
 module.exports = function (gulp) {
-    let
-        // docs tasks
-        serveDocs = require('../docs/serve'),
-        buildDocs = require('../docs/build')
-    ;
-
     gulp.task('serve-docs', serveDocs);
     gulp.task('serve-docs').description = 'Serve file changes to SUI Docs';
 

package/tasks/collections/install.js

@@ -2,17 +2,16 @@
  *   Define Install Sub-Tasks
  *******************************/
 
+// docs tasks
+const install = require('../install'),
+    checkInstall = require('../check-install')
+;
+
 /*
   Lets you serve files to a local documentation instance
   https://github.com/fomantic/Fomantic-UI-Docs/
 */
 module.exports = function (gulp) {
-    let
-        // docs tasks
-        install      = require('../install'),
-        checkInstall = require('../check-install')
-    ;
-
     gulp.task('install', install);
     gulp.task('install').description = 'Runs set-up';
 

package/tasks/collections/rtl.js

@@ -2,13 +2,11 @@
  *     Define RTL Sub-Tasks
  *******************************/
 
-module.exports = function (gulp) {
-    // rtl
-    const
-        buildRTL = require('../rtl/build'),
-        watchRTL = require('../rtl/watch')
-    ;
+const buildRTL = require('../rtl/build'),
+    watchRTL = require('../rtl/watch')
+;
 
+module.exports = function (gulp) {
     gulp.task('watch-rtl', watchRTL);
     gulp.task('watch-rtl').description = 'DEPRECATED - use \'watch\' instead - Watch files as RTL';
 

package/tasks/collections/various.js

@@ -2,16 +2,15 @@
  *   Define Various Sub-Tasks
  *******************************/
 
+const clean = require('../clean'),
+    version = require('../version')
+;
+
 /*
   Lets you serve files to a local documentation instance
   https://github.com/fomantic/Fomantic-UI-Docs/
 */
 module.exports = function (gulp) {
-    let
-        clean   = require('../clean'),
-        version = require('../version')
-    ;
-
     gulp.task('clean', clean);
     gulp.task('clean').description = 'Clean dist folder';
 

package/tasks/config/npm/gulpfile.js

@@ -6,7 +6,9 @@ const
     gulp   = require('gulp'),
 
     // read user config to know what task to load
-    config = require('./tasks/config/user') // eslint-disable-line import/extensions
+    config = require('./tasks/config/user'), // eslint-disable-line import/extensions
+
+    rtl = require('./tasks/collections/rtl') // eslint-disable-line import/extensions
 ;
 
 /*******************************
@@ -30,5 +32,5 @@ require('./tasks/collections/docs')(gulp); // eslint-disable-line import/extensi
 --------------- */
 
 if (config.rtl) {
-    require('./tasks/collections/rtl')(gulp); // eslint-disable-line import/extensions
+    rtl(gulp);
 }

package/tasks/config/project/release.js

@@ -17,7 +17,7 @@ let
 config = requireDotFile('semantic.json', process.cwd());
 
 try {
-    npmPackage = require('../../../package.json');
+    npmPackage = require('../../../package.json'); // eslint-disable-line global-require
 } catch (error) {
     // generate fake package
     npmPackage = {

package/tasks/rtl/build.js

@@ -2,9 +2,11 @@
  *         Build Task
  *******************************/
 
-const gulp = require('gulp');
+const gulp = require('gulp'),
+    build = require('../build')
+;
 
 // RTL builds are now handled by the default build process
 module.exports = function (callback) {
-    gulp.series(require('../build'))(callback);
+    gulp.series(build)(callback);
 };

package/tasks/rtl/watch.js

@@ -2,9 +2,12 @@
  *          Watch Task
  *******************************/
 
-const gulp = require('gulp');
+const
+    gulp = require('gulp'),
+    watch = require('../watch')
+;
 
 // RTL watch are now handled by the default watch process
 module.exports = function (callback) {
-    gulp.series(require('../watch'))(callback);
+    gulp.series(watch)(callback);
 };