merged conflicts

This commit is contained in:
Geremia Taglialatela 2014-08-20 18:52:15 +02:00
commit 54059745fc
141 changed files with 233 additions and 69 deletions

View file

@ -4,6 +4,21 @@ Looking to contribute something to Font Awesome? **Here's how you can help.**
## Requesting new icons
New icons mostly start as requests by the [Font Awesome community on GitHub](../../issues). Want to request a new icon? Here are some things to keep in mind:
1. Please be nice. Font Awesome is a happy place.
2. Please [search](../../search?type=Issues) to see if your icon request already exists. If a request is found, please +1 that one.
3. Please make requests for single icons, unless you are requesting a couple of strictly related icons (e.g., thumbs-up/thumbs-down).
4. Please and thank you if you include the following:
- Title your [new issue](../../issues/new?title=Icon%20Request:%20icon-) `Icon request: icon-name` (e.g., `Icon request: icon-car`).
- Include a few use cases for your requested icon. How do you plan on using it?
- Attach a single color image or two that represent the idea you're going for.
- Request concrete objects: it's harder to make an icon to represent happiness, it's easier to make a smiley face. ☺
## Reporting issues ## Reporting issues
We only accept issues that are icon requests, bug reports, or feature requests. Bugs must be isolated and reproducible problems that we can fix within the Font Awesome core. Please read the following guidelines to ensure you are the paragon of bug reporting. We only accept issues that are icon requests, bug reports, or feature requests. Bugs must be isolated and reproducible problems that we can fix within the Font Awesome core. Please read the following guidelines to ensure you are the paragon of bug reporting.

View file

@ -8,12 +8,12 @@ GEM
columnize (0.8.9) columnize (0.8.9)
commander (4.1.6) commander (4.1.6)
highline (~> 1.6.11) highline (~> 1.6.11)
debugger (1.6.6) debugger (1.6.8)
columnize (>= 0.3.1) columnize (>= 0.3.1)
debugger-linecache (~> 1.2.0) debugger-linecache (~> 1.2.0)
debugger-ruby_core_source (~> 1.3.2) debugger-ruby_core_source (~> 1.3.5)
debugger-linecache (1.2.0) debugger-linecache (1.2.0)
debugger-ruby_core_source (1.3.4) debugger-ruby_core_source (1.3.5)
fast-stemmer (1.0.2) fast-stemmer (1.0.2)
ffi (1.9.3) ffi (1.9.3)
highline (1.6.21) highline (1.6.21)
@ -41,9 +41,9 @@ GEM
posix-spawn (~> 0.3.6) posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0) yajl-ruby (~> 1.1.0)
rb-fsevent (0.9.4) rb-fsevent (0.9.4)
rb-inotify (0.9.4) rb-inotify (0.9.5)
ffi (>= 0.5.0) ffi (>= 0.5.0)
rb-kqueue (0.2.2) rb-kqueue (0.2.3)
ffi (>= 0.5.0) ffi (>= 0.5.0)
redcarpet (2.3.0) redcarpet (2.3.0)
safe_yaml (1.0.3) safe_yaml (1.0.3)

View file

