Page MenuHomePhabricator

D13761.id33236.diff
No OneTemporary

D13761.id33236.diff

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
*/
return array(
'names' => array(
- 'core.pkg.css' => '11d41499',
+ 'core.pkg.css' => '2bb3ba73',
'core.pkg.js' => 'a590b451',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '9451634c',
@@ -112,7 +112,7 @@
'rsrc/css/core/syntax.css' => '9fd11da8',
'rsrc/css/core/z-index.css' => '57ddcaa2',
'rsrc/css/diviner/diviner-shared.css' => '5a337049',
- 'rsrc/css/font/font-awesome.css' => 'e2e712fe',
+ 'rsrc/css/font/font-awesome.css' => 'd2fc4e8d',
'rsrc/css/font/font-lato.css' => '5ab1a46a',
'rsrc/css/font/font-roboto-slab.css' => 'f24a53cb',
'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3',
@@ -159,10 +159,10 @@
'rsrc/css/sprite-menu.css' => '9dd65b92',
'rsrc/css/sprite-projects.css' => 'e5ad842a',
'rsrc/css/sprite-tokens.css' => '4f399012',
- 'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '5fb6fb0e',
- 'rsrc/externals/font/fontawesome/fontawesome-webfont.ttf' => 'a653cb11',
- 'rsrc/externals/font/fontawesome/fontawesome-webfont.woff' => '80526fc8',
- 'rsrc/externals/font/fontawesome/fontawesome-webfont.woff2' => '4924d54d',
+ 'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '7d5a4653',
+ 'rsrc/externals/font/fontawesome/fontawesome-webfont.ttf' => '531835e8',
+ 'rsrc/externals/font/fontawesome/fontawesome-webfont.woff' => '427fe363',
+ 'rsrc/externals/font/fontawesome/fontawesome-webfont.woff2' => 'a9897054',
'rsrc/externals/font/lato/lato-bold.eot' => '99fbcf8c',
'rsrc/externals/font/lato/lato-bold.ttf' => '0a7141f7',
'rsrc/externals/font/lato/lato-bold.woff' => 'f5db2061',
@@ -532,7 +532,7 @@
'diffusion-readme-css' => '2106ea08',
'diffusion-source-css' => '66fdf661',
'diviner-shared-css' => '5a337049',
- 'font-fontawesome' => 'e2e712fe',
+ 'font-fontawesome' => 'd2fc4e8d',
'font-lato' => '5ab1a46a',
'font-roboto-slab' => 'f24a53cb',
'global-drag-and-drop-css' => '697324ad',
diff --git a/src/view/phui/PHUIIconView.php b/src/view/phui/PHUIIconView.php
--- a/src/view/phui/PHUIIconView.php
+++ b/src/view/phui/PHUIIconView.php
@@ -65,11 +65,9 @@
protected function getTagAttributes() {
require_celerity_resource('phui-icon-view-css');
-
$style = null;
$classes = array();
$classes[] = 'phui-icon-view';
-
if ($this->spriteIcon) {
require_celerity_resource('sprite-'.$this->spriteSheet.'-css');
$classes[] = 'sprite-'.$this->spriteSheet;
@@ -88,7 +86,6 @@
}
$style = 'background-image: url('.$this->image.');';
}
-
if ($this->text) {
$classes[] = 'phui-icon-has-text';
$this->appendChild($this->text);
@@ -647,6 +644,88 @@
'fa-train',
'fa-subway',
'fa-medium',
+ 'fa-git',
+ 'fa-y-combinator-square',
+ 'fa-yc-square',
+ 'fa-hacker-news',
+ 'fa-yc',
+ 'fa-y-combinator',
+ 'fa-optin-monster',
+ 'fa-opencart',
+ 'fa-expeditedssl',
+ 'fa-battery-4',
+ 'fa-battery-full',
+ 'fa-battery-3',
+ 'fa-battery-three-quarters',
+ 'fa-battery-2',
+ 'fa-battery-half',
+ 'fa-battery-1',
+ 'fa-battery-quarter',
+ 'fa-battery-0',
+ 'fa-battery-empty',
+ 'fa-mouse-pointer',
+ 'fa-i-cursor',
+ 'fa-object-group',
+ 'fa-object-ungroup',
+ 'fa-sticky-note',
+ 'fa-sticky-note-o',
+ 'fa-cc-jcb',
+ 'fa-cc-diners-club',
+ 'fa-clone',
+ 'fa-balance-scale',
+ 'fa-hourglass-o',
+ 'fa-hourglass-1',
+ 'fa-hourglass-start',
+ 'fa-hourglass-2',
+ 'fa-hourglass-half',
+ 'fa-hourglass-3',
+ 'fa-hourglass-end',
+ 'fa-hourglass',
+ 'fa-hand-grab-o',
+ 'fa-hand-rock-o',
+ 'fa-hand-stop-o',
+ 'fa-hand-paper-o',
+ 'fa-hand-scissors-o',
+ 'fa-hand-lizard-o',
+ 'fa-hand-spock-o',
+ 'fa-hand-pointer-o',
+ 'fa-hand-peace-o',
+ 'fa-trademark',
+ 'fa-registered',
+ 'fa-creative-commons',
+ 'fa-gg',
+ 'fa-gg-circle',
+ 'fa-tripadvisor',
+ 'fa-odnoklassniki',
+ 'fa-odnoklassniki-square',
+ 'fa-get-pocket',
+ 'fa-wikipedia-w',
+ 'fa-safari',
+ 'fa-chrome',
+ 'fa-firefox',
+ 'fa-opera',
+ 'fa-internet-explorer',
+ 'fa-tv',
+ 'fa-television',
+ 'fa-contao',
+ 'fa-500px',
+ 'fa-amazon',
+ 'fa-calendar-plus-o',
+ 'fa-calendar-minus-o',
+ 'fa-calendar-times-o',
+ 'fa-calendar-check-o',
+ 'fa-industry',
+ 'fa-map-pin',
+ 'fa-map-signs',
+ 'fa-map-o',
+ 'fa-map',
+ 'fa-commenting',
+ 'fa-commenting-o',
+ 'fa-houzz',
+ 'fa-vimeo',
+ 'fa-black-tie',
+ 'fa-fonticons',
+
);
}
diff --git a/webroot/rsrc/css/font/font-awesome.css b/webroot/rsrc/css/font/font-awesome.css
--- a/webroot/rsrc/css/font/font-awesome.css
+++ b/webroot/rsrc/css/font/font-awesome.css
@@ -3,15 +3,15 @@
*/
/*!
- * Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome
+ * Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/
/* FONT PATH
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
- src: url('/rsrc/externals/font/fontawesome/fontawesome-webfont.eot?v=4.3.0');
- src: url('/rsrc/externals/font/fontawesome/fontawesome-webfont.eot?#iefix&v=4.3.0') format('embedded-opentype'), url('/rsrc/externals/font/fontawesome/fontawesome-webfont.woff2?v=4.3.0') format('woff2'), url('/rsrc/externals/font/fontawesome/fontawesome-webfont.woff?v=4.3.0') format('woff'), url('/rsrc/externals/font/fontawesome/fontawesome-webfont.ttf?v=4.3.0') format('truetype');
+ src: url('/rsrc/externals/font/fontawesome/fontawesome-webfont.eot?v=4.4.0');
+ src: url('/rsrc/externals/font/fontawesome/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'), url('/rsrc/externals/font/fontawesome/fontawesome-webfont.woff2?v=4.4.0') format('woff2'), url('/rsrc/externals/font/fontawesome/fontawesome-webfont.woff?v=4.4.0') format('woff'), url('/rsrc/externals/font/fontawesome/fontawesome-webfont.ttf?v=4.4.0') format('truetype');
font-weight: normal;
font-style: normal;
}
@@ -40,6 +40,7 @@
width: 1.28571429em;
text-align: center;
}
+
/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
readers do not read off random characters that represent icons */
.fa-glass:before {
@@ -502,6 +503,7 @@
.fa-credit-card:before {
content: "\f09d";
}
+.fa-feed:before,
.fa-rss:before {
content: "\f09e";
}
@@ -1383,6 +1385,8 @@
.fa-git:before {
content: "\f1d3";
}
+.fa-y-combinator-square:before,
+.fa-yc-square:before,
.fa-hacker-news:before {
content: "\f1d4";
}
@@ -1407,7 +1411,6 @@
.fa-history:before {
content: "\f1da";
}
-.fa-genderless:before,
.fa-circle-thin:before {
content: "\f1db";
}
@@ -1612,6 +1615,7 @@
.fa-mercury:before {
content: "\f223";
}
+.fa-intersex:before,
.fa-transgender:before {
content: "\f224";
}
@@ -1639,6 +1643,9 @@
.fa-neuter:before {
content: "\f22c";
}
+.fa-genderless:before {
+ content: "\f22d";
+}
.fa-facebook-official:before {
content: "\f230";
}
@@ -1673,3 +1680,210 @@
.fa-medium:before {
content: "\f23a";
}
+.fa-yc:before,
+.fa-y-combinator:before {
+ content: "\f23b";
+}
+.fa-optin-monster:before {
+ content: "\f23c";
+}
+.fa-opencart:before {
+ content: "\f23d";
+}
+.fa-expeditedssl:before {
+ content: "\f23e";
+}
+.fa-battery-4:before,
+.fa-battery-full:before {
+ content: "\f240";
+}
+.fa-battery-3:before,
+.fa-battery-three-quarters:before {
+ content: "\f241";
+}
+.fa-battery-2:before,
+.fa-battery-half:before {
+ content: "\f242";
+}
+.fa-battery-1:before,
+.fa-battery-quarter:before {
+ content: "\f243";
+}
+.fa-battery-0:before,
+.fa-battery-empty:before {
+ content: "\f244";
+}
+.fa-mouse-pointer:before {
+ content: "\f245";
+}
+.fa-i-cursor:before {
+ content: "\f246";
+}
+.fa-object-group:before {
+ content: "\f247";
+}
+.fa-object-ungroup:before {
+ content: "\f248";
+}
+.fa-sticky-note:before {
+ content: "\f249";
+}
+.fa-sticky-note-o:before {
+ content: "\f24a";
+}
+.fa-cc-jcb:before {
+ content: "\f24b";
+}
+.fa-cc-diners-club:before {
+ content: "\f24c";
+}
+.fa-clone:before {
+ content: "\f24d";
+}
+.fa-balance-scale:before {
+ content: "\f24e";
+}
+.fa-hourglass-o:before {
+ content: "\f250";
+}
+.fa-hourglass-1:before,
+.fa-hourglass-start:before {
+ content: "\f251";
+}
+.fa-hourglass-2:before,
+.fa-hourglass-half:before {
+ content: "\f252";
+}
+.fa-hourglass-3:before,
+.fa-hourglass-end:before {
+ content: "\f253";
+}
+.fa-hourglass:before {
+ content: "\f254";
+}
+.fa-hand-grab-o:before,
+.fa-hand-rock-o:before {
+ content: "\f255";
+}
+.fa-hand-stop-o:before,
+.fa-hand-paper-o:before {
+ content: "\f256";
+}
+.fa-hand-scissors-o:before {
+ content: "\f257";
+}
+.fa-hand-lizard-o:before {
+ content: "\f258";
+}
+.fa-hand-spock-o:before {
+ content: "\f259";
+}
+.fa-hand-pointer-o:before {
+ content: "\f25a";
+}
+.fa-hand-peace-o:before {
+ content: "\f25b";
+}
+.fa-trademark:before {
+ content: "\f25c";
+}
+.fa-registered:before {
+ content: "\f25d";
+}
+.fa-creative-commons:before {
+ content: "\f25e";
+}
+.fa-gg:before {
+ content: "\f260";
+}
+.fa-gg-circle:before {
+ content: "\f261";
+}
+.fa-tripadvisor:before {
+ content: "\f262";
+}
+.fa-odnoklassniki:before {
+ content: "\f263";
+}
+.fa-odnoklassniki-square:before {
+ content: "\f264";
+}
+.fa-get-pocket:before {
+ content: "\f265";
+}
+.fa-wikipedia-w:before {
+ content: "\f266";
+}
+.fa-safari:before {
+ content: "\f267";
+}
+.fa-chrome:before {
+ content: "\f268";
+}
+.fa-firefox:before {
+ content: "\f269";
+}
+.fa-opera:before {
+ content: "\f26a";
+}
+.fa-internet-explorer:before {
+ content: "\f26b";
+}
+.fa-tv:before,
+.fa-television:before {
+ content: "\f26c";
+}
+.fa-contao:before {
+ content: "\f26d";
+}
+.fa-500px:before {
+ content: "\f26e";
+}
+.fa-amazon:before {
+ content: "\f270";
+}
+.fa-calendar-plus-o:before {
+ content: "\f271";
+}
+.fa-calendar-minus-o:before {
+ content: "\f272";
+}
+.fa-calendar-times-o:before {
+ content: "\f273";
+}
+.fa-calendar-check-o:before {
+ content: "\f274";
+}
+.fa-industry:before {
+ content: "\f275";
+}
+.fa-map-pin:before {
+ content: "\f276";
+}
+.fa-map-signs:before {
+ content: "\f277";
+}
+.fa-map-o:before {
+ content: "\f278";
+}
+.fa-map:before {
+ content: "\f279";
+}
+.fa-commenting:before {
+ content: "\f27a";
+}
+.fa-commenting-o:before {
+ content: "\f27b";
+}
+.fa-houzz:before {
+ content: "\f27c";
+}
+.fa-vimeo:before {
+ content: "\f27d";
+}
+.fa-black-tie:before {
+ content: "\f27e";
+}
+.fa-fonticons:before {
+ content: "\f280";
+}
diff --git a/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.eot b/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.eot
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.ttf b/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.ttf
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.woff b/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.woff
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.woff2 b/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.woff2
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 29, 10:07 AM (5 d, 9 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7714520
Default Alt Text
D13761.id33236.diff (11 KB)

Event Timeline