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

merge conflicts

Browse Source
This commit is contained in:
Dave Gandy 2014-08-23 10:16:24 -04:00
commit 4df6fec3a8
82 changed files with 25 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
css/font-awesome.css vendored
View File

@ -77,30 +77,8 @@
} }
.fa-spin { .fa-spin {
-webkit-animation: fa-spin 2s infinite linear; -webkit-animation: fa-spin 2s infinite linear;
-moz-animation: fa-spin 2s infinite linear;
-o-animation: fa-spin 2s infinite linear;
animation: fa-spin 2s infinite linear; animation: fa-spin 2s infinite linear;
} }
@-moz-keyframes fa-spin {
0% {
-moz-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-moz-transform: rotate(359deg);
transform: rotate(359deg);
}
}
@-o-keyframes fa-spin {
0% {
-o-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-o-transform: rotate(359deg);
transform: rotate(359deg);
}
}
@-webkit-keyframes fa-spin { @-webkit-keyframes fa-spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
@ -124,41 +102,31 @@
.fa-rotate-90 { .fa-rotate-90 {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-webkit-transform: rotate(90deg); -webkit-transform: rotate(90deg);
-moz-transform: rotate(90deg);
-ms-transform: rotate(90deg); -ms-transform: rotate(90deg);
-o-transform: rotate(90deg);
transform: rotate(90deg); transform: rotate(90deg);
} }
.fa-rotate-180 { .fa-rotate-180 {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
-webkit-transform: rotate(180deg); -webkit-transform: rotate(180deg);
-moz-transform: rotate(180deg);
-ms-transform: rotate(180deg); -ms-transform: rotate(180deg);
-o-transform: rotate(180deg);
transform: rotate(180deg); transform: rotate(180deg);
} }
.fa-rotate-270 { .fa-rotate-270 {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
-webkit-transform: rotate(270deg); -webkit-transform: rotate(270deg);
-moz-transform: rotate(270deg);
-ms-transform: rotate(270deg); -ms-transform: rotate(270deg);
-o-transform: rotate(270deg);
transform: rotate(270deg); transform: rotate(270deg);
} }
.fa-flip-horizontal { .fa-flip-horizontal {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
-webkit-transform: scale(-1, 1); -webkit-transform: scale(-1, 1);
-moz-transform: scale(-1, 1);
-ms-transform: scale(-1, 1); -ms-transform: scale(-1, 1);
-o-transform: scale(-1, 1);
transform: scale(-1, 1); transform: scale(-1, 1);
} }
.fa-flip-vertical { .fa-flip-vertical {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);
-webkit-transform: scale(1, -1); -webkit-transform: scale(1, -1);
-moz-transform: scale(1, -1);
-ms-transform: scale(1, -1); -ms-transform: scale(1, -1);
-o-transform: scale(1, -1);
transform: scale(1, -1); transform: scale(1, -1);
} }
:root .fa-rotate-90, :root .fa-rotate-90,

2
css/font-awesome.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
less/mixins.less
View File

@ -4,17 +4,13 @@
.fa-icon-rotate(@degrees, @rotation) { .fa-icon-rotate(@degrees, @rotation) {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation);
-webkit-transform: rotate(@degrees); -webkit-transform: rotate(@degrees);
-moz-transform: rotate(@degrees);
-ms-transform: rotate(@degrees); -ms-transform: rotate(@degrees);
-o-transform: rotate(@degrees);
transform: rotate(@degrees); transform: rotate(@degrees);
} }
.fa-icon-flip(@horiz, @vert, @rotation) { .fa-icon-flip(@horiz, @vert, @rotation) {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation, mirror=1); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation, mirror=1);
-webkit-transform: scale(@horiz, @vert); -webkit-transform: scale(@horiz, @vert);
-moz-transform: scale(@horiz, @vert);
-ms-transform: scale(@horiz, @vert); -ms-transform: scale(@horiz, @vert);
-o-transform: scale(@horiz, @vert);
transform: scale(@horiz, @vert); transform: scale(@horiz, @vert);
} }

33
less/spinning.less
View File