@ -1,7 +1,7 @@
{ {
"name": "font-awesome", "name": "font-awesome",
"description": "Font Awesome", "description": "Font Awesome",
"version": "4.1.0", "version": "4.1.1",
"keywords": [], "keywords": [],
"homepage": "http://fontawesome.io", "homepage": "http://fontawesome.io",
"dependencies": {}, "dependencies": {},

View file

@ -2,7 +2,7 @@
"name": "font-awesome", "name": "font-awesome",
"repo": "FortAwesome/Font-Awesome", "repo": "FortAwesome/Font-Awesome",
"description": "Font Awesome", "description": "Font Awesome",
"version": "4.1.0", "version": "4.1.1",
"keywords": [], "keywords": [],
"dependencies": {}, "dependencies": {},
"development": {}, "development": {},

30
css/font-awesome.css vendored
View file

@ -86,25 +86,31 @@
@-moz-keyframes fa-spin { @-moz-keyframes fa-spin {
0% { 0% {
-moz-transform: rotate(0deg); -moz-transform: rotate(0deg);
transform: rotate(0deg);
} }
100% { 100% {
-moz-transform: rotate(359deg); -moz-transform: rotate(359deg);
} transform: rotate(359deg);
}
@-webkit-keyframes fa-spin {
0% {
-webkit-transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
} }
} }
@-o-keyframes fa-spin { @-o-keyframes fa-spin {
0% { 0% {
-o-transform: rotate(0deg); -o-transform: rotate(0deg);
transform: rotate(0deg);
} }
100% { 100% {
-o-transform: rotate(359deg); -o-transform: rotate(359deg);
transform: rotate(359deg);
}
}
@-webkit-keyframes fa-spin {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
transform: rotate(359deg);
} }
} }
@keyframes fa-spin { @keyframes fa-spin {
@ -157,6 +163,13 @@
-o-transform: scale(1, -1); -o-transform: scale(1, -1);
transform: scale(1, -1); transform: scale(1, -1);
} }
:root .fa-rotate-90,
:root .fa-rotate-180,
:root .fa-rotate-270,
:root .fa-flip-horizontal,
:root .fa-flip-vertical {
filter: none;
}
.fa-stack { .fa-stack {
position: relative; position: relative;
display: inline-block; display: inline-block;
@ -1497,6 +1510,7 @@
content: "\f1cc"; content: "\f1cc";
} }
.fa-life-bouy:before, .fa-life-bouy:before,
.fa-life-buoy:before,
.fa-life-saver:before, .fa-life-saver:before,
.fa-support:before, .fa-support:before,
.fa-life-ring:before { .fa-life-ring:before {

File diff suppressed because one or more lines are too long

0
fonts/fontawesome-webfont.eot Executable file → Normal file
View file

0
fonts/fontawesome-webfont.svg Executable file → Normal file
View file

Before

Width:  |  Height:  |  Size: 248 KiB

After

Width:  |  Height:  |  Size: 248 KiB

0
fonts/fontawesome-webfont.ttf Executable file → Normal file
View file

0
fonts/fontawesome-webfont.woff Executable file → Normal file
View file

View file

@ -477,6 +477,7 @@
.@{fa-css-prefix}-codepen:before { content: @fa-var-codepen; } .@{fa-css-prefix}-codepen:before { content: @fa-var-codepen; }
.@{fa-css-prefix}-jsfiddle:before { content: @fa-var-jsfiddle; } .@{fa-css-prefix}-jsfiddle:before { content: @fa-var-jsfiddle; }
.@{fa-css-prefix}-life-bouy:before, .@{fa-css-prefix}-life-bouy:before,
.@{fa-css-prefix}-life-buoy:before,
.@{fa-css-prefix}-life-saver:before, .@{fa-css-prefix}-life-saver:before,
.@{fa-css-prefix}-support:before, .@{fa-css-prefix}-support:before,
.@{fa-css-prefix}-life-ring:before { content: @fa-var-life-ring; } .@{fa-css-prefix}-life-ring:before { content: @fa-var-life-ring; }

View file

@ -14,6 +14,6 @@
top: (2em / 14); top: (2em / 14);
text-align: center; text-align: center;
&.@{fa-css-prefix}-lg { &.@{fa-css-prefix}-lg {
left: -@fa-li-width + (4em / 14); left: (-@fa-li-width + (4em / 14));
} }
} }

View file

@ -3,11 +3,11 @@
@font-face { @font-face {
font-family: 'FontAwesome'; font-family: 'FontAwesome';
src: ~"url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}')"; src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
src: ~"url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype')", src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
~"url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff')", url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
~"url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype')", url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
~"url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg')"; url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
// src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts // src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;

View file

@ -7,3 +7,14 @@
.@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); } .@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); }
.@{fa-css-prefix}-flip-vertical { .fa-icon-flip(1, -1, 2); } .@{fa-css-prefix}-flip-vertical { .fa-icon-flip(1, -1, 2); }
// Hook for IE8-9
// -------------------------
:root .@{fa-css-prefix}-rotate-90,
:root .@{fa-css-prefix}-rotate-180,
:root .@{fa-css-prefix}-rotate-270,
:root .@{fa-css-prefix}-flip-horizontal,
:root .@{fa-css-prefix}-flip-vertical {
filter: none;
}

