Merge branch 'master' of github.com:Semantic-Org/Semantic-UI into next

Conflicts:
	RELEASE-NOTES.md
	dist/components/accordion.css
	dist/components/accordion.min.css
	dist/components/accordion.min.js
	dist/components/ad.css
	dist/components/ad.min.css
	dist/components/api.min.js
	dist/components/breadcrumb.css
	dist/components/breadcrumb.min.css
	dist/components/button.css
	dist/components/button.min.css
	dist/components/card.css
	dist/components/card.min.css
	dist/components/checkbox.css
	dist/components/checkbox.min.css
	dist/components/checkbox.min.js
	dist/components/comment.css
	dist/components/comment.min.css
	dist/components/dimmer.css
	dist/components/dimmer.min.css
	dist/components/dimmer.min.js
	dist/components/divider.css
	dist/components/divider.min.css
	dist/components/dropdown.css
	dist/components/dropdown.min.css
	dist/components/dropdown.min.js
	dist/components/feed.css
	dist/components/feed.min.css
	dist/components/flag.css
	dist/components/flag.min.css
	dist/components/form.css
	dist/components/form.min.css
	dist/components/form.min.js
	dist/components/grid.css
	dist/components/grid.min.css
	dist/components/header.css
	dist/components/header.min.css
	dist/components/icon.css
	dist/components/icon.min.css
	dist/components/image.css
	dist/components/image.min.css
	dist/components/input.css
	dist/components/input.min.css
	dist/components/item.css
	dist/components/item.min.css
	dist/components/label.css
	dist/components/label.min.css
	dist/components/list.css
	dist/components/list.min.css
	dist/components/loader.css
	dist/components/loader.min.css
	dist/components/menu.css
	dist/components/menu.min.css
	dist/components/message.css
	dist/components/message.min.css
	dist/components/modal.css
	dist/components/modal.min.css
	dist/components/modal.min.js
	dist/components/nag.css
	dist/components/nag.min.css
	dist/components/nag.min.js
	dist/components/popup.css
	dist/components/popup.min.css
	dist/components/popup.min.js
	dist/components/progress.css
	dist/components/progress.min.css
	dist/components/progress.min.js
	dist/components/rail.css
	dist/components/rail.min.css
	dist/components/rating.css
	dist/components/rating.min.css
	dist/components/rating.min.js
	dist/components/reset.css
	dist/components/reset.min.css
	dist/components/reveal.css
	dist/components/reveal.min.css
	dist/components/search.css
	dist/components/search.min.css
	dist/components/search.min.js
	dist/components/segment.css
	dist/components/segment.min.css
	dist/components/shape.css
	dist/components/shape.min.css
	dist/components/shape.min.js
	dist/components/sidebar.css
	dist/components/sidebar.min.css
	dist/components/sidebar.min.js
	dist/components/site.css
	dist/components/site.min.css
	dist/components/site.min.js
	dist/components/state.min.js
	dist/components/statistic.css
	dist/components/statistic.min.css
	dist/components/step.css
	dist/components/step.min.css
	dist/components/sticky.css
	dist/components/sticky.min.css
	dist/components/sticky.min.js
	dist/components/tab.css
	dist/components/tab.min.css
	dist/components/tab.min.js
	dist/components/table.css
	dist/components/table.min.css
	dist/components/transition.css
	dist/components/transition.min.css
	dist/components/transition.min.js
	dist/components/video.css
	dist/components/video.min.css
	dist/components/video.min.js
	dist/components/visibility.min.js
	dist/semantic.css
	dist/semantic.js
	dist/semantic.min.css
	dist/semantic.min.js
	package.json

RELEASE-NOTES.md

@@ -34,6 +34,9 @@
 - **Transition** - Fixed bug with animations that contain the strings 'in' or 'out' as part of their names, for example "swing"
 - *Sticky** - Fixes issue with container size not being set explicitly on rail due to improper method renaming
 
+### Version 1.7.3 - January 16, 2015
+
+- **Installer** - Fix issue with component list in `semantic.json` not correctly overriding default components
 
 ### Version 1.7.(1-2) - January 15, 2015
 

gulpfile.js

@@ -118,7 +118,9 @@ var
       runSetup = true;
       config = defaults;
     }
