Skip to content
This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

Commit

Permalink
Merge branch 'master' into greenkeeper-serve-static-1.12.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher McCulloh authored Jun 9, 2017
2 parents e20ea3e + 2d20a92 commit 7a98d70
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 5 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
<!-- /TOC -->

# Sanity Checks

[![Greenkeeper badge](https://badges.greenkeeper.io/ExactTarget/fuelux.svg)](https://greenkeeper.io/)
[Fuel UX](http://getfuelux.com/)
[![Bower version](https://badge.fury.io/bo/fuelux.svg)](http://badge.fury.io/bo/fuelux)
[![npm version](https://badge.fury.io/js/fuelux.svg)](https://www.npmjs.com/package/fuelux)
Expand Down
23 changes: 23 additions & 0 deletions js/npm.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
require('jquery');
require('bootstrap');

require('./checkbox');
require('./combobox');
require('./datepicker');
require('./dropdown-autoflip');
require('./infinite-scroll');
require('./loader');
require('./pillbox');
require('./placard');
require('./radio');
require('./repeater');
require('./repeater-list');
require('./repeater-thumbnail');
require('./scheduler');
require('./search');
require('./spinbox');
require('./selectlist');
require('./picker');
require('./tree');
require('./utilities');
require('./wizard');
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"description": "Base Fuel UX styles and controls",
"devDependencies": {
"bower": "1.8.0",
"connect": "3.6.1",
"connect": "3.6.2",
"eslint": "^3.5.0",
"eslint-config-airbnb-es5": "^1.0.9",
"eslint-plugin-requirejs": "^3.0.0",
Expand All @@ -26,20 +26,20 @@
"grunt-bump": "0.8.0",
"grunt-cli": "1.2.0",
"grunt-contrib-clean": "1.1.0",
"grunt-contrib-compress": "1.4.1",
"grunt-contrib-compress": "1.4.3",
"grunt-contrib-concat": "1.0.1",
"grunt-contrib-connect": "1.0.2",
"grunt-contrib-copy": "1.0.0",
"grunt-contrib-jshint": "1.1.0",
"grunt-contrib-less": "1.4.1",
"grunt-contrib-qunit": "2.0.0",
"grunt-contrib-uglify": "2.2.0",
"grunt-contrib-uglify": "3.0.1",
"grunt-contrib-watch": "1.0.0",
"grunt-htmllint": "^0.2.7",
"grunt-jsbeautifier": "0.2.13",
"grunt-prompt": "1.3.3",
"grunt-saucelabs": "9.0.0",
"grunt-shell": "2.0.0",
"grunt-shell": "2.1.0",
"grunt-text-replace": "0.4.0",
"grunt-umd": "2.4.0",
"grunt-zip": "0.17.1",
Expand Down Expand Up @@ -79,7 +79,8 @@
"url": "git://github.com/ExactTarget/fuelux.git"
},
"scripts": {
"main": "devserver.js",
"build": "grunt dist",
"setup": "npm install && bower install",
"start": "grunt serve",
"test": "grunt travisci --verbose",
"postinstall": "node postinstall.js",
Expand Down

0 comments on commit 7a98d70

Please sign in to comment.