diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 944bd1f65..2c953be8b 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -141,6 +141,14 @@ - **Table** - Fix inheritance of text alignment and vertical alignment - **Transition** - Fixed bug where transition could sometimes not occur when an element was determined to always be hidden +### Version 1.11.7 - April 13, 2015 + +**Bugs** + +- **Sticky** - Fixes errant `console.log` statement appearing in source +- **Card** - Fixes card `flex` display issues in IE +- **Build Tools** - Fixes issue where `npm update` install scripts would remove custom themes from `src/themes/` during copy after updating Semantic UI + ### Version 1.11.6 - March 27, 2015 More critical bug backports from `2.x` branch, as well as fixes for browserify diff --git a/tasks/admin/components/update.js b/tasks/admin/components/update.js index a7e94f335..e4b57a572 100644 --- a/tasks/admin/components/update.js +++ b/tasks/admin/components/update.js @@ -116,7 +116,7 @@ module.exports = function(callback) { function commitFiles() { // commit files console.info('Committing ' + component + ' files', commitArgs); - gulp.src('**/*', gitOptions) + gulp.src('./', gitOptions) .pipe(git.add(gitOptions)) .pipe(git.commit(commitMessage, commitOptions)) .on('error', function(error) { diff --git a/tasks/admin/distributions/update.js b/tasks/admin/distributions/update.js index 8a9bcbbed..0035cc3f9 100644 --- a/tasks/admin/distributions/update.js +++ b/tasks/admin/distributions/update.js @@ -114,7 +114,7 @@ module.exports = function(callback) { function commitFiles() { // commit files console.info('Committing ' + distribution + ' files', commitArgs); - gulp.src('**/*', gitOptions) + gulp.src('./', gitOptions) .pipe(git.add(gitOptions)) .pipe(git.commit(commitMessage, commitOptions)) .on('error', function(error) { diff --git a/tasks/config/project/install.js b/tasks/config/project/install.js index 7e7c68ffc..2319c2898 100644 --- a/tasks/config/project/install.js +++ b/tasks/config/project/install.js @@ -252,15 +252,16 @@ module.exports = { // folder paths to files relative to root folders: { - config : './', - definitions : 'src/definitions/', - lessImport : 'src/', - modules : 'node_modules/', - site : 'src/site/', - tasks : 'tasks/', - themeConfig : 'src/', - themeImport : 'src/', - themes : 'src/themes/' + config : './', + definitions : 'src/definitions/', + defaultTheme : 'default/', + lessImport : 'src/', + modules : 'node_modules/', + site : 'src/site/', + tasks : 'tasks/', + themeConfig : 'src/', + themeImport : 'src/', + themes : 'src/themes/' }, // questions asked during install @@ -729,33 +730,20 @@ module.exports = { /* Copy Install Folders */ wrench: { - // copy during npm update (default theme / definition) - update: { + // overwrite existing files update & install (default theme / definition) + overwrite: { forceDelete : true, excludeHiddenUnix : true, preserveFiles : false }, - // copy during first npm install - install: { - forceDelete : true, - excludeHiddenUnix : true, - preserveFiles : false - }, - - // copy for node_modules - modules: { - forceDelete : true, - excludeHiddenUnix : true, - preserveFiles : false - }, - - // copy for site theme - site: { + // only create files that don't exist (site theme update) + merge: { forceDelete : false, excludeHiddenUnix : true, preserveFiles : true } + } } diff --git a/tasks/install.js b/tasks/install.js index 7346a2149..d7da7fc99 100644 --- a/tasks/install.js +++ b/tasks/install.js @@ -92,7 +92,7 @@ module.exports = function () { themeImport : path.join(updateFolder, folders.themeImport), definition : path.join(currentConfig.paths.source.definitions), site : path.join(currentConfig.paths.source.site), - theme : path.join(currentConfig.paths.source.themes) + theme : path.join(currentConfig.paths.source.themes, folders.defaultTheme) } ; @@ -104,13 +104,13 @@ module.exports = function () { console.log('Updating Semantic UI from ' + currentConfig.version + ' to ' + release.version); console.info('Updating ui definitions...'); - wrench.copyDirSyncRecursive(source.definitions, updatePaths.definition, settings.wrench.update); + wrench.copyDirSyncRecursive(source.definitions, updatePaths.definition, settings.wrench.overwrite); console.info('Updating default theme...'); - wrench.copyDirSyncRecursive(source.themes, updatePaths.theme, settings.wrench.update); + wrench.copyDirSyncRecursive(source.themes, updatePaths.theme, settings.wrench.overwrite); console.info('Updating tasks...'); - wrench.copyDirSyncRecursive(source.tasks, updatePaths.tasks, settings.wrench.update); + wrench.copyDirSyncRecursive(source.tasks, updatePaths.tasks, settings.wrench.overwrite); console.info('Updating gulpfile.js'); gulp.src(source.userGulpFile) @@ -126,7 +126,7 @@ module.exports = function () { ; console.info('Adding new site theme files...'); - wrench.copyDirSyncRecursive(source.site, updatePaths.site, settings.wrench.site); + wrench.copyDirSyncRecursive(source.site, updatePaths.site, settings.wrench.merge); console.info('Updating version...'); @@ -268,11 +268,11 @@ module.exports = function () { console.log('Installing to \033[92m' + answers.semanticRoot + '\033[0m'); console.info('Copying UI definitions'); - wrench.copyDirSyncRecursive(source.definitions, installPaths.definition, settings.wrench.install); - wrench.copyDirSyncRecursive(source.themes, installPaths.theme, settings.wrench.install); + wrench.copyDirSyncRecursive(source.definitions, installPaths.definition, settings.wrench.overwrite); + wrench.copyDirSyncRecursive(source.themes, installPaths.theme, settings.wrench.overwrite); console.info('Copying gulp tasks'); - wrench.copyDirSyncRecursive(source.tasks, installPaths.tasks, settings.wrench.install); + wrench.copyDirSyncRecursive(source.tasks, installPaths.tasks, settings.wrench.overwrite); // copy theme import console.info('Adding theme files');