Skip to content

Commit

Permalink
Merge pull request #8 from Adslot/import-alexandria
Browse files Browse the repository at this point in the history
Import Alexandria
  • Loading branch information
omgaz committed Dec 17, 2015
2 parents f8c1a66 + 51c5347 commit 842af75
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 7 deletions.
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Adslot UI
==========
=========

Core component library. By Adslot
---------------------------------
Expand Down Expand Up @@ -84,3 +84,10 @@ Most of the time you will want to add:
`--stateless`

That makes a stateless component (pure function, no internal state).

Build Profiling
---------------

To generate a profile: `npm run profile`

Upload the new `stats.json` file to [Webpack Analyse Tool](http://webpack.github.io/analyse).
9 changes: 5 additions & 4 deletions dist/adslot-ui-main.js

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,20 @@
"release:minor": "npm version minor && npm publish && git push --follow-tags",
"release:patch": "npm version patch && npm publish && git push --follow-tags"
},
"repository": "",
"repository": {
"type": "git",
"url": "git://github.com/Adslot/adslot-ui.git"
},
"publishConfig": {
"registry": "https://registry.npmjs.org/"
},
"keywords": [
"UI Library",
"components"
],
"author": "Adslot",
"devDependencies": {
"alexandria-adslot": "^0.5.0",
"autoprefixer-loader": "^3.1.0",
"babel-core": "^6.3.17",
"babel-eslint": "^4.1.5",
Expand Down Expand Up @@ -63,6 +70,7 @@
"open": "^0.0.5",
"phantomjs": "^1.9.19",
"react-addons-test-utils": "^0.14.3",
"react-bootstrap": "^0.28.1",
"react-hot-loader": "^1.3.0",
"rimraf": "^2.4.4",
"sass-lint": "^1.4.0",
Expand All @@ -75,7 +83,6 @@
"dependencies": {
"lodash": "^3.10.1",
"react": "^0.14.3",
"react-bootstrap": "^0.28.1",
"react-dom": "^0.14.3"
}
}
18 changes: 18 additions & 0 deletions src/components/distributionEntry.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,28 @@ import Button from 'react-bootstrap/lib/Button';
import Modal from 'react-bootstrap/lib/Modal';
import Nav from 'react-bootstrap/lib/Nav';
import NavItem from 'react-bootstrap/lib/NavItem';
import {
Alert,
Breadcrumb,
Empty,
Grid,
GridCell,
GridRow,
Search,
Slicey,
} from 'alexandria-adslot';

module.exports = {
Alert,
Breadcrumb,
Button,
Empty,
Grid,
GridCell,
GridRow,
Modal,
Nav,
NavItem,
Search,
Slicey,
};

0 comments on commit 842af75

Please sign in to comment.