Skip to content

Commit 503243e

Browse files
authored
Merge pull request #92 from acjh/patch-4
Upgrade font-awesome library from 4.6.3 to 4.7.0
2 parents f68f708 + a813518 commit 503243e

File tree

18 files changed

+3050
-702
lines changed

18 files changed

+3050
-702
lines changed

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"toastr": "^2.1.2",
88
"sweetalert": "^1.1.3",
99
"famfamfam-flags": "^1.0.0",
10-
"font-awesome": "^4.6.3",
10+
"font-awesome": "^4.7.0",
1111
"json2": "*",
1212
"moment": "^2.14.1",
1313
"moment-timezone": "^0.5.5",

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/font-awesome/.bower.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
"Gemfile.lock",
2424
"*.md"
2525
],
26-
"version": "4.6.3",
27-
"_release": "4.6.3",
26+
"version": "4.7.0",
27+
"_release": "4.7.0",
2828
"_resolution": {
2929
"type": "version",
30-
"tag": "v4.6.3",
30+
"tag": "v4.7.0",
3131
"commit": "0f618911b105195c931ec5d5bef425a2a2806cab"
3232
},
3333
"_source": "https://github.com/FortAwesome/Font-Awesome.git",
34-
"_target": "^4.6.3",
34+
"_target": "^4.7.0",
3535
"_originalSource": "font-awesome",
3636
"_direct": true
3737
}

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/font-awesome/css/font-awesome.css

Lines changed: 141 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/*!
2-
* Font Awesome 4.6.3 by @davegandy - http://fontawesome.io - @fontawesome
2+
* Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
33
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
44
*/
55
/* FONT PATH
66
* -------------------------- */
77
@font-face {
88
font-family: 'FontAwesome';
9-
src: url('../fonts/fontawesome-webfont.eot?v=4.6.3');
10-
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.6.3') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.6.3') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.6.3') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.6.3') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.6.3#fontawesomeregular') format('svg');
9+
src: url('../fonts/fontawesome-webfont.eot?v=4.7.0');
10+
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');
1111
font-weight: normal;
1212
font-style: normal;
1313
}
@@ -1832,6 +1832,7 @@
18321832
content: "\f23e";
18331833
}
18341834
.fa-battery-4:before,
1835+
.fa-battery:before,
18351836
.fa-battery-full:before {
18361837
content: "\f240";
18371838
}
@@ -2178,6 +2179,143 @@
21782179
.fa-font-awesome:before {
21792180
content: "\f2b4";
21802181
}
2182+
.fa-handshake-o:before {
2183+
content: "\f2b5";
2184+
}
2185+
.fa-envelope-open:before {
2186+
content: "\f2b6";
2187+
}
2188+
.fa-envelope-open-o:before {
2189+
content: "\f2b7";
2190+
}
2191+
.fa-linode:before {
2192+
content: "\f2b8";
2193+
}
2194+
.fa-address-book:before {
2195+
content: "\f2b9";
2196+
}
2197+
.fa-address-book-o:before {
2198+
content: "\f2ba";
2199+
}
2200+
.fa-vcard:before,
2201+
.fa-address-card:before {
2202+
content: "\f2bb";
2203+
}
2204+
.fa-vcard-o:before,
2205+
.fa-address-card-o:before {
2206+
content: "\f2bc";
2207+
}
2208+
.fa-user-circle:before {
2209+
content: "\f2bd";
2210+
}
2211+
.fa-user-circle-o:before {
2212+
content: "\f2be";
2213+
}
2214+
.fa-user-o:before {
2215+
content: "\f2c0";
2216+
}
2217+
.fa-id-badge:before {
2218+
content: "\f2c1";
2219+
}
2220+
.fa-drivers-license:before,
2221+
.fa-id-card:before {
2222+
content: "\f2c2";
2223+
}
2224+
.fa-drivers-license-o:before,
2225+
.fa-id-card-o:before {
2226+
content: "\f2c3";
2227+
}
2228+
.fa-quora:before {
2229+
content: "\f2c4";
2230+
}
2231+
.fa-free-code-camp:before {
2232+
content: "\f2c5";
2233+
}
2234+
.fa-telegram:before {
2235+
content: "\f2c6";
2236+
}
2237+
.fa-thermometer-4:before,
2238+
.fa-thermometer:before,
2239+
.fa-thermometer-full:before {
2240+
content: "\f2c7";
2241+
}
2242+
.fa-thermometer-3:before,
2243+
.fa-thermometer-three-quarters:before {
2244+
content: "\f2c8";
2245+
}
2246+
.fa-thermometer-2:before,
2247+
.fa-thermometer-half:before {
2248+
content: "\f2c9";
2249+
}
2250+
.fa-thermometer-1:before,
2251+
.fa-thermometer-quarter:before {
2252+
content: "\f2ca";
2253+
}
2254+
.fa-thermometer-0:before,
2255+
.fa-thermometer-empty:before {
2256+
content: "\f2cb";
2257+
}
2258+
.fa-shower:before {
2259+
content: "\f2cc";
2260+
}
2261+
.fa-bathtub:before,
2262+
.fa-s15:before,
2263+
.fa-bath:before {
2264+
content: "\f2cd";
2265+
}
2266+
.fa-podcast:before {
2267+
content: "\f2ce";
2268+
}
2269+
.fa-window-maximize:before {
2270+
content: "\f2d0";
2271+
}
2272+
.fa-window-minimize:before {
2273+
content: "\f2d1";
2274+
}
2275+
.fa-window-restore:before {
2276+
content: "\f2d2";
2277+
}
2278+
.fa-times-rectangle:before,
2279+
.fa-window-close:before {
2280+
content: "\f2d3";
2281+
}
2282+
.fa-times-rectangle-o:before,
2283+
.fa-window-close-o:before {
2284+
content: "\f2d4";
2285+
}
2286+
.fa-bandcamp:before {
2287+
content: "\f2d5";
2288+
}
2289+
.fa-grav:before {
2290+
content: "\f2d6";
2291+
}
2292+
.fa-etsy:before {
2293+
content: "\f2d7";
2294+
}
2295+
.fa-imdb:before {
2296+
content: "\f2d8";
2297+
}
2298+
.fa-ravelry:before {
2299+
content: "\f2d9";
2300+
}
2301+
.fa-eercast:before {
2302+
content: "\f2da";
2303+
}
2304+
.fa-microchip:before {
2305+
content: "\f2db";
2306+
}
2307+
.fa-snowflake-o:before {
2308+
content: "\f2dc";
2309+
}
2310+
.fa-superpowers:before {
2311+
content: "\f2dd";
2312+
}
2313+
.fa-wpexplorer:before {
2314+
content: "\f2de";
2315+
}
2316+
.fa-meetup:before {
2317+
content: "\f2e0";
2318+
}
21812319
.sr-only {
21822320
position: absolute;
21832321
width: 1px;

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/font-awesome/css/font-awesome.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.svg

Lines changed: 2668 additions & 682 deletions
Loading

0 commit comments

Comments
 (0)