-    config = extend(true, {}, defaults, config);
+
+    // extend defaults using shallow copy
+    config = extend(false, {}, defaults, config);
 
     // shorthand
     base    = config.base;
@@ -126,6 +128,7 @@ var
     output  = config.paths.output;
     source  = config.paths.source;
 
+    // npm package.json holds true "version"
     version = (package !== undefined)
       ? package.version || 'Unknown'
       : 'Unknown'
@@ -139,14 +142,14 @@ var
       : '{' + defaults.components.join(',') + '}'
     ;
 
-    // relative paths
+    // relative asset paths for css
     assetPaths = {
       uncompressed : path.relative(output.uncompressed, output.themes).replace(/\\/g,'/'),
       compressed   : path.relative(output.compressed, output.themes).replace(/\\/g,'/'),
       packaged     : path.relative(output.packaged, output.themes).replace(/\\/g,'/')
     };
 
-    // add base to values
+    // add base path to all folders
     for(var folder in source) {
       if(source.hasOwnProperty(folder)) {
         source[folder] = path.normalize(base + source[folder]);
@@ -177,11 +180,13 @@ gulp.task('watch', 'Watch for site/theme changes (Default Task)', function(callb
   console.clear();
   console.log('Watching source files for changes');
 
+
   if(!fs.existsSync(config.files.theme)) {
     console.error('Cant compile LESS. Run "gulp install" to create a theme config file');
     return;
   }
 
+  // start rtl task instead
   if(config.rtl) {
     gulp.start('watch rtl');
     return;
@@ -217,11 +222,13 @@ gulp.task('watch', 'Watch for site/theme changes (Default Task)', function(callb
       isConfig        = (file.path.indexOf('.config') !== -1);
 
       if(isDefinition || isPackagedTheme || isSiteTheme) {
+        // rebuild only matching definition file
         srcPath = util.replaceExtension(file.path, '.less');
         srcPath = srcPath.replace(config.regExp.themePath, source.definitions);
         srcPath = srcPath.replace(source.site, source.definitions);
       }
       else if(isConfig) {
+        // impossible to tell which file was updated in theme.config, rebuild all
         console.log('Change detected in theme config');
         gulp.start('build');
       }
@@ -247,7 +254,7 @@ gulp.task('watch', 'Watch for site/theme changes (Default Task)', function(callb
           .pipe(autoprefixer(settings.prefix))
         ;
 
-        // use 2 concurrent streams from same source
+        // use 2 concurrent streams from same pipe
         uncompressedStream = stream.pipe(clone());
         compressedStream   = stream.pipe(clone());
 
@@ -287,7 +294,7 @@ gulp.task('watch', 'Watch for site/theme changes (Default Task)', function(callb
     })
   ;
 
-  // watch changes in assets
+  // watch for changes in assets
   gulp
     .watch([
       source.themes   + '**/assets/**'
@@ -301,7 +308,7 @@ gulp.task('watch', 'Watch for site/theme changes (Default Task)', function(callb
     })
   ;
 
-  // watch changes in js
+  // watch for changes in js
   gulp
     .watch([
       source.definitions   + '**/*.js'
@@ -342,14 +349,14 @@ gulp.task('build', 'Builds all files from source', function(callback) {
     return;
   }
 
+  // Run RTL build instead
   if(config.rtl) {
     gulp.start('build rtl');
     return;
   }
 
-  // get relative asset path (path returns wrong path?)
   // assetPaths.source = path.relative(srcPath, path.resolve(source.themes));
-  assetPaths.source = '../../themes'; // hardcoded
+  assetPaths.source = '../../themes';  // path.relative returns wrong path (hardcoded for src)
 
   // copy assets
   gulp.src(source.themes + '**/assets/**')

package.json

@@ -1,6 +1,10 @@
 {
   "name": "semantic-ui",
+<<<<<<< HEAD
   "version": "1.8.0",
+=======
+  "version": "1.7.3",
+>>>>>>> 257d175bf6138cc19e767b8061466cc7f3d97017
   "title": "Semantic UI",
   "description": "Semantic empowers designers and developers by creating a shared vocabulary for UI.",
   "homepage": "http://www.semantic-ui.com",