@ -3,48 +3,27 @@
.@{fa-css-prefix}-spin { .@{fa-css-prefix}-spin {
-webkit-animation: fa-spin 2s infinite linear; -webkit-animation: fa-spin 2s infinite linear;
-moz-animation: fa-spin 2s infinite linear; animation: fa-spin 2s infinite linear;
-o-animation: fa-spin 2s infinite linear;
animation: fa-spin 2s infinite linear;
} }
@-moz-keyframes fa-spin {
0% {
-moz-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-moz-transform: rotate(359deg);
transform: rotate(359deg);
}
}
@-o-keyframes fa-spin {
0% {
-o-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-o-transform: rotate(359deg);
transform: rotate(359deg);
}
}
@-webkit-keyframes fa-spin { @-webkit-keyframes fa-spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
} }
100% { 100% {
-webkit-transform: rotate(359deg); -webkit-transform: rotate(359deg);
transform: rotate(359deg); transform: rotate(359deg);
} }
} }
@keyframes fa-spin { @keyframes fa-spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
} }
100% { 100% {
-webkit-transform: rotate(359deg); -webkit-transform: rotate(359deg);
transform: rotate(359deg); transform: rotate(359deg);
} }
} }

4
scss/_mixins.scss
View File

@ -4,17 +4,13 @@
@mixin fa-icon-rotate($degrees, $rotation) { @mixin fa-icon-rotate($degrees, $rotation) {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation});
-webkit-transform: rotate($degrees); -webkit-transform: rotate($degrees);
-moz-transform: rotate($degrees);
-ms-transform: rotate($degrees); -ms-transform: rotate($degrees);
-o-transform: rotate($degrees);
transform: rotate($degrees); transform: rotate($degrees);
} }
@mixin fa-icon-flip($horiz, $vert, $rotation) { @mixin fa-icon-flip($horiz, $vert, $rotation) {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation});
-webkit-transform: scale($horiz, $vert); -webkit-transform: scale($horiz, $vert);
-moz-transform: scale($horiz, $vert);
-ms-transform: scale($horiz, $vert); -ms-transform: scale($horiz, $vert);
-o-transform: scale($horiz, $vert);
transform: scale($horiz, $vert); transform: scale($horiz, $vert);
} }

33
scss/_spinning.scss
View File

@ -3,48 +3,27 @@
.#{$fa-css-prefix}-spin { .#{$fa-css-prefix}-spin {
-webkit-animation: fa-spin 2s infinite linear; -webkit-animation: fa-spin 2s infinite linear;
-moz-animation: fa-spin 2s infinite linear; animation: fa-spin 2s infinite linear;
-o-animation: fa-spin 2s infinite linear;
animation: fa-spin 2s infinite linear;
} }
@-moz-keyframes fa-spin {
0% {
-moz-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-moz-transform: rotate(359deg);
transform: rotate(359deg);
}
}
@-o-keyframes fa-spin {
0% {
-o-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-o-transform: rotate(359deg);
transform: rotate(359deg);
}
}
@-webkit-keyframes fa-spin { @-webkit-keyframes fa-spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
} }
100% { 100% {
-webkit-transform: rotate(359deg); -webkit-transform: rotate(359deg);
transform: rotate(359deg); transform: rotate(359deg);
} }
} }
@keyframes fa-spin { @keyframes fa-spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
} }
100% { 100% {
-webkit-transform: rotate(359deg); -webkit-transform: rotate(359deg);
transform: rotate(359deg); transform: rotate(359deg);
} }
} }

4
src/assets/font-awesome/less/mixins.less vendored
View File

@ -6,17 +6,13 @@
.fa-icon-rotate(@degrees, @rotation) { .fa-icon-rotate(@degrees, @rotation) {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation);
-webkit-transform: rotate(@degrees); -webkit-transform: rotate(@degrees);
-moz-transform: rotate(@degrees);
-ms-transform: rotate(@degrees); -ms-transform: rotate(@degrees);
-o-transform: rotate(@degrees);
transform: rotate(@degrees); transform: rotate(@degrees);
} }
.fa-icon-flip(@horiz, @vert, @rotation) { .fa-icon-flip(@horiz, @vert, @rotation) {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation, mirror=1); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation, mirror=1);
-webkit-transform: scale(@horiz, @vert); -webkit-transform: scale(@horiz, @vert);
-moz-transform: scale(@horiz, @vert);
-ms-transform: scale(@horiz, @vert); -ms-transform: scale(@horiz, @vert);
-o-transform: scale(@horiz, @vert);
transform: scale(@horiz, @vert); transform: scale(@horiz, @vert);
} }

33
src/assets/font-awesome/less/spinning.less vendored
View File

