Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew Morek committed Oct 15, 2015
2 parents 95bb7e6 + aecaece commit b990bf2
Show file tree
Hide file tree
Showing 302 changed files with 3,561 additions and 2,248 deletions.
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "_components"
}
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node_modules
_components
dist/docs
*.map
35 changes: 26 additions & 9 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,38 @@
{
"name": "wfp-ui-kit",
"version": "0.2.1",
"name": "wfp-ui",
"authors": [
"Matthew Morek <[email protected]>"
"Matthew Morek <[email protected]> (http://matthewmorek.com)",
"James Home <[email protected]> (http://jrah.github.io)"
],
"description": "World Food Programme UI Kit",
"main": [
"dist/wfpui.css",
"scss/wfpui.scss"
],
"description": "WFP UI Kit",
"main": "wfpui.scss",
"keywords": [
"wfpui"
"ui",
"interface",
"toolkit",
"wfp"
],
"license": "MIT",
"homepage": "http://matthewmorek.com",
"homepage": "http://cdn.wfp.org/guides/ui",
"repository": {
"type": "git",
"url": "git://github.com/wfp/ui.git"
},
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"_components",
"docs",
"test",
"tests"
]
"tests",
"package.json",
"gruntfile.js"
],
"devDependencies": {
"bootstrap-sass": "~3.3.5"
}
}
5 changes: 5 additions & 0 deletions dist/bootstrap-theme.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/wfpui.css

Large diffs are not rendered by default.

Loading

0 comments on commit b990bf2

Please sign in to comment.