Merge branch 'master' into 133-CTA

* master: Deploy using grunt (#211) 151 footer (#208) # Conflicts: (resolved all using theirs) # styleguide/item-mixins-display-display-icon.html # styleguide/item-mixins-display-embed-container.html # styleguide/item-mixins-display-media-block-img.html # styleguide/item-mixins-display-overflow.html # styleguide/item-mixins-display.html # styleguide/item-mixins-grid-grid--1-of-12.html # styleguide/item-mixins-grid-grid--10-of-12.html # styleguide/item-mixins-grid-grid--12-of-12.html # styleguide/item-mixins-grid-grid--2-of-12.html # styleguide/item-mixins-grid-grid--3-of-12.html # styleguide/item-mixins-grid-grid--4-of-12.html # styleguide/item-mixins-grid-grid--5-of-12.html # styleguide/item-mixins-grid-grid--6-of-12.html # styleguide/item-mixins-grid-grid--7-of-12.html # styleguide/item-mixins-grid-grid--8-of-12.html # styleguide/item-mixins-grid-grid--9-of-12.html # styleguide/item-mixins-grid-grid--container.html # styleguide/item-mixins-grid-grid--item.html # styleguide/item-mixins-grid.html # styleguide/item-mixins-iconblock-icon-block.html # styleguide/item-mixins-iconblock.html # styleguide/item-mixins-icongrid-icon-grid.html # styleguide/item-mixins-icongrid.html # styleguide/item-mixins-images-image-defaults.html # styleguide/item-mixins-images.html # styleguide/item-mixins-layout-display-grid.html # styleguide/item-mixins-layout-grid-column-gap.html # styleguide/item-mixins-layout-grid-columns.html # styleguide/item-mixins-layout-grid-item-spans.html # styleguide/item-mixins-layout-grid-rows.html # styleguide/item-mixins-layout-page-layout--left-sidebar--content.html # styleguide/item-mixins-layout-page-layout--left-sidebar--sidebar.html # styleguide/item-mixins-layout-page-layout--left-sidebar.html # styleguide/item-mixins-layout-page-layout--right-sidebar--content.html # styleguide/item-mixins-layout-page-layout--right-sidebar--sidebar.html # styleguide/item-mixins-layout-page-layout--right-sidebar.html # styleguide/item-mixins-layout-page-layout--single-column--content.html # styleguide/item-mixins-layout-page-layout--single-column.html # styleguide/item-mixins-layout-page-layout--three-column--content.html # styleguide/item-mixins-layout-page-layout--three-column--sidebar-first.html # styleguide/item-mixins-layout-page-layout--three-column--sidebar-second.html # styleguide/item-mixins-layout-page-layout--three-column.html # styleguide/item-mixins-layout-page-layout.html # styleguide/item-mixins-layout.html # styleguide/item-mixins-links-external-link.html # styleguide/item-mixins-links-link.html # styleguide/item-mixins-links-more-link.html # styleguide/item-mixins-links.html # styleguide/item-mixins-lists-list-unstyled.html # styleguide/item-mixins-lists.html # styleguide/item-mixins-menus-sidenav-sublist.html # styleguide/item-mixins-menus-subnav-list.html # styleguide/item-mixins-menus.html # styleguide/item-mixins-navigation-nav-border.html # styleguide/item-mixins-navigation-nav-close.html # styleguide/item-mixins-navigation-nav-overlay.html # styleguide/item-mixins-navigation.html # styleguide/item-mixins-quote-quote.html # styleguide/item-mixins-quote.html # styleguide/item-mixins-tables-table-borderless.html # styleguide/item-mixins-tables-tables.html # styleguide/item-mixins-tables.html # styleguide/item-mixins-typography-caption.html # styleguide/item-mixins-typography-credits.html # styleguide/item-mixins-typography-font-lead.html # styleguide/item-mixins-typography-font-smoothing.html # styleguide/item-mixins-typography-font-splash.html # styleguide/item-mixins-typography-h1.html # styleguide/item-mixins-typography-h2.html # styleguide/item-mixins-typography-h3.html # styleguide/item-mixins-typography-h4.html # styleguide/item-mixins-typography-h5.html # styleguide/item-mixins-typography-h6.html # styleguide/item-mixins-typography-headings.html # styleguide/item-mixins-typography-sans.html # styleguide/item-mixins-typography-serif.html # styleguide/item-mixins-typography-short-line-length.html # styleguide/item-mixins-typography-slab.html # styleguide/item-mixins-typography.html # styleguide/item-mixins.html # styleguide/item-molecules-iconblock.html # styleguide/item-molecules-icongrid.html # styleguide/item-molecules-sidenav.html # styleguide/item-molecules.html # styleguide/kss-assets/css/kss.css # styleguide/section-mixins.html # styleguide/section-molecules.html
SU-SWS · Oct 3, 2018 · cf7b22d · cf7b22d
2 parents c45a368 + 25f594e
commit cf7b22d
Show file tree

Hide file tree

Showing 242 changed files with 747 additions and 52,751 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -39,6 +39,8 @@ engines:
         enabled: false
       SelectorFormat:
         enabled: false
+      VendorPrefix:
+        enabled: false
   phpcodesniffer:
     enabled: false
   phpmd:

diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,7 @@
 .project
 .settings
 .tmproj
+.styleguide_site
 nbproject
 Thumbs.db
 config.rb
@@ -30,6 +31,7 @@ config.rb
 .CVS
 cgi-bin
 node_modules
+styleguide
 
 # Ignore as they are customized on the user end.
 .lando.yml
diff --git a/.sass-lint.yml b/.sass-lint.yml
@@ -11,11 +11,11 @@ rules:
   class-name-format:
     - 1
     -
-      convention: 'hyphenatedbem'
+      convention: hyphenatedbem
   function-name-format:
     - 1
     -
-      convention: 'snakecase'
+      convention: snakecase
   # Consistency Rules
   extends-before-mixins: 1
   extends-before-declarations: 1

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -71,44 +71,41 @@ module.exports = function(grunt) {
         src: [
           'styleguide'
         ]
+      },
+      postdeploy: {
+        src: [
+          '.styleguide_site'
+        ]
       }
     },
     run: {
       styleguide: {
         "cmd": "./node_modules/.bin/kss",
-        "args": ['--config=kss/kss-config.json', '--verbose']
+        "args": ['--config=kss/kss-config.json']
       }
     },