@ -6,48 +6,27 @@
.@{fa-css-prefix}-spin { .@{fa-css-prefix}-spin {
-webkit-animation: fa-spin 2s infinite linear; -webkit-animation: fa-spin 2s infinite linear;
-moz-animation: fa-spin 2s infinite linear; animation: fa-spin 2s infinite linear;
-o-animation: fa-spin 2s infinite linear;
animation: fa-spin 2s infinite linear;
} }
@-moz-keyframes fa-spin {
0% {
-moz-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-moz-transform: rotate(359deg);
transform: rotate(359deg);
}
}
@-o-keyframes fa-spin {
0% {
-o-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-o-transform: rotate(359deg);
transform: rotate(359deg);
}
}
@-webkit-keyframes fa-spin { @-webkit-keyframes fa-spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
} }
100% { 100% {
-webkit-transform: rotate(359deg); -webkit-transform: rotate(359deg);
transform: rotate(359deg); transform: rotate(359deg);
} }
} }
@keyframes fa-spin { @keyframes fa-spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
} }
100% { 100% {
-webkit-transform: rotate(359deg); -webkit-transform: rotate(359deg);
transform: rotate(359deg); transform: rotate(359deg);
} }
} }

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

@ -6,17 +6,13 @@
@mixin fa-icon-rotate($degrees, $rotation) { @mixin fa-icon-rotate($degrees, $rotation) {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation});
-webkit-transform: rotate($degrees); -webkit-transform: rotate($degrees);
-moz-transform: rotate($degrees);
-ms-transform: rotate($degrees); -ms-transform: rotate($degrees);
-o-transform: rotate($degrees);
transform: rotate($degrees); transform: rotate($degrees);
} }
@mixin fa-icon-flip($horiz, $vert, $rotation) { @mixin fa-icon-flip($horiz, $vert, $rotation) {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation});
-webkit-transform: scale($horiz, $vert); -webkit-transform: scale($horiz, $vert);
-moz-transform: scale($horiz, $vert);
-ms-transform: scale($horiz, $vert); -ms-transform: scale($horiz, $vert);
-o-transform: scale($horiz, $vert);
transform: scale($horiz, $vert); transform: scale($horiz, $vert);
} }

33
src/assets/font-awesome/scss/_spinning.scss vendored
View File

@ -6,48 +6,27 @@
.#{$fa-css-prefix}-spin { .#{$fa-css-prefix}-spin {
-webkit-animation: fa-spin 2s infinite linear; -webkit-animation: fa-spin 2s infinite linear;
-moz-animation: fa-spin 2s infinite linear; animation: fa-spin 2s infinite linear;
-o-animation: fa-spin 2s infinite linear;
animation: fa-spin 2s infinite linear;
} }
@-moz-keyframes fa-spin {
0% {
-moz-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-moz-transform: rotate(359deg);
transform: rotate(359deg);
}
}
@-o-keyframes fa-spin {
0% {
-o-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-o-transform: rotate(359deg);
transform: rotate(359deg);
}
}
@-webkit-keyframes fa-spin { @-webkit-keyframes fa-spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
} }
100% { 100% {
-webkit-transform: rotate(359deg); -webkit-transform: rotate(359deg);
transform: rotate(359deg); transform: rotate(359deg);
} }
} }
@keyframes fa-spin { @keyframes fa-spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
} }
100% { 100% {
-webkit-transform: rotate(359deg); -webkit-transform: rotate(359deg);
transform: rotate(359deg); transform: rotate(359deg);
} }
} }

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

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

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

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

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

0
src/assets/less/bootstrap-3.2.0/breadcrumbs.less vendored Executable file → Normal file
View File

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

0
src/assets/less/bootstrap-3.2.0/buttons.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/carousel.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/close.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/code.less vendored Executable file → Normal file
View File

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

0
src/assets/less/bootstrap-3.2.0/dropdowns.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/forms.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/glyphicons.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/grid.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/input-groups.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/jumbotron.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/labels.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/list-group.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/media.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/alerts.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/background-variant.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/border-radius.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/buttons.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/center-block.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/clearfix.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/forms.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/gradients.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/grid-framework.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/grid.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/hide-text.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/image.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/labels.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/list-group.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/nav-divider.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/nav-vertical-align.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/opacity.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/pagination.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/panels.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/progress-bar.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/reset-filter.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/resize.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/responsive-visibility.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/size.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/tab-focus.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/table-row.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/text-emphasis.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/text-overflow.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/mixins/vendor-prefixes.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/modals.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/navbar.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/navs.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/normalize.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/pager.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/pagination.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/panels.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/popovers.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/print.less vendored Executable file → Normal file
View File

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

0
src/assets/less/bootstrap-3.2.0/responsive-embed.less vendored Executable file → Normal file
View File

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

0
src/assets/less/bootstrap-3.2.0/scaffolding.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/tables.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/theme.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/thumbnails.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/tooltip.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/type.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/utilities.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/variables.less vendored Executable file → Normal file
View File

0
src/assets/less/bootstrap-3.2.0/wells.less vendored Executable file → Normal file
View File