Merge branch 'master' into dev
commit
de8cbbe908
48
README.md
48
README.md
|
@ -19,27 +19,35 @@ A JavaScript SVG library for the modern web. Learn more at [snapsvg.io](http://s
|
|||
|
||||
### Use
|
||||
|
||||
In your HTML file, load simply by: `<script src="snap.svg-min.js"></script>`
|
||||
In your HTML file, load simply by:
|
||||
```html
|
||||
<script src="snap.svg-min.js"></script>
|
||||
```
|
||||
No other scripts are needed. Both the minified and uncompressed (for development) versions are in the `/dist` folder.
|
||||
|
||||
To load with webpack use following command:
|
||||
```js
|
||||
const Snap = require(`imports-loader?this=>window,fix=>module.exports=0!snapsvg/dist/snap.svg.js`);
|
||||
```
|
||||
|
||||
### Build
|
||||
|
||||
Snap.svg uses [Grunt](http://gruntjs.com/) to build.
|
||||
|
||||
* Open the terminal from the Snap.svg directory:
|
||||
|
||||
cd Snap.svg
|
||||
|
||||
```sh
|
||||
cd Snap.svg
|
||||
```
|
||||
* Install its command line interface (CLI) globally:
|
||||
|
||||
npm install -g grunt-cli
|
||||
|
||||
```sh
|
||||
npm install -g grunt-cli
|
||||
```
|
||||
_*You might need to use `sudo npm`, depending on your configuration._
|
||||
|
||||
* Install dependencies with npm:
|
||||
|
||||
npm install
|
||||
|
||||
```sh
|
||||
npm install
|
||||
```
|
||||
_*Snap.svg uses Grunt 0.4.0. You might want to [read](http://gruntjs.com/getting-started) more on their website if you haven’t upgraded since a lot has changed._
|
||||
|
||||
* Type `grunt` in the command line to build the files.
|
||||
|
@ -51,18 +59,18 @@ _*Snap.svg uses Grunt 0.4.0. You might want to [read](http://gruntjs.com/getting
|
|||
* [Fill out the CLA](http://snapsvg.io/contributions/).
|
||||
* [Fork](https://help.github.com/articles/fork-a-repo) the repo.
|
||||
* Create a branch:
|
||||
|
||||
git checkout -b my_branch
|
||||
|
||||
```sh
|
||||
git checkout -b my_branch
|
||||
```
|
||||
* Add your changes.
|
||||
* Commit your changes:
|
||||
|
||||
git commit -am "Added some awesome stuff"
|
||||
|
||||
```sh
|
||||
git commit -am "Added some awesome stuff"
|
||||
```
|
||||
* Push your branch:
|
||||
|
||||
git push origin my_branch
|
||||
|
||||
* Make a [pull request](https://help.github.com/articles/using-pull-requests) to `dev` branch.
|
||||
```sh
|
||||
git push origin my_branch
|
||||
```
|
||||
* Make a [pull request](https://help.github.com/articles/using-pull-requests) to `dev`(!) branch.
|
||||
|
||||
*Note:* Pull requests to other branches than `dev` or without filled CLA wouldn’t be accepted.
|
||||
|
|
|
@ -82,7 +82,7 @@
|
|||
<textPath xlink:href="#textline" startOffset="50%">Mocha</textPath>
|
||||
</text>
|
||||
<text transform="rotate(216, 500, 379.5)" fill="#423733" style="font: 400 11px Source Sans Pro, source-sans-pro, sans-serif" text-anchor="middle">
|
||||
<textPath xlink:href="#textline" startOffset="50%">Mochiatto</textPath>
|
||||
<textPath xlink:href="#textline" startOffset="50%">Macchiato</textPath>
|
||||
</text>
|
||||
<text transform="rotate(288, 500, 379.5)" fill="#423733" style="font: 400 11px Source Sans Pro, source-sans-pro, sans-serif" text-anchor="middle">
|
||||
<textPath xlink:href="#textline" startOffset="50%">Espresso</textPath>
|
||||
|
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
@ -225,7 +225,7 @@
|
|||
middle = 10 + o2;
|
||||
pieCoffee = 1 / 2;
|
||||
pieType = "milk";
|
||||
pieTitle = "Machiatto";
|
||||
pieTitle = "Macchiato";
|
||||
gstream = "l(0,1,0,0)#60544F-#60544F:50-#fff";
|
||||
},
|
||||
// espresso
|
||||
|
@ -390,4 +390,4 @@
|
|||
</script>
|
||||
</head>
|
||||
<body></body>
|
||||
</html>
|
||||
</html>
|
||||
|
|
Loading…
Reference in New Issue