This commit is contained in:
Adam Bradley
2013-09-23 13:13:22 -05:00
parent e9fa6a1d0b
commit 9429a6cd84
11 changed files with 20 additions and 17 deletions

View File

@ -3,7 +3,7 @@
<svg xmlns="http://www.w3.org/2000/svg">
<metadata></metadata>
<defs>
<font id="fontawesomeregular" horiz-adv-x="1536" >
<font id="ioniconsregular" horiz-adv-x="1536" >
<font-face units-per-em="1792" ascent="1536" descent="-256" />
<missing-glyph horiz-adv-x="448" />
<glyph unicode=" " horiz-adv-x="448" />

Before

Width:  |  Height:  |  Size: 193 KiB

After

Width:  |  Height:  |  Size: 193 KiB

View File

@ -3,7 +3,7 @@
[class^="icon-"],
[class*=" icon-"] {
@include icon-FontAwesome();
@include icon-Ionicon();
}
[class^="icon-"]:before,

View File

@ -1,4 +1,4 @@
/* BOOTSTRAP SPECIFIC CLASSES
/* IONIC SPECIFIC CLASSES
* -------------------------- */
/* Bootstrap 2.0 sprites.less reset */

View File

@ -2,12 +2,12 @@
// --------------------------
@mixin icon($icon) {
@include icon-FontAwesome();
@include icon-Ionicon();
content: $icon;
}
@mixin icon-FontAwesome() {
font-family: FontAwesome;
@mixin icon-Ionicon() {
font-family: Ionicon;
font-weight: normal;
font-style: normal;
text-decoration: inherit;

View File

@ -2,13 +2,13 @@
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
src: url('#{$FontAwesomePath}/fontawesome-webfont.eot?v=#{$FontAwesomeVersion}');
src: url('#{$FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=#{$FontAwesomeVersion}') format('embedded-opentype'),
url('#{$FontAwesomePath}/fontawesome-webfont.woff?v=#{$FontAwesomeVersion}') format('woff'),
url('#{$FontAwesomePath}/fontawesome-webfont.ttf?v=#{$FontAwesomeVersion}') format('truetype'),
url('#{$FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=#{$FontAwesomeVersion}') format('svg');
// src: url('#{$FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
font-family: 'Ionicon';
src: url('#{$IoniconPath}/ionicon-webfont.eot?v=#{$IoniconVersion}');
src: url('#{$IoniconPath}/ionicon-webfont.eot?#iefix&v=#{$IoniconVersion}') format('embedded-opentype'),
url('#{$IoniconPath}/ionicon-webfont.woff?v=#{$IoniconVersion}') format('woff'),
url('#{$IoniconPath}/ionicon-webfont.ttf?v=#{$IoniconVersion}') format('truetype'),
url('#{$IoniconPath}/ionicon-webfont.svg#ioniconsregular?v=#{$IoniconVersion}') format('svg');
// src: url('#{$IoniconPath}/Ionicon.otf') format('opentype'); // used when developing fonts
font-weight: normal;
font-style: normal;
}

View File

@ -1,8 +1,8 @@
// Variables
// Ionicon Variables
// --------------------------
$FontAwesomePath: "../font" !default;
$FontAwesomeVersion: "3.2.1" !default;
$IoniconPath: "../ionicons/font" !default;
$IoniconVersion: "0.0.1" !default;
$borderColor: #eeeeee !default;
$iconMuted: #eeeeee !default;
$iconLight: white !default;

View File

@ -1,4 +1,7 @@
/*!
* Ionicons 0.0.1
*
* CSS structure inspired by
* Font Awesome 3.2.1
* the iconic font designed for Bootstrap
* ------------------------------------------------------------------------------
@ -28,6 +31,6 @@
@import "mixins";
@import "path";
@import "core";
@import "bootstrap";
@import "ionic";
@import "extras";
@import "icons";