View file

@ -9,16 +9,34 @@
} }
@-moz-keyframes fa-spin { @-moz-keyframes fa-spin {
0% { -moz-transform: rotate(0deg); } 0% {
100% { -moz-transform: rotate(359deg); } -moz-transform: rotate(0deg);
} transform: rotate(0deg);
@-webkit-keyframes fa-spin { }
0% { -webkit-transform: rotate(0deg); } 100% {
100% { -webkit-transform: rotate(359deg); } -moz-transform: rotate(359deg);
transform: rotate(359deg);
}
} }
@-o-keyframes fa-spin { @-o-keyframes fa-spin {
0% { -o-transform: rotate(0deg); } 0% {
100% { -o-transform: rotate(359deg); } -o-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-o-transform: rotate(359deg);
transform: rotate(359deg);
}
}
@-webkit-keyframes fa-spin {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
transform: rotate(359deg);
}
} }
@keyframes fa-spin { @keyframes fa-spin {
0% { 0% {

View file

@ -272,6 +272,7 @@
@fa-var-level-down: "\f149"; @fa-var-level-down: "\f149";
@fa-var-level-up: "\f148"; @fa-var-level-up: "\f148";
@fa-var-life-bouy: "\f1cd"; @fa-var-life-bouy: "\f1cd";
@fa-var-life-buoy: "\f1cd";
@fa-var-life-ring: "\f1cd"; @fa-var-life-ring: "\f1cd";
@fa-var-life-saver: "\f1cd"; @fa-var-life-saver: "\f1cd";
@fa-var-lightbulb-o: "\f0eb"; @fa-var-lightbulb-o: "\f0eb";

View file

@ -1,7 +1,7 @@
{ {
"name": "font-awesome", "name": "font-awesome",
"description": "The iconic font and CSS framework", "description": "The iconic font and CSS framework",
"version": "4.1.0", "version": "4.1.1",
"keywords": ["font", "awesome", "fontawesome", "icon", "font", "bootstrap"], "keywords": ["font", "awesome", "fontawesome", "icon", "font", "bootstrap"],
"homepage": "http://fontawesome.io/", "homepage": "http://fontawesome.io/",
"bugs": { "bugs": {

View file

@ -477,6 +477,7 @@
.#{$fa-css-prefix}-codepen:before { content: $fa-var-codepen; } .#{$fa-css-prefix}-codepen:before { content: $fa-var-codepen; }
.#{$fa-css-prefix}-jsfiddle:before { content: $fa-var-jsfiddle; } .#{$fa-css-prefix}-jsfiddle:before { content: $fa-var-jsfiddle; }
.#{$fa-css-prefix}-life-bouy:before, .#{$fa-css-prefix}-life-bouy:before,
.#{$fa-css-prefix}-life-buoy:before,
.#{$fa-css-prefix}-life-saver:before, .#{$fa-css-prefix}-life-saver:before,
.#{$fa-css-prefix}-support:before, .#{$fa-css-prefix}-support:before,
.#{$fa-css-prefix}-life-ring:before { content: $fa-var-life-ring; } .#{$fa-css-prefix}-life-ring:before { content: $fa-var-life-ring; }

View file

@ -7,3 +7,14 @@
.#{$fa-css-prefix}-flip-horizontal { @include fa-icon-flip(-1, 1, 0); } .#{$fa-css-prefix}-flip-horizontal { @include fa-icon-flip(-1, 1, 0); }
.#{$fa-css-prefix}-flip-vertical { @include fa-icon-flip(1, -1, 2); } .#{$fa-css-prefix}-flip-vertical { @include fa-icon-flip(1, -1, 2); }
// Hook for IE8-9
// -------------------------
:root .#{$fa-css-prefix}-rotate-90,
:root .#{$fa-css-prefix}-rotate-180,
:root .#{$fa-css-prefix}-rotate-270,
:root .#{$fa-css-prefix}-flip-horizontal,
:root .#{$fa-css-prefix}-flip-vertical {
filter: none;
}

View file

@ -9,16 +9,34 @@
} }
@-moz-keyframes fa-spin { @-moz-keyframes fa-spin {
0% { -moz-transform: rotate(0deg); } 0% {
100% { -moz-transform: rotate(359deg); } -moz-transform: rotate(0deg);
} transform: rotate(0deg);
@-webkit-keyframes fa-spin { }
0% { -webkit-transform: rotate(0deg); } 100% {
100% { -webkit-transform: rotate(359deg); } -moz-transform: rotate(359deg);
transform: rotate(359deg);
}
} }
@-o-keyframes fa-spin { @-o-keyframes fa-spin {
0% { -o-transform: rotate(0deg); } 0% {
100% { -o-transform: rotate(359deg); } -o-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-o-transform: rotate(359deg);
transform: rotate(359deg);
}
}
@-webkit-keyframes fa-spin {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
transform: rotate(359deg);
}
} }
@keyframes fa-spin { @keyframes fa-spin {
0% { 0% {

View file

@ -272,6 +272,7 @@ $fa-var-lemon-o: "\f094";
$fa-var-level-down: "\f149"; $fa-var-level-down: "\f149";
$fa-var-level-up: "\f148"; $fa-var-level-up: "\f148";
$fa-var-life-bouy: "\f1cd"; $fa-var-life-bouy: "\f1cd";
$fa-var-life-buoy: "\f1cd";
$fa-var-life-ring: "\f1cd"; $fa-var-life-ring: "\f1cd";
$fa-var-life-saver: "\f1cd"; $fa-var-life-saver: "\f1cd";
$fa-var-lightbulb-o: "\f0eb"; $fa-var-lightbulb-o: "\f0eb";

0
src/3.2.1/assets/css/prettify.css Executable file → Normal file
View file

View file

View file

Before

Width:  |  Height:  |  Size: 193 KiB

After

Width:  |  Height:  |  Size: 193 KiB

View file

View file

0
src/3.2.1/assets/js/ZeroClipboard-1.1.7.min.js vendored Executable file → Normal file
View file

0
src/3.2.1/assets/js/ZeroClipboard-1.1.7.swf Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/accordion.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/alerts.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/bootstrap.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/breadcrumbs.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/button-groups.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/buttons.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/carousel.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/close.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/code.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/component-animations.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/dropdowns.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/forms.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/grid.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/hero-unit.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/labels-badges.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/layouts.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/media.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/mixins.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/modals.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/navbar.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/navs.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/pager.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/pagination.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/popovers.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/progress-bars.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/reset.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/responsive-1200px-min.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/responsive-767px-max.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/responsive-768px-979px.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/responsive-navbar.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/responsive-utilities.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/responsive.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/scaffolding.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/sprites.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/tables.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/thumbnails.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/tooltip.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/type.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/utilities.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/variables.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/bootstrap-2.3.2/wells.less vendored Executable file → Normal file
View file

0
src/3.2.1/assets/less/responsive-1200px-min.less Executable file → Normal file
View file

0
src/3.2.1/assets/less/responsive-767px-max.less Executable file → Normal file
View file

0
src/3.2.1/assets/less/responsive-768px-979px.less Executable file → Normal file
View file

0
src/3.2.1/assets/less/responsive-navbar.less Executable file → Normal file
View file

0
src/3.2.1/assets/less/sticky-footer.less Executable file → Normal file
View file

0
src/3.2.1/assets/less/variables.less Executable file → Normal file
View file

0
src/3.2.1/icons.yml Executable file → Normal file
View file

View file

@ -7,21 +7,23 @@
</p> </p>
<ol> <ol>
<li>Please be nice. Font Awesome is a happy place.</li> <li>Please be nice. Font Awesome is a happy place.</li>
<li>Please <a href="{{ site.fontawesome.github.url }}/search?type=Issues">search</a> to see if your icon request already exists.</li> <li>Please <a href="{{ site.fontawesome.github.url }}/search?type=Issues">search</a> to see if your icon request already exists. If a request is found, please +1 that one.</li>
<li>
Please make requests for single icons, unless you are requesting a couple of strictly related icons (e.g., thumbs-up/thumbs-down).
</li>
<li> <li>
Please and thank you if you include the following: Please and thank you if you include the following:
<ul> <ul>
<li> <li>
Title your <a href="{{ site.fontawesome.github.url }}/issues/new?title=Icon%20Request:%20icon-name">new issue</a> Title your <a href="{{ site.fontawesome.github.url }}/issues/new?title=Icon%20Request:%20fa-">new issue</a>
<code>Icon request: icon-name</code>. <code>Icon request: icon-name</code> (e.g., <code>Icon request: icon-car</code>).
</li> </li>
<li>Include a few use cases for your requested icon. How do you plan on using it?</li> <li>Include a few use cases for your requested icon. How do you plan on using it?</li>
<li>Attach a single color image or two that represent the idea you're going for.</li> <li>Attach a single color image or two that represent the idea you're going for.</li>
</ul> </ul>
</li> </li>
<li> <li>
Concrete objects make good icons, since abstract concepts are, well, abstract. It's harder to make an icon Request concrete objects: it's harder to make an icon to represent happiness, it's easier to make a smiley face. <i class="fa fa-smile-o"></i>
to represent happiness. It's easier to make a smiley face. <i class="fa fa-smile"></i>
</li> </li>
</ol> </ol>
</section> </section>

0
src/assets/css/prettify.css Executable file → Normal file
View file

0
src/assets/font-awesome/fonts/fontawesome-webfont.eot Executable file → Normal file
View file

0
src/assets/font-awesome/fonts/fontawesome-webfont.svg Executable file → Normal file
View file

Before

Width:  |  Height:  |  Size: 248 KiB

After

Width:  |  Height:  |  Size: 248 KiB

0
src/assets/font-awesome/fonts/fontawesome-webfont.ttf Executable file → Normal file
View file

0
src/assets/font-awesome/fonts/fontawesome-webfont.woff Executable file → Normal file
View file

View file

@ -17,6 +17,6 @@
top: (2em / 14); top: (2em / 14);
text-align: center; text-align: center;
&.@{fa-css-prefix}-lg { &.@{fa-css-prefix}-lg {
left: -@fa-li-width + (4em / 14); left: (-@fa-li-width + (4em / 14));
} }
} }

View file

@ -3,11 +3,11 @@
@font-face { @font-face {
font-family: 'FontAwesome'; font-family: 'FontAwesome';
src: ~"url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}')"; src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
src: ~"url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype')", src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
~"url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff')", url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
~"url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype')", url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
~"url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg')"; url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
// src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts // src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;

View file

@ -10,3 +10,14 @@
.@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); } .@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); }
.@{fa-css-prefix}-flip-vertical { .fa-icon-flip(1, -1, 2); } .@{fa-css-prefix}-flip-vertical { .fa-icon-flip(1, -1, 2); }
// Hook for IE8-9
// -------------------------
:root .@{fa-css-prefix}-rotate-90,
:root .@{fa-css-prefix}-rotate-180,
:root .@{fa-css-prefix}-rotate-270,
:root .@{fa-css-prefix}-flip-horizontal,
:root .@{fa-css-prefix}-flip-vertical {
filter: none;
}

View file

@ -12,16 +12,34 @@
} }
@-moz-keyframes fa-spin { @-moz-keyframes fa-spin {
0% { -moz-transform: rotate(0deg); } 0% {
100% { -moz-transform: rotate(359deg); } -moz-transform: rotate(0deg);
} transform: rotate(0deg);
@-webkit-keyframes fa-spin { }
0% { -webkit-transform: rotate(0deg); } 100% {
100% { -webkit-transform: rotate(359deg); } -moz-transform: rotate(359deg);
transform: rotate(359deg);
}
} }
@-o-keyframes fa-spin { @-o-keyframes fa-spin {
0% { -o-transform: rotate(0deg); } 0% {
100% { -o-transform: rotate(359deg); } -o-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-o-transform: rotate(359deg);
transform: rotate(359deg);
}
}
@-webkit-keyframes fa-spin {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
transform: rotate(359deg);
}
} }
@keyframes fa-spin { @keyframes fa-spin {
0% { 0% {

View file

@ -10,3 +10,14 @@
.#{$fa-css-prefix}-flip-horizontal { @include fa-icon-flip(-1, 1, 0); } .#{$fa-css-prefix}-flip-horizontal { @include fa-icon-flip(-1, 1, 0); }
.#{$fa-css-prefix}-flip-vertical { @include fa-icon-flip(1, -1, 2); } .#{$fa-css-prefix}-flip-vertical { @include fa-icon-flip(1, -1, 2); }
// Hook for IE8-9
// -------------------------
:root .#{$fa-css-prefix}-rotate-90,
:root .#{$fa-css-prefix}-rotate-180,
:root .#{$fa-css-prefix}-rotate-270,
:root .#{$fa-css-prefix}-flip-horizontal,
:root .#{$fa-css-prefix}-flip-vertical {
filter: none;
}

View file

@ -12,16 +12,34 @@
} }
@-moz-keyframes fa-spin { @-moz-keyframes fa-spin {
0% { -moz-transform: rotate(0deg); } 0% {
100% { -moz-transform: rotate(359deg); } -moz-transform: rotate(0deg);
} transform: rotate(0deg);
@-webkit-keyframes fa-spin { }
0% { -webkit-transform: rotate(0deg); } 100% {
100% { -webkit-transform: rotate(359deg); } -moz-transform: rotate(359deg);
transform: rotate(359deg);
}
} }
@-o-keyframes fa-spin { @-o-keyframes fa-spin {
0% { -o-transform: rotate(0deg); } 0% {
100% { -o-transform: rotate(359deg); } -o-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-o-transform: rotate(359deg);
transform: rotate(359deg);
}
}
@-webkit-keyframes fa-spin {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
transform: rotate(359deg);
}
} }
@keyframes fa-spin { @keyframes fa-spin {
0% { 0% {

0
src/assets/js/ZeroClipboard-1.1.7.min.js vendored Executable file → Normal file
View file

0
src/assets/js/ZeroClipboard-1.1.7.swf Executable file → Normal file
View file

0
src/assets/js/bootstrap-3.0.2.min.js vendored Executable file → Normal file
View file

0
src/assets/js/bootstrap-3.1.1.min.js vendored Executable file → Normal file
View file

0
src/assets/js/html5shiv.js vendored Executable file → Normal file
View file

0
src/assets/js/jquery-1.10.2.min.js vendored Executable file → Normal file
View file

0
src/assets/js/respond.min.js vendored Executable file → Normal file
View file

0
src/assets/less/bootstrap-3.1.1/.csscomb.json Executable file → Normal file
View file

0
src/assets/less/bootstrap-3.1.1/.csslintrc Executable file → Normal file
View file

0
src/assets/less/bootstrap-3.1.1/alerts.less vendored Executable file → Normal file
View file

0
src/assets/less/bootstrap-3.1.1/badges.less vendored Executable file → Normal file
View file

0
src/assets/less/bootstrap-3.1.1/bootstrap.less vendored Executable file → Normal file
View file

Some files were not shown because too many files have changed in this diff Show more