Skip to content

Commit

Permalink
Update deps, switch demo to webpack, shrinkwrap
Browse files Browse the repository at this point in the history
  • Loading branch information
@jslatts
jslatts committed Feb 3, 2017
1 parent 3802718 commit 9e0bbc1
Show file tree
Hide file tree
Showing 11 changed files with 2,996 additions and 714 deletions.
116 changes: 116 additions & 0 deletions npm-shrinkwrap.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 7 additions & 26 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "carbondream",
"version": "0.3.0",
"version": "0.3.1",
"description": "React web annotation engine",
"homepage": "http://carbondream.zeroarc.com/",
"main": "dist/entry.js",
Expand All @@ -10,8 +10,8 @@
"scripts": {
"build": "NODE_ENV=production $(npm bin)/babel src/ -d dist/ && cp -r node_modules/font-awesome/css web && cp -r node_modules/font-awesome/fonts web",
"watch": "NODE_ENV=production $(npm bin)/babel --watch src/ -d dist/ && cp -r node_modules/font-awesome/css web && cp -r node_modules/font-awesome/fonts web",
"demo-watch": "$(npm bin)/watchify --extension=.jsx -d -e src/demo.jsx -s CarbonDream -o test/index.js -v ",
"demo-build": "$(npm bin)/browserify --extension=.jsx -e src/demo.jsx -s CarbonDream -o test/index.js && cp -r node_modules/font-awesome/css web && cp -r node_modules/font-awesome/fonts web",
"demo-watch": "$(npm bin)/webpack -w",
"demo-build": "$(npm bin)/webpack && cp -r node_modules/font-awesome/css web && cp -r node_modules/font-awesome/fonts web",
"prepublish": "npm run build",
"test": "echo \"Error: no test specified\" && exit 1"
},
Expand All @@ -29,24 +29,6 @@
"bugs": {
"url": "https://github.com/ZeroarcSoftware/carbondream/issues"
},
"browserify": {
"transform": [
[
"babelify",
{
"sourceMaps": "inline",
"presets": [
"es2015",
"react"
],
"plugins": [
"transform-decorators-legacy",
"transform-object-rest-spread"
]
}
]
]
},
"babel": {
"sourceMaps": "inline",
"presets": [
Expand All @@ -60,17 +42,16 @@
},
"devDependencies": {
"babel-cli": "^6.7.5",
"babel-loader": "^6.2.10",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-plugin-transform-object-rest-spread": "^6.6.5",
"babel-preset-es2015": "^6.6.0",
"babel-preset-react": "^6.5.0",
"babelify": "^7.2.0",
"browserify": "^13.0.0",
"install": "^0.6.1",
"npm": "^3.8.6",
"json-loader": "^0.5.4",
"react-addons-shallow-compare": "^15.0.1",
"reflux": "^0.4.1",
"watchify": "^3.7.0"
"reflux": "^6.0.0",
"webpack": "^2.2.1"
},
"dependencies": {
"autobind-decorator": "^1.3.3",
Expand Down
167 changes: 163 additions & 4 deletions web/css/font-awesome.css
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*!
* Font Awesome 4.6.1 by @davegandy - http://fontawesome.io - @fontawesome
* Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/
/* FONT PATH
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
src: url('../fonts/fontawesome-webfont.eot?v=4.6.1');
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.6.1') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.6.1') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.6.1') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.6.1') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.6.1#fontawesomeregular') format('svg');
src: url('../fonts/fontawesome-webfont.eot?v=4.7.0');
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down Expand Up @@ -1383,7 +1383,7 @@
.fa-digg:before {
content: "\f1a6";
}
.fa-pied-piper:before {
.fa-pied-piper-pp:before {
content: "\f1a7";
}
.fa-pied-piper-alt:before {
Expand Down Expand Up @@ -1509,6 +1509,7 @@
content: "\f1ce";
}
.fa-ra:before,
.fa-resistance:before,
.fa-rebel:before {
content: "\f1d0";
}
Expand Down Expand Up @@ -1831,6 +1832,7 @@
content: "\f23e";
}
.fa-battery-4:before,
.fa-battery:before,
.fa-battery-full:before {
content: "\f240";
}
Expand Down Expand Up @@ -2157,6 +2159,163 @@
.fa-snapchat-square:before {
content: "\f2ad";
}
.fa-pied-piper:before {
content: "\f2ae";
}
.fa-first-order:before {
content: "\f2b0";
}
.fa-yoast:before {
content: "\f2b1";
}
.fa-themeisle:before {
content: "\f2b2";
}
.fa-google-plus-circle:before,
.fa-google-plus-official:before {
content: "\f2b3";
}
.fa-fa:before,
.fa-font-awesome:before {
content: "\f2b4";
}
.fa-handshake-o:before {
content: "\f2b5";
}
.fa-envelope-open:before {
content: "\f2b6";
}
.fa-envelope-open-o:before {
content: "\f2b7";
}
.fa-linode:before {
content: "\f2b8";
}
.fa-address-book:before {
content: "\f2b9";
}
.fa-address-book-o:before {
content: "\f2ba";
}
.fa-vcard:before,
.fa-address-card:before {
content: "\f2bb";
}
.fa-vcard-o:before,
.fa-address-card-o:before {
content: "\f2bc";
}
.fa-user-circle:before {
content: "\f2bd";
}
.fa-user-circle-o:before {
content: "\f2be";
}
.fa-user-o:before {
content: "\f2c0";
}
.fa-id-badge:before {
content: "\f2c1";
}
.fa-drivers-license:before,
.fa-id-card:before {
content: "\f2c2";
}
.fa-drivers-license-o:before,
.fa-id-card-o:before {
content: "\f2c3";
}
.fa-quora:before {
content: "\f2c4";
}
.fa-free-code-camp:before {
content: "\f2c5";
}
.fa-telegram:before {
content: "\f2c6";
}
.fa-thermometer-4:before,
.fa-thermometer:before,
.fa-thermometer-full:before {
content: "\f2c7";
}
.fa-thermometer-3:before,
.fa-thermometer-three-quarters:before {
content: "\f2c8";
}
.fa-thermometer-2:before,
.fa-thermometer-half:before {
content: "\f2c9";
}
.fa-thermometer-1:before,
.fa-thermometer-quarter:before {
content: "\f2ca";
}
.fa-thermometer-0:before,
.fa-thermometer-empty:before {
content: "\f2cb";
}
.fa-shower:before {
content: "\f2cc";
}
.fa-bathtub:before,
.fa-s15:before,
.fa-bath:before {
content: "\f2cd";
}
.fa-podcast:before {
content: "\f2ce";
}
.fa-window-maximize:before {
content: "\f2d0";
}
.fa-window-minimize:before {
content: "\f2d1";
}
.fa-window-restore:before {
content: "\f2d2";
}
.fa-times-rectangle:before,
.fa-window-close:before {
content: "\f2d3";
}
.fa-times-rectangle-o:before,
.fa-window-close-o:before {
content: "\f2d4";
}
.fa-bandcamp:before {
content: "\f2d5";
}
.fa-grav:before {
content: "\f2d6";
}
.fa-etsy:before {
content: "\f2d7";
}
.fa-imdb:before {
content: "\f2d8";
}
.fa-ravelry:before {
content: "\f2d9";
}
.fa-eercast:before {
content: "\f2da";
}
.fa-microchip:before {
content: "\f2db";
}
.fa-snowflake-o:before {
content: "\f2dc";
}
.fa-superpowers:before {
content: "\f2dd";
}
.fa-wpexplorer:before {
content: "\f2de";
}
.fa-meetup:before {
content: "\f2e0";
}
.sr-only {
position: absolute;
width: 1px;
Expand Down
4 changes: 2 additions & 2 deletions web/css/font-awesome.min.css
View file

Large diffs are not rendered by default.

Binary file modified web/fonts/FontAwesome.otf
View file
Binary file not shown.
Binary file modified web/fonts/fontawesome-webfont.eot
View file
Binary file not shown.
Loading

0 comments on commit 9e0bbc1

Please sign in to comment.