Merge branch 'lab-01-project-setup-solved' into lab-02-first-componen…

…t-start

* lab-01-project-setup-solved:
  making css build easier
  moved semantic into client assets and removed build updated packages updated links for react-select
  Updating lab 1 welcome message to something generic. And not a cat picture.

Conflicts:
	api/views/index.jade

.gitignore

@@ -5,12 +5,6 @@ client/dist/*
 
 node_modules/*
 
-client/test-reports/*
-
-client/docs/*
-
-client/assets/js/*
-
 client/cache.manifest
 
 .idea/*
@@ -23,8 +17,4 @@ dist
 
 api/data/db/*
 
-semantic/dist/*
-
-semantic/node_modules/*
-
 npm-debug.log

client/assets/less/lib/select/custom.less

@@ -35,11 +35,11 @@ Ensure you have the following variables set before importing this file:
 
 @select-home: "../../../../../node_modules/react-select/less";
 
-@import "@{select-home}/select-control.less";
-@import "@{select-home}/select-menu.less";
-@import "@{select-home}/select-mixins.less";
-@import "@{select-home}/select-multi.less";
-@import "@{select-home}/select-spinner.less";
+@import "@{select-home}/control.less";
+@import "@{select-home}/menu.less";
+@import "@{select-home}/mixins.less";
+@import "@{select-home}/multi.less";
+@import "@{select-home}/spinner.less";
 
 .ui.form {
 

client/assets/less/lib/select/variables.less

@@ -6,10 +6,11 @@
  * MIT License: https://github.com/keystonejs/react-select
 */
 
-// 
+//
 // Select Variables
-// ------------------------------
+// ------------------------------------------------------------
 
+@select-input-bg:                  #fff;
 @select-text-color:                #333;
 @select-input-border-color:        #ccc;
 @select-input-border-radius:       4px;
@@ -28,6 +29,7 @@
 @select-option-color:              lighten(@select-text-color, 20%);
 @select-option-focused-color:      @select-text-color;
 @select-option-focused-bg:         #f2f9fc; // pale blue
+@select-option-disabled-color:     lighten(@select-text-color, 60%);
 
 @select-noresults-color:           lighten(@select-text-color, 40%);
 
@@ -44,11 +46,14 @@
 @select-item-border-color:         darken(@select-item-bg, 10%);
 @select-item-hover-color:          darken(@select-item-color, 5%); // pale blue
 @select-item-hover-bg:             darken(@select-item-bg, 5%);
+@select-item-disabled-color:       #888;
+@select-item-disabled-bg:          #f2f2f2;
+@select-item-disabled-border-color: darken(@select-item-disabled-bg, 10%);
+
 
 
 // wrapper
 
 .Select {
 	position: relative;
 }
-