-    symlink: {
-      styleguidecss: {
-        dest: 'styleguide/css',
-        relativeSrc: '../core/css',
-        options: {
-          type: 'dir'
-        }
-      },
-      styleguidejs: {
-        dest: 'styleguide/js',
-        relativeSrc: '../core/js',
-        options: {
-          type: 'dir'
-        }
-      },
-      styleguideimg: {
-        dest: 'styleguide/img',
-        relativeSrc: '../core/img',
-        options: {
-          type: 'dir'
-        }
-      },
-      styleguidefonts: {
-        dest: 'styleguide/fonts',
-        relativeSrc: '../core/fonts',
+    deploy_site: {
+      styleguide: {
         options: {
-          type: 'dir'
-        }
+          branch: 'master',
+          commit_msg: 'autocommit',
+          deploy_url: 'http://decanter.stanford.edu'
+        },
+        base_path: 'styleguide',
+        remote_url: '[email protected]:SU-SWS/decanter.github.io'
       }
-    }
+    },
+    copy: {
+      styleguide: {
+        files: [
+          // includes files within path
+          {expand: true, cwd: 'core/css', src: ['**'], dest: 'styleguide/css/'},
+          {expand: true, cwd: 'core/fonts', src: ['**'], dest: 'styleguide/fonts/'},
+          {expand: true, cwd: 'core/js', src: ['**'], dest: 'styleguide/js/'},
+          {expand: true, cwd: 'core/img', src: ['**'], dest: 'styleguide/img/'},
+        ],
+      },
+    },
   });
 
   grunt.loadNpmTasks('grunt-run');
@@ -119,8 +116,11 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-symlink');
   grunt.loadNpmTasks('grunt-postcss');
+  grunt.loadNpmTasks('grunt-deploy-site');
+  grunt.loadNpmTasks('grunt-contrib-copy');
 
-  grunt.registerTask('styleguide', ['compile', 'uglify', 'clean:styleguide', 'run:styleguide', 'symlink']);
+  grunt.registerTask('deploy', ['styleguide', 'copy:styleguide', 'deploy_site:styleguide', 'clean:postdeploy']);
+  grunt.registerTask('styleguide', ['compile', 'uglify', 'clean:styleguide', 'run:styleguide']);
   grunt.registerTask('compile', ['sass:dist', 'postcss:dist']);
   grunt.registerTask('default', ['watch']);
 

diff --git a/core/css/decanter-grid.css b/core/css/decanter-grid.css
diff --git a/core/css/decanter-no-markup.css b/core/css/decanter-no-markup.css