Skip to content

Commit

Permalink
Merge master into icon-postcard-block (#110)
Browse files Browse the repository at this point in the history
* Quote tweaks (#105)

* Created quote element within elements directory based on design Kerri made for the Engineering project

* tweak Quote template to make it easier to include directly into themes

* don't hardcode path to quote's image

* update neat-omega, grunt, grunt-sass, jquery, and associated dependencies (#106)

* #107 specify node version (#108)

* removed FA from project; updagraded to latest normalize (#101)
  • Loading branch information
Joe Knox authored Apr 27, 2018
1 parent d1b2afb commit 168cd3a
Show file tree
Hide file tree
Showing 12 changed files with 1,567 additions and 6,159 deletions.
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9.10.1
1 change: 0 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ module.exports = function(grunt) {
includePaths: [
"node_modules/bourbon/app/assets/stylesheets",
"node_modules/bourbon-neat/app/assets/stylesheets",
"node_modules/font-awesome/scss",
"node_modules/normalize.css",
"node_modules/neat-omega/core",
"node_modules",
Expand Down
Loading

0 comments on commit 168cd3a

Please sign in to comment.