Merge branch 'master' into 202-sticky

* master:
  89 browsersync (#272)
  189 Alert Component (#263)
  216 Create site search component (#262)
  266: Update scss file to reference logo.twig and update twig file to … (#267)
  246 homepage (#258)
  reversed order of modular scale type mixin (#260)
  122 hero (#259)

# Conflicts: - all resolved using master
#	core/scss/homepage.md
#	kss/builder/decanter/index.twig
#	kss/builder/decanter/kss-assets/css/kss.css
#	kss/builder/decanter/scss/_home.scss
#	kss/builder/decanter/scss/kss.scss

Gruntfile.js

@@ -61,8 +61,22 @@ module.exports = function(grunt) {
         tasks: ['uglify']
       },
       twig: {
-        files: ['**/*.twig'],
-        tasks: ['uglify', 'sass', 'styleguide']
+        files: ['**/*.twig', '**/*.json'],
+        tasks: ['styleguide']
+      }
+    },
+    browserSync: {
+      dev: {
+        bsFiles: {
+          src : [
+            'styleguide/css/decanter.css',
+            'styleguide/**/*.html'
+          ]
+        },
+        options: {
+          watchTask: true,
+          server: './styleguide'
+        }
       }
     },
     clean: {
@@ -108,6 +122,7 @@ module.exports = function(grunt) {
   });
 
   grunt.loadNpmTasks('grunt-run');
+  grunt.loadNpmTasks('grunt-browser-sync');
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-sass');
@@ -120,6 +135,7 @@ module.exports = function(grunt) {
   grunt.registerTask('deploy', ['styleguide', 'deploy_site:styleguide', 'clean:postdeploy']);
   grunt.registerTask('styleguide', ['compile', 'uglify', 'clean:styleguide', 'run:styleguide', 'copy:styleguide']);
   grunt.registerTask('compile', ['sass:dist', 'postcss:dist']);
+  grunt.registerTask('dev', ['styleguide', 'browserSync', 'watch']);
   grunt.registerTask('default', ['watch']);
 
 }

core/scss/components/alert/_alert--error.scss

@@ -0,0 +1,9 @@
+@charset "UTF-8";
+
+// Error alert.
+.su-alert--error {
+  background-color: map-get($alert-colors, 'error');
+  background-image: url("#{$image-path}/alert-error.png");
+  background-image: url("#{$image-path}/alert-error.svg");
+  color: $color-white;
+}

core/scss/components/alert/_alert--info.scss

@@ -0,0 +1,9 @@
+@charset "UTF-8";
+
+// Info alert.
+.su-alert--info {
+  background-color: map-get($alert-colors, 'info');
+  background-image: url("#{$image-path}/alert-info.png");
+  background-image: url("#{$image-path}/alert-info.svg");
+  color: $color-white;
+}

core/scss/components/alert/_alert--success.scss

@@ -0,0 +1,9 @@
+@charset "UTF-8";
+
+// Success alert.
+.su-alert--success {
+  background-color: map-get($alert-colors, 'success');
+  background-image: url("#{$image-path}/alert-success.png");
+  background-image: url("#{$image-path}/alert-success.svg");
+  color: $color-white;
+}

core/scss/components/alert/_alert--warning.scss

@@ -0,0 +1,8 @@
+@charset "UTF-8";
+
+// Warning alert.
+.su-alert--warning {
+  background-color: map-get($alert-colors, 'warning');
+  background-image: url("#{$image-path}/alert-warning.png");
+  background-image: url("#{$image-path}/alert-warning.svg");
+}