From: Alexander Ebert Date: Sun, 10 Jan 2016 12:32:09 +0000 (+0100) Subject: Upgraded to FontAwesome 4.5.0 X-Git-Tag: 3.0.0_Beta_1~2030^2~161^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6f5624de596bcf9bbae6f347ce8ea4c41af66f67;p=GitHub%2FWoltLab%2FWCF.git Upgraded to FontAwesome 4.5.0 Do we still need all these stupid formats for legacy browsers? --- diff --git a/wcfsetup/install/files/font/FontAwesome.otf b/wcfsetup/install/files/font/FontAwesome.otf index f7936cc1e7..3ed7f8b48a 100644 Binary files a/wcfsetup/install/files/font/FontAwesome.otf and b/wcfsetup/install/files/font/FontAwesome.otf differ diff --git a/wcfsetup/install/files/font/fontawesome-webfont.eot b/wcfsetup/install/files/font/fontawesome-webfont.eot index a30335d748..9b6afaedc0 100755 Binary files a/wcfsetup/install/files/font/fontawesome-webfont.eot and b/wcfsetup/install/files/font/fontawesome-webfont.eot differ diff --git a/wcfsetup/install/files/font/fontawesome-webfont.ttf b/wcfsetup/install/files/font/fontawesome-webfont.ttf index d7994e1308..26dea7951a 100755 Binary files a/wcfsetup/install/files/font/fontawesome-webfont.ttf and b/wcfsetup/install/files/font/fontawesome-webfont.ttf differ diff --git a/wcfsetup/install/files/font/fontawesome-webfont.woff b/wcfsetup/install/files/font/fontawesome-webfont.woff index 6fd4ede0f3..dc35ce3c2c 100755 Binary files a/wcfsetup/install/files/font/fontawesome-webfont.woff and b/wcfsetup/install/files/font/fontawesome-webfont.woff differ diff --git a/wcfsetup/install/files/font/fontawesome-webfont.woff2 b/wcfsetup/install/files/font/fontawesome-webfont.woff2 index 5560193ccc..500e517253 100644 Binary files a/wcfsetup/install/files/font/fontawesome-webfont.woff2 and b/wcfsetup/install/files/font/fontawesome-webfont.woff2 differ diff --git a/wcfsetup/install/files/style/icon/_icons.scss b/wcfsetup/install/files/style/icon/_icons.scss index 62d97677c9..6f9375989a 100644 --- a/wcfsetup/install/files/style/icon/_icons.scss +++ b/wcfsetup/install/files/style/icon/_icons.scss @@ -675,3 +675,23 @@ .#{$fa-css-prefix}-vimeo:before { content: $fa-var-vimeo; } .#{$fa-css-prefix}-black-tie:before { content: $fa-var-black-tie; } .#{$fa-css-prefix}-fonticons:before { content: $fa-var-fonticons; } +.#{$fa-css-prefix}-reddit-alien:before { content: $fa-var-reddit-alien; } +.#{$fa-css-prefix}-edge:before { content: $fa-var-edge; } +.#{$fa-css-prefix}-credit-card-alt:before { content: $fa-var-credit-card-alt; } +.#{$fa-css-prefix}-codiepie:before { content: $fa-var-codiepie; } +.#{$fa-css-prefix}-modx:before { content: $fa-var-modx; } +.#{$fa-css-prefix}-fort-awesome:before { content: $fa-var-fort-awesome; } +.#{$fa-css-prefix}-usb:before { content: $fa-var-usb; } +.#{$fa-css-prefix}-product-hunt:before { content: $fa-var-product-hunt; } +.#{$fa-css-prefix}-mixcloud:before { content: $fa-var-mixcloud; } +.#{$fa-css-prefix}-scribd:before { content: $fa-var-scribd; } +.#{$fa-css-prefix}-pause-circle:before { content: $fa-var-pause-circle; } +.#{$fa-css-prefix}-pause-circle-o:before { content: $fa-var-pause-circle-o; } +.#{$fa-css-prefix}-stop-circle:before { content: $fa-var-stop-circle; } +.#{$fa-css-prefix}-stop-circle-o:before { content: $fa-var-stop-circle-o; } +.#{$fa-css-prefix}-shopping-bag:before { content: $fa-var-shopping-bag; } +.#{$fa-css-prefix}-shopping-basket:before { content: $fa-var-shopping-basket; } +.#{$fa-css-prefix}-hashtag:before { content: $fa-var-hashtag; } +.#{$fa-css-prefix}-bluetooth:before { content: $fa-var-bluetooth; } +.#{$fa-css-prefix}-bluetooth-b:before { content: $fa-var-bluetooth-b; } +.#{$fa-css-prefix}-percent:before { content: $fa-var-percent; } diff --git a/wcfsetup/install/files/style/icon/_variables.scss b/wcfsetup/install/files/style/icon/_variables.scss index c10cd47f73..0a471102c4 100644 --- a/wcfsetup/install/files/style/icon/_variables.scss +++ b/wcfsetup/install/files/style/icon/_variables.scss @@ -4,9 +4,9 @@ $fa-font-path: "../fonts" !default; $fa-font-size-base: 14px !default; $fa-line-height-base: 1 !default; -//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.4.0/fonts" !default; // for referencing Bootstrap CDN font files directly +//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.5.0/fonts" !default; // for referencing Bootstrap CDN font files directly $fa-css-prefix: fa !default; -$fa-version: "4.4.0" !default; +$fa-version: "4.5.0" !default; $fa-border-color: #eee !default; $fa-inverse: #fff !default; $fa-li-width: (30em / 14) !default; @@ -86,6 +86,8 @@ $fa-var-bitbucket: "\f171"; $fa-var-bitbucket-square: "\f172"; $fa-var-bitcoin: "\f15a"; $fa-var-black-tie: "\f27e"; +$fa-var-bluetooth: "\f293"; +$fa-var-bluetooth-b: "\f294"; $fa-var-bold: "\f032"; $fa-var-bolt: "\f0e7"; $fa-var-bomb: "\f1e2"; @@ -164,6 +166,7 @@ $fa-var-cny: "\f157"; $fa-var-code: "\f121"; $fa-var-code-fork: "\f126"; $fa-var-codepen: "\f1cb"; +$fa-var-codiepie: "\f284"; $fa-var-coffee: "\f0f4"; $fa-var-cog: "\f013"; $fa-var-cogs: "\f085"; @@ -182,6 +185,7 @@ $fa-var-copy: "\f0c5"; $fa-var-copyright: "\f1f9"; $fa-var-creative-commons: "\f25e"; $fa-var-credit-card: "\f09d"; +$fa-var-credit-card-alt: "\f283"; $fa-var-crop: "\f125"; $fa-var-crosshairs: "\f05b"; $fa-var-css3: "\f13c"; @@ -204,6 +208,7 @@ $fa-var-download: "\f019"; $fa-var-dribbble: "\f17d"; $fa-var-dropbox: "\f16b"; $fa-var-drupal: "\f1a9"; +$fa-var-edge: "\f282"; $fa-var-edit: "\f044"; $fa-var-eject: "\f052"; $fa-var-ellipsis-h: "\f141"; @@ -273,6 +278,7 @@ $fa-var-folder-open: "\f07c"; $fa-var-folder-open-o: "\f115"; $fa-var-font: "\f031"; $fa-var-fonticons: "\f280"; +$fa-var-fort-awesome: "\f286"; $fa-var-forumbee: "\f211"; $fa-var-forward: "\f04e"; $fa-var-foursquare: "\f180"; @@ -319,6 +325,7 @@ $fa-var-hand-rock-o: "\f255"; $fa-var-hand-scissors-o: "\f257"; $fa-var-hand-spock-o: "\f259"; $fa-var-hand-stop-o: "\f256"; +$fa-var-hashtag: "\f292"; $fa-var-hdd-o: "\f0a0"; $fa-var-header: "\f1dc"; $fa-var-headphones: "\f025"; @@ -418,8 +425,10 @@ $fa-var-minus: "\f068"; $fa-var-minus-circle: "\f056"; $fa-var-minus-square: "\f146"; $fa-var-minus-square-o: "\f147"; +$fa-var-mixcloud: "\f289"; $fa-var-mobile: "\f10b"; $fa-var-mobile-phone: "\f10b"; +$fa-var-modx: "\f285"; $fa-var-money: "\f0d6"; $fa-var-moon-o: "\f186"; $fa-var-mortar-board: "\f19d"; @@ -446,11 +455,14 @@ $fa-var-paperclip: "\f0c6"; $fa-var-paragraph: "\f1dd"; $fa-var-paste: "\f0ea"; $fa-var-pause: "\f04c"; +$fa-var-pause-circle: "\f28b"; +$fa-var-pause-circle-o: "\f28c"; $fa-var-paw: "\f1b0"; $fa-var-paypal: "\f1ed"; $fa-var-pencil: "\f040"; $fa-var-pencil-square: "\f14b"; $fa-var-pencil-square-o: "\f044"; +$fa-var-percent: "\f295"; $fa-var-phone: "\f095"; $fa-var-phone-square: "\f098"; $fa-var-photo: "\f03e"; @@ -472,6 +484,7 @@ $fa-var-plus-square: "\f0fe"; $fa-var-plus-square-o: "\f196"; $fa-var-power-off: "\f011"; $fa-var-print: "\f02f"; +$fa-var-product-hunt: "\f288"; $fa-var-puzzle-piece: "\f12e"; $fa-var-qq: "\f1d6"; $fa-var-qrcode: "\f029"; @@ -484,6 +497,7 @@ $fa-var-random: "\f074"; $fa-var-rebel: "\f1d0"; $fa-var-recycle: "\f1b8"; $fa-var-reddit: "\f1a1"; +$fa-var-reddit-alien: "\f281"; $fa-var-reddit-square: "\f1a2"; $fa-var-refresh: "\f021"; $fa-var-registered: "\f25d"; @@ -508,6 +522,7 @@ $fa-var-rupee: "\f156"; $fa-var-safari: "\f267"; $fa-var-save: "\f0c7"; $fa-var-scissors: "\f0c4"; +$fa-var-scribd: "\f28a"; $fa-var-search: "\f002"; $fa-var-search-minus: "\f010"; $fa-var-search-plus: "\f00e"; @@ -525,6 +540,8 @@ $fa-var-sheqel: "\f20b"; $fa-var-shield: "\f132"; $fa-var-ship: "\f21a"; $fa-var-shirtsinbulk: "\f214"; +$fa-var-shopping-bag: "\f290"; +$fa-var-shopping-basket: "\f291"; $fa-var-shopping-cart: "\f07a"; $fa-var-sign-in: "\f090"; $fa-var-sign-out: "\f08b"; @@ -572,6 +589,8 @@ $fa-var-stethoscope: "\f0f1"; $fa-var-sticky-note: "\f249"; $fa-var-sticky-note-o: "\f24a"; $fa-var-stop: "\f04d"; +$fa-var-stop-circle: "\f28d"; +$fa-var-stop-circle-o: "\f28e"; $fa-var-street-view: "\f21d"; $fa-var-strikethrough: "\f0cc"; $fa-var-stumbleupon: "\f1a4"; @@ -642,6 +661,7 @@ $fa-var-unlock: "\f09c"; $fa-var-unlock-alt: "\f13e"; $fa-var-unsorted: "\f0dc"; $fa-var-upload: "\f093"; +$fa-var-usb: "\f287"; $fa-var-usd: "\f155"; $fa-var-user: "\f007"; $fa-var-user-md: "\f0f0"; diff --git a/wcfsetup/install/files/style/icon/icon.scss b/wcfsetup/install/files/style/icon/icon.scss index 6309bd1ed4..dd4ea36b94 100644 --- a/wcfsetup/install/files/style/icon/icon.scss +++ b/wcfsetup/install/files/style/icon/icon.scss @@ -1,11 +1,11 @@ /* do NOT reference fonts directly, always make use of 'getFont.php' */ @font-face { font-family: 'FontAwesome'; - src: url('../font/getFont.php?type=eot&v=4.4.0'); - src: url('../font/getFont.php?type=eot&v=4.4.0#iefix') format('embedded-opentype'), - url('../font/getFont.php?type=woff2&v=4.4.0') format('woff2'), - url('../font/getFont.php?type=woff&v=4.4.0') format('woff'), - url('../font/getFont.php?type=ttf&v=4.4.0') format('truetype'); + src: url('../font/getFont.php?type=eot&v=4.5.0'); + src: url('../font/getFont.php?type=eot&v=4.5.0#iefix') format('embedded-opentype'), + url('../font/getFont.php?type=woff2&v=4.5.0') format('woff2'), + url('../font/getFont.php?type=woff&v=4.5.0') format('woff'), + url('../font/getFont.php?type=ttf&v=4.5.0') format('truetype'); font-weight: normal; font-style: normal; }