Skip to content

Commit 81a4a68

Browse files
kevin-brownkevin-brown
committed
Updated Font Awesome to 4.5.0 for docs
This also includes the missing WOFF2 and SVG files that were causing errors for some. This closes select2#4160.
1 parent a5e539b commit 81a4a68

20 files changed

Lines changed: 1765 additions & 19 deletions

‎docs/_includes/head.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<script type="text/javascript" src="vendor/js/prettify.min.js"></script>
1313
<script type="text/javascript" src="vendor/js/anchor.min.js"></script>
1414

15-
<link href="vendor/css/bootstrap.min.css" type="text/css" rel="stylesheet" />
15+
<link href="css/bootstrap.css" type="text/css" rel="stylesheet" />
1616
<link href="dist/css/select2.min.css" type="text/css" rel="stylesheet" />
1717

18-
<link href="vendor/css/font-awesome.min.css" type="text/css" rel="stylesheet" />
18+
<link href="css/font-awesome.css" type="text/css" rel="stylesheet" />
1919
<link href="css/s2-docs.css" type="text/css" rel="stylesheet" >

‎docs/_sass/vendor/font-awesome/_animated.scss‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// Spinning Icons
2+
// --------------------------
3+
4+
.#{$fa-css-prefix}-spin {
5+
-webkit-animation: fa-spin 2s infinite linear;
6+
animation: fa-spin 2s infinite linear;
7+
}
8+
9+
.#{$fa-css-prefix}-pulse {
10+
-webkit-animation: fa-spin 1s infinite steps(8);
11+
animation: fa-spin 1s infinite steps(8);
12+
}
13+
14+
@-webkit-keyframes fa-spin {
15+
0% {
16+
-webkit-transform: rotate(0deg);
17+
transform: rotate(0deg);
18+
}
19+
100% {
20+
-webkit-transform: rotate(359deg);
21+
transform: rotate(359deg);
22+
}
23+
}
24+
25+
@keyframes fa-spin {
26+
0% {
27+
-webkit-transform: rotate(0deg);
28+
transform: rotate(0deg);
29+
}
30+
100% {
31+
-webkit-transform: rotate(359deg);
32+
transform: rotate(359deg);
33+
}
34+
}

‎docs/_sass/vendor/font-awesome/_bordered-pulled.scss‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Bordered & Pulled
2+
// -------------------------
3+
4+
.#{$fa-css-prefix}-border {
5+
padding: .2em .25em .15em;
6+
border: solid .08em $fa-border-color;
7+
border-radius: .1em;
8+
}
9+
10+
.#{$fa-css-prefix}-pull-left { float: left; }
11+
.#{$fa-css-prefix}-pull-right { float: right; }
12+
13+
.#{$fa-css-prefix} {
14+
&.#{$fa-css-prefix}-pull-left { margin-right: .3em; }
15+
&.#{$fa-css-prefix}-pull-right { margin-left: .3em; }
16+
}
17+
18+
/* Deprecated as of 4.4.0 */
19+
.pull-right { float: right; }
20+
.pull-left { float: left; }
21+
22+
.#{$fa-css-prefix} {
23+
&.pull-left { margin-right: .3em; }
24+
&.pull-right { margin-left: .3em; }
25+
}

‎docs/_sass/vendor/font-awesome/_core.scss‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Base Class Definition
2+
// -------------------------
3+
4+
.#{$fa-css-prefix} {
5+
display: inline-block;
6+
font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base} FontAwesome; // shortening font declaration
7+
font-size: inherit; // can't have font-size inherit on line above, so need to override
8+
text-rendering: auto; // optimizelegibility throws things off #1094
9+
-webkit-font-smoothing: antialiased;
10+
-moz-osx-font-smoothing: grayscale;
11+
12+
}

‎docs/_sass/vendor/font-awesome/_fixed-width.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// Fixed Width Icons
2+
// -------------------------
3+
.#{$fa-css-prefix}-fw {
4+
width: (18em / 14);
5+
text-align: center;
6+
}

‎docs/_sass/vendor/font-awesome/_icons.scss‎

Lines changed: 697 additions & 0 deletions
Large diffs are not rendered by default.

‎docs/_sass/vendor/font-awesome/_larger.scss‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Icon Sizes
2+
// -------------------------
3+
4+
/* makes the font 33% larger relative to the icon container */
5+
.#{$fa-css-prefix}-lg {
6+
font-size: (4em / 3);
7+
line-height: (3em / 4);
8+
vertical-align: -15%;
9+
}
10+
.#{$fa-css-prefix}-2x { font-size: 2em; }
11+
.#{$fa-css-prefix}-3x { font-size: 3em; }
12+
.#{$fa-css-prefix}-4x { font-size: 4em; }
13+
.#{$fa-css-prefix}-5x { font-size: 5em; }

‎docs/_sass/vendor/font-awesome/_list.scss‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// List Icons
2+
// -------------------------
3+
4+
.#{$fa-css-prefix}-ul {
5+
padding-left: 0;
6+
margin-left: $fa-li-width;
7+
list-style-type: none;
8+
> li { position: relative; }
9+
}
10+
.#{$fa-css-prefix}-li {
11+
position: absolute;
12+
left: -$fa-li-width;
13+
width: $fa-li-width;
14+
top: (2em / 14);
15+
text-align: center;
16+
&.#{$fa-css-prefix}-lg {
17+
left: -$fa-li-width + (4em / 14);
18+
}
19+
}

‎docs/_sass/vendor/font-awesome/_mixins.scss‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Mixins
2+
// --------------------------
3+
4+
@mixin fa-icon() {
5+
display: inline-block;
6+
font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base} FontAwesome; // shortening font declaration
7+
font-size: inherit; // can't have font-size inherit on line above, so need to override
8+
text-rendering: auto; // optimizelegibility throws things off #1094
9+
-webkit-font-smoothing: antialiased;
10+
-moz-osx-font-smoothing: grayscale;
11+
12+
}
13+
14+
@mixin fa-icon-rotate($degrees, $rotation) {
15+
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation});
16+
-webkit-transform: rotate($degrees);
17+
-ms-transform: rotate($degrees);
18+
transform: rotate($degrees);
19+
}
20+
21+
@mixin fa-icon-flip($horiz, $vert, $rotation) {
22+
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation});
23+
-webkit-transform: scale($horiz, $vert);
24+
-ms-transform: scale($horiz, $vert);
25+
transform: scale($horiz, $vert);
26+
}

‎docs/_sass/vendor/font-awesome/_path.scss‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/* FONT PATH
2+
* -------------------------- */
3+
4+
@font-face {
5+
font-family: 'FontAwesome';
6+
src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}');
7+
src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'),
8+
url('#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}') format('woff2'),
9+
url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'),
10+
url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'),
11+
url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg');
12+
// src: url('#{$fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
13+
font-weight: normal;
14+
font-style: normal;
15+
}

0 commit comments

Comments
 (0)