From 9429a6cd8466a2b6818f42ef7c579491b69de070 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Mon, 23 Sep 2013 13:13:22 -0500 Subject: [PATCH] ionicons --- ionicons/font/{FontAwesome.otf => Ionicon.otf} | Bin ...ontawesome-webfont.eot => ionicon-webfont.eot} | Bin ...ontawesome-webfont.svg => ionicon-webfont.svg} | 2 +- ...ontawesome-webfont.ttf => ionicon-webfont.ttf} | Bin ...tawesome-webfont.woff => ionicon-webfont.woff} | Bin ionicons/scss/_core.scss | 2 +- ionicons/scss/{_bootstrap.scss => _ionic.scss} | 2 +- ionicons/scss/_mixins.scss | 6 +++--- ionicons/scss/_path.scss | 14 +++++++------- ionicons/scss/_variables.scss | 6 +++--- ionicons/scss/ionicons.scss | 5 ++++- 11 files changed, 20 insertions(+), 17 deletions(-) rename ionicons/font/{FontAwesome.otf => Ionicon.otf} (100%) rename ionicons/font/{fontawesome-webfont.eot => ionicon-webfont.eot} (100%) rename ionicons/font/{fontawesome-webfont.svg => ionicon-webfont.svg} (99%) rename ionicons/font/{fontawesome-webfont.ttf => ionicon-webfont.ttf} (100%) rename ionicons/font/{fontawesome-webfont.woff => ionicon-webfont.woff} (100%) rename ionicons/scss/{_bootstrap.scss => _ionic.scss} (98%) diff --git a/ionicons/font/FontAwesome.otf b/ionicons/font/Ionicon.otf similarity index 100% rename from ionicons/font/FontAwesome.otf rename to ionicons/font/Ionicon.otf diff --git a/ionicons/font/fontawesome-webfont.eot b/ionicons/font/ionicon-webfont.eot similarity index 100% rename from ionicons/font/fontawesome-webfont.eot rename to ionicons/font/ionicon-webfont.eot diff --git a/ionicons/font/fontawesome-webfont.svg b/ionicons/font/ionicon-webfont.svg similarity index 99% rename from ionicons/font/fontawesome-webfont.svg rename to ionicons/font/ionicon-webfont.svg index 2edb4ec34c..105be44b64 100755 --- a/ionicons/font/fontawesome-webfont.svg +++ b/ionicons/font/ionicon-webfont.svg @@ -3,7 +3,7 @@ - + diff --git a/ionicons/font/fontawesome-webfont.ttf b/ionicons/font/ionicon-webfont.ttf similarity index 100% rename from ionicons/font/fontawesome-webfont.ttf rename to ionicons/font/ionicon-webfont.ttf diff --git a/ionicons/font/fontawesome-webfont.woff b/ionicons/font/ionicon-webfont.woff similarity index 100% rename from ionicons/font/fontawesome-webfont.woff rename to ionicons/font/ionicon-webfont.woff diff --git a/ionicons/scss/_core.scss b/ionicons/scss/_core.scss index 0189c73dfb..be520a134b 100644 --- a/ionicons/scss/_core.scss +++ b/ionicons/scss/_core.scss @@ -3,7 +3,7 @@ [class^="icon-"], [class*=" icon-"] { - @include icon-FontAwesome(); + @include icon-Ionicon(); } [class^="icon-"]:before, diff --git a/ionicons/scss/_bootstrap.scss b/ionicons/scss/_ionic.scss similarity index 98% rename from ionicons/scss/_bootstrap.scss rename to ionicons/scss/_ionic.scss index 837d2df651..38ef6755c6 100644 --- a/ionicons/scss/_bootstrap.scss +++ b/ionicons/scss/_ionic.scss @@ -1,4 +1,4 @@ -/* BOOTSTRAP SPECIFIC CLASSES +/* IONIC SPECIFIC CLASSES * -------------------------- */ /* Bootstrap 2.0 sprites.less reset */ diff --git a/ionicons/scss/_mixins.scss b/ionicons/scss/_mixins.scss index ca9c5931b3..c97a682d3e 100644 --- a/ionicons/scss/_mixins.scss +++ b/ionicons/scss/_mixins.scss @@ -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; diff --git a/ionicons/scss/_path.scss b/ionicons/scss/_path.scss index bb3f36b70b..8bcd2db295 100644 --- a/ionicons/scss/_path.scss +++ b/ionicons/scss/_path.scss @@ -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; } diff --git a/ionicons/scss/_variables.scss b/ionicons/scss/_variables.scss index 7d6bbc5b1d..630c41d7c8 100644 --- a/ionicons/scss/_variables.scss +++ b/ionicons/scss/_variables.scss @@ -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; diff --git a/ionicons/scss/ionicons.scss b/ionicons/scss/ionicons.scss index 645a948cbb..f40240b666 100644 --- a/ionicons/scss/ionicons.scss +++ b/ionicons/scss/ionicons.scss @@ -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";