library-mirrors/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2024-11-20 11:14:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

final(?) tweaks to scss

Browse Source
This commit is contained in:
davegandy 2013-06-12 14:18:07 -04:00
parent 1b69abcdc2
commit b01ec557c5
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scss/_variables.scss
View File

@ -1,4 +1,5 @@
// Variables // Variables
// --------------------------
$FontAwesomePath: "../font" !default; $FontAwesomePath: "../font" !default;
$FontAwesomeVersion: "3.2.0" !default; $FontAwesomeVersion: "3.2.0" !default;

1
scss/font-awesome-ie7.scss
View File

@ -78,7 +78,6 @@ a [class*=" icon-"] {
@mixin ie7icon($inner) { *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '#{$inner}'); } @mixin ie7icon($inner) { *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '#{$inner}'); }
.icon-glass { .icon-glass {
@include ie7icon(''); @include ie7icon('');
} }

8
src/assets/font-awesome/scss/_core.scss vendored
View File

@ -17,7 +17,7 @@
/* makes the font 33% larger relative to the icon container */ /* makes the font 33% larger relative to the icon container */
.icon-large:before { .icon-large:before {
vertical-align: -10%; vertical-align: -10%;
font-size: 4/3em; font-size: (4em/3);
} }
/* makes sure icons active on rollover in links */ /* makes sure icons active on rollover in links */
@ -33,11 +33,11 @@ a {
[class*=" icon-"] { [class*=" icon-"] {
&.icon-fixed-width { &.icon-fixed-width {
display: inline-block; display: inline-block;
width: 16/14em; width: (16em/14);
text-align: right; text-align: right;
padding-right: 4/14em; padding-right: (4em/14);
&.icon-large { &.icon-large {
width: 20/14em; width: (20em/14);
} }
} }
} }

2
src/assets/font-awesome/scss/_mixins.scss vendored
View File

@ -42,7 +42,7 @@
} }
.icon-stack-base { .icon-stack-base {
font-size: $base-font-size; font-size: $base-font-size;
*line-height: $height / $base-font-size; *line-height: #{$height / $base-font-size}em;
} }
} }
} }

12
src/assets/font-awesome/scss/_path.scss vendored
View File

@ -3,12 +3,12 @@
@font-face { @font-face {
font-family: 'FontAwesome'; font-family: 'FontAwesome';
src: url('${FontAwesomePath}/fontawesome-webfont.eot?v=${FontAwesomeVersion}'); src: url('#{$FontAwesomePath}/fontawesome-webfont.eot?v=#{$FontAwesomeVersion}');
src: url('${FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=${FontAwesomeVersion}') format('embedded-opentype'), 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.woff?v=#{$FontAwesomeVersion}') format('woff'),
url('${FontAwesomePath}/fontawesome-webfont.ttf?v=${FontAwesomeVersion}') format('truetype'), url('#{$FontAwesomePath}/fontawesome-webfont.ttf?v=#{$FontAwesomeVersion}') format('truetype'),
url('${FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=${FontAwesomeVersion}') format('svg'); url('#{$FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=#{$FontAwesomeVersion}') format('svg');
// src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts // src: url('#{$FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }

5
src/assets/font-awesome/scss/_variables.scss vendored
View File

@ -1,14 +1,15 @@
--- ---
--- ---
// Variables // Variables
// --------------------------
$FontAwesomePath: "../font" !default; $FontAwesomePath: "../font" !default;
$FontAwesomeVersion: "3.1.0" !default; $FontAwesomeVersion: "{{ site.fontawesome.version }}" !default;
$borderColor: #eeeeee !default; $borderColor: #eeeeee !default;
$iconMuted: #eeeeee !default; $iconMuted: #eeeeee !default;
$iconLight: white !default; $iconLight: white !default;
$iconDark: #333333 !default; $iconDark: #333333 !default;
$icons-li-width: 30em/14; $icons-li-width: (30em/14);
{% for icon in icons %} {% for icon in icons %}
${{ icon.id }}: "\{{ icon.unicode }}"; ${{ icon.id }}: "\{{ icon.unicode }}";

3
src/assets/font-awesome/scss/font-awesome-ie7.scss vendored
View File

@ -3,7 +3,7 @@
{% include license-code.less %} {% include license-code.less %}
.icon-large { .icon-large {
font-size: 4/3em; font-size: (4em/3);
margin-top: -4px; margin-top: -4px;
padding-top: 3px; padding-top: 3px;
margin-bottom: -4px; margin-bottom: -4px;
@ -55,7 +55,6 @@ a [class*=" icon-"] {
@mixin ie7icon($inner) { *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '#{$inner}'); } @mixin ie7icon($inner) { *zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '#{$inner}'); }
{% for icon in icons %} {% for icon in icons %}
.icon-{{ icon.id }} { .icon-{{ icon.id }} {
@include ie7icon('&#x{{ icon.unicode }};'); @include ie7icon('&#x{{ icon.unicode }};');