Skip to content

Commit

Permalink
Merge branch 'dev-2.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@zavoloklom
zavoloklom committed Nov 8, 2015
2 parents f2c0016 + 527d369 commit a1cdb51
Show file tree
Hide file tree
Showing 868 changed files with 22,299 additions and 1,924 deletions.
20 changes: 14 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [Material Design Iconic Font 2.1.2](http://zavoloklom.github.io/material-design-iconic-font)
# [Material Design Iconic Font 2.2.0](http://zavoloklom.github.io/material-design-iconic-font)

[![Latest Version](https://img.shields.io/github/release/zavoloklom/material-design-iconic-font.svg?style=flat-square&label=latest version)](https://github.com/zavoloklom/material-design-iconic-font/tags)
[![Software License](https://img.shields.io/badge/license-MIT License/SIL OFL 1.1-blue.svg?style=flat-square)](LICENSE)
Expand All @@ -13,7 +13,7 @@

#### Material Design Iconic Font and CSS toolkit

Material Design Iconic Font is a full suite of official material design icons (created and maintained by [Google](https://github.com/google/material-design-icons)) and community icons for easy scalable vector graphics on websites or desktop.
Material Design Iconic Font is a full suite of official material design icons (created and maintained by [Google](https://github.com/google/material-design-icons)), with additional community-designed and [brands icons](https://github.com/zavoloklom/material-design-iconic-font/tree/master/svg/brands) for easy scalable vector graphics on websites or desktop.

Material Design Icons are the official open-source [icons](http://www.google.com/design/spec/resources/sticker-sheets.html#sticker-sheets-components) featured in the Google [Material Design](http://www.google.com/design/spec) specification.

Expand All @@ -24,15 +24,15 @@ Material Design Icons are the official open-source [icons](http://www.google.com
**Issue with cheatsheet**: If you think icons do not match the cheatsheet page, please read [issue 47](https://github.com/zavoloklom/material-design-iconic-font/issues/47).

## Install
**Download:** [2.1.2 (ZIP)](https://github.com/zavoloklom/material-design-iconic-font/releases/download/2.1.2/material-design-iconic-font.zip)
**Download:** [2.2.0 (ZIP)](https://github.com/zavoloklom/material-design-iconic-font/releases/download/2.2.0/material-design-iconic-font.zip)
**Bower:** `bower install material-design-iconic-font`
**NPM:** `npm install material-design-iconic-font`

## Getting started
#### EASY: CSS on [CDNjs](https://cdnjs.com/libraries/material-design-iconic-font)
Thanks to the cdnjs.cloudflare.com, you can use CDNjs to add MD Iconic Font into your website without downloading or installing anything!
- Paste the following code into the <head> section of your site's HTML.
`<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/material-design-iconic-font/2.1.2/css/material-design-iconic-font.min.css">`
`<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/material-design-iconic-font/2.2.0/css/material-design-iconic-font.min.css">`
- Check out the [Examples pages](http://zavoloklom.github.io/material-design-iconic-font/examples.html) to start using Material Design Iconic Font!

#### BASIC: Default CSS
Expand Down Expand Up @@ -73,6 +73,14 @@ The full details of how Material Design Iconic Font is licensed and 'Thanks to'
In fact it can work in earlier versions of browsers accordingly to [caniuse.com](http://caniuse.com/) portal (you can check ttf, woff, transform and animation properties), but i can't test it.

## Changelog
v2.2.0:
- add 33 new icons
- change `main` section in bower.json
- repair `seat` and `gradient` icons
- change class `zmdi-stack-overflow` to `zmdi-stackoverflow`
- change `google`, `google-plus`, `google-plus-box` and `paypal` icons
[2.2.0 GitHub milestones](https://github.com/zavoloklom/material-design-iconic-font/issues?milestone=5&page=1&state=closed)

v2.1.2:
- add WOFF2 support
- remove 2.0 SVG icons files
Expand Down Expand Up @@ -131,10 +139,10 @@ For more information on SemVer, please visit http://semver.org.

## Author
- Email: [email protected]
- Twitter: https://twitter.com/zavoloklom
- Twitter: https://twitter.com/zavoloklom/
- GitHub: https://github.com/zavoloklom/
- CodePen: http://codepen.io/zavoloklom/
- Dribble: https://dribbble.com/zavoloklom
- Dribble: https://dribbble.com/zavoloklom/

## Donate
- You can support me via [PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=s%2ekupletsky%40gmail%2ecom&lc=US&item_name=Material%20Design%20Iconic%20Font&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted), [WebMoney](https://funding.webmoney.ru/material-design-iconic-font/donate) or [Gratipay](http://gratipay.com/zavoloklom/)
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
],
"license": ["OFL-1.1", "MIT"],
"main": [
"./dist/css/*.min.css",
"./dist/css/material-design-iconic-font.min.css",
"./dist/fonts/*"
],
"ignore": [
Expand Down
207 changes: 204 additions & 3 deletions dist/css/material-design-iconic-font.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
@font-face {
font-family: 'Material-Design-Iconic-Font';
src: url('../fonts/Material-Design-Iconic-Font.woff2?v=2.1.0') format('woff2'), url('../fonts/Material-Design-Iconic-Font.woff?v=2.1.0') format('woff'), url('../fonts/Material-Design-Iconic-Font.ttf?v=2.1.0') format('truetype');
src: url('../fonts/Material-Design-Iconic-Font.woff2?v=2.2.0') format('woff2'), url('../fonts/Material-Design-Iconic-Font.woff?v=2.2.0') format('woff'), url('../fonts/Material-Design-Iconic-Font.ttf?v=2.2.0') format('truetype');
font-weight: normal;
font-style: normal;
}
Expand Down Expand Up @@ -1981,7 +1981,7 @@
.zmdi-share:before {
content: '\f35b';
}
.zmdi-stack-overflow:before {
.zmdi-stackoverflow:before {
content: '\f35c';
}
.zmdi-steam-square:before {
Expand Down Expand Up @@ -2404,6 +2404,105 @@
.zmdi-voicemail:before {
content: '\f3e8';
}
.zmdi-group:before {
content: '\f3e9';
}
.zmdi-rss:before {
content: '\f3ea';
}
.zmdi-shape:before {
content: '\f3eb';
}
.zmdi-spinner:before {
content: '\f3ec';
}
.zmdi-ungroup:before {
content: '\f3ed';
}
.zmdi-500px:before {
content: '\f3ee';
}
.zmdi-8tracks:before {
content: '\f3ef';
}
.zmdi-amazon:before {
content: '\f3f0';
}
.zmdi-blogger:before {
content: '\f3f1';
}
.zmdi-delicious:before {
content: '\f3f2';
}
.zmdi-disqus:before {
content: '\f3f3';
}
.zmdi-flattr:before {
content: '\f3f4';
}
.zmdi-flickr:before {
content: '\f3f5';
}
.zmdi-github-alt:before {
content: '\f3f6';
}
.zmdi-google-old:before {
content: '\f3f7';
}
.zmdi-linkedin:before {
content: '\f3f8';
}
.zmdi-odnoklassniki:before {
content: '\f3f9';
}
.zmdi-outlook:before {
content: '\f3fa';
}
.zmdi-paypal-alt:before {
content: '\f3fb';
}
.zmdi-pinterest:before {
content: '\f3fc';
}
.zmdi-playstation:before {
content: '\f3fd';
}
.zmdi-reddit:before {
content: '\f3fe';
}
.zmdi-skype:before {
content: '\f3ff';
}
.zmdi-slideshare:before {
content: '\f400';
}
.zmdi-soundcloud:before {
content: '\f401';
}
.zmdi-tumblr:before {
content: '\f402';
}
.zmdi-twitch:before {
content: '\f403';
}
.zmdi-vimeo:before {
content: '\f404';
}
.zmdi-whatsapp:before {
content: '\f405';
}
.zmdi-xbox:before {
content: '\f406';
}
.zmdi-yahoo:before {
content: '\f407';
}
.zmdi-youtube-play:before {
content: '\f408';
}
.zmdi-youtube:before {
content: '\f409';
}
.zmdi-3d-rotation:before {
content: '\f101';
}
Expand Down Expand Up @@ -4213,7 +4312,7 @@
.zmdi-share:before {
content: '\f35b';
}
.zmdi-stack-overflow:before {
.zmdi-stackoverflow:before {
content: '\f35c';
}
.zmdi-steam-square:before {
Expand Down Expand Up @@ -4636,6 +4735,105 @@
.zmdi-voicemail:before {
content: '\f3e8';
}
.zmdi-group:before {
content: '\f3e9';
}
.zmdi-rss:before {
content: '\f3ea';
}
.zmdi-shape:before {
content: '\f3eb';
}
.zmdi-spinner:before {
content: '\f3ec';
}
.zmdi-ungroup:before {
content: '\f3ed';
}
.zmdi-500px:before {
content: '\f3ee';
}
.zmdi-8tracks:before {
content: '\f3ef';
}
.zmdi-amazon:before {
content: '\f3f0';
}
.zmdi-blogger:before {
content: '\f3f1';
}
.zmdi-delicious:before {
content: '\f3f2';
}
.zmdi-disqus:before {
content: '\f3f3';
}
.zmdi-flattr:before {
content: '\f3f4';
}
.zmdi-flickr:before {
content: '\f3f5';
}
.zmdi-github-alt:before {
content: '\f3f6';
}
.zmdi-google-old:before {
content: '\f3f7';
}
.zmdi-linkedin:before {
content: '\f3f8';
}
.zmdi-odnoklassniki:before {
content: '\f3f9';
}
.zmdi-outlook:before {
content: '\f3fa';
}
.zmdi-paypal-alt:before {
content: '\f3fb';
}
.zmdi-pinterest:before {
content: '\f3fc';
}
.zmdi-playstation:before {
content: '\f3fd';
}
.zmdi-reddit:before {
content: '\f3fe';
}
.zmdi-skype:before {
content: '\f3ff';
}
.zmdi-slideshare:before {
content: '\f400';
}
.zmdi-soundcloud:before {
content: '\f401';
}
.zmdi-tumblr:before {
content: '\f402';
}
.zmdi-twitch:before {
content: '\f403';
}
.zmdi-vimeo:before {
content: '\f404';
}
.zmdi-whatsapp:before {
content: '\f405';
}
.zmdi-xbox:before {
content: '\f406';
}
.zmdi-yahoo:before {
content: '\f407';
}
.zmdi-youtube-play:before {
content: '\f408';
}
.zmdi-youtube:before {
content: '\f409';
}
.zmdi-import-export:before {
content: '\f30c';
}
Expand Down Expand Up @@ -4822,6 +5020,9 @@
.zmdi-pages:before {
content: '\f34a';
}
.zmdi-stack-overflow:before {
content: '\f35c';
}
.zmdi-calendar-account:before {
content: '\f204';
}
Expand Down
2 changes: 1 addition & 1 deletion dist/css/material-design-iconic-font.min.css
View file

Large diffs are not rendered by default.

Binary file modified dist/fonts/Material-Design-Iconic-Font.eot
View file
Binary file not shown.
Loading

0 comments on commit a1cdb51

Please sign in to comment.