Page MenuHomePhabricator
Files F15387811

D8798.id.diff
No OneTemporary
Actions

D8798.id.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -109,13 +109,14 @@
'rsrc/css/application/slowvote/slowvote.css' => '266df6a1',
'rsrc/css/application/subscriptions/subscribers-list.css' => '5bb30c78',
'rsrc/css/application/tokens/tokens.css' => '5f7bca25',
- 'rsrc/css/application/uiexample/example.css' => '4741b891',
+ 'rsrc/css/application/uiexample/example.css' => 'aa291bae',
'rsrc/css/core/core.css' => 'da26ddb2',
'rsrc/css/core/remarkup.css' => '0923dbd6',
'rsrc/css/core/syntax.css' => '3c18c1cb',
'rsrc/css/core/z-index.css' => '0d89d53c',
'rsrc/css/diviner/diviner-shared.css' => '38813222',
- 'rsrc/css/font/font-source-sans-pro.css' => '225851dd',
+ 'rsrc/css/font/font-glyphicons-halflings.css' => '87018f55',
+ 'rsrc/css/font/font-source-sans-pro.css' => '91d53463',
'rsrc/css/layout/phabricator-action-header-view.css' => 'c14dfc57',
'rsrc/css/layout/phabricator-action-list-view.css' => '81383e25',
'rsrc/css/layout/phabricator-crumbs-view.css' => '2d9db584',
@@ -167,8 +168,11 @@
'rsrc/css/sprite-projects.css' => '7578fa56',
'rsrc/css/sprite-status.css' => '8bce1c97',
'rsrc/css/sprite-tokens.css' => '1706b943',
- 'rsrc/externals/font/SourceSansPro.woff' => '44e50175',
- 'rsrc/externals/font/SourceSansProBold.woff' => '8799f025',
+ 'rsrc/externals/font/glyphicons/glyphicons-halflings-regular.eot' => '282d455e',
+ 'rsrc/externals/font/glyphicons/glyphicons-halflings-regular.ttf' => 'b7c56991',
+ 'rsrc/externals/font/glyphicons/glyphicons-halflings-regular.woff' => 'bac768cd',
+ 'rsrc/externals/font/sourcesans/SourceSansPro.woff' => '3614608c',
+ 'rsrc/externals/font/sourcesans/SourceSansProBold.woff' => 'cbf46566',
'rsrc/externals/javelin/core/Event.js' => '79473b62',
'rsrc/externals/javelin/core/Stratcom.js' => 'c293f7b9',
'rsrc/externals/javelin/core/__tests__/event-stop-and-kill.js' => '717554e4',
@@ -518,7 +522,8 @@
'diffusion-icons-css' => '384a0f7d',
'diffusion-source-css' => '66fdf661',
'diviner-shared-css' => '38813222',
- 'font-source-sans-pro' => '225851dd',
+ 'font-glyphicons-halflings' => '87018f55',
+ 'font-source-sans-pro' => '91d53463',
'global-drag-and-drop-css' => '697324ad',
'harbormaster-css' => 'cec833b7',
'herald-css' => '59d48f01',
@@ -718,7 +723,7 @@
'phabricator-textareautils' => 'b3ec3cfc',
'phabricator-tooltip' => '3915d490',
'phabricator-transaction-view-css' => 'ce491938',
- 'phabricator-ui-example-css' => '4741b891',
+ 'phabricator-ui-example-css' => 'aa291bae',
'phabricator-uiexample-javelin-view' => 'd4a14807',
'phabricator-uiexample-reactor-button' => '44524435',
'phabricator-uiexample-reactor-checkbox' => '7ba325ee',
diff --git a/src/applications/uiexample/examples/PHUIIconExample.php b/src/applications/uiexample/examples/PHUIIconExample.php
--- a/src/applications/uiexample/examples/PHUIIconExample.php
+++ b/src/applications/uiexample/examples/PHUIIconExample.php
@@ -10,8 +10,246 @@
return 'Easily render icons or images with links and sprites.';
}
+ private function listHalflings() {
+ return array (
+ 'glass',
+ 'music',
+ 'search',
+ 'envelope',
+ 'heart',
+ 'star',
+ 'star-empty',
+ 'user',
+ 'film',
+ 'th-large',
+ 'th',
+ 'th-list',
+ 'ok',
+ 'remove',
+ 'zoom-in',
+ 'zoom-out',
+ 'off',
+ 'signal',
+ 'cog',
+ 'trash',
+ 'home',
+ 'file',
+ 'time',
+ 'road',
+ 'download-alt',
+ 'download',
+ 'upload',
+ 'inbox',
+ 'play-circle',
+ 'repeat',
+ 'refresh',
+ 'list-alt',
+ 'lock',
+ 'flag',
+ 'headphones',
+ 'volume-off',
+ 'volume-down',
+ 'volume-up',
+ 'qrcode',
+ 'barcode',
+ 'tag',
+ 'tags',
+ 'book',
+ 'bookmark',
+ 'print',
+ 'camera',
+ 'font',
+ 'bold',
+ 'italic',
+ 'text-height',
+ 'text-width',
+ 'align-left',
+ 'align-center',
+ 'align-right',
+ 'align-justify',
+ 'list',
+ 'indent-left',
+ 'indent-right',
+ 'facetime-video',
+ 'picture',
+ 'pencil',
+ 'map-marker',
+ 'adjust',
+ 'tint',
+ 'edit',
+ 'share',
+ 'check',
+ 'move',
+ 'step-backward',
+ 'fast-backward',
+ 'backward',
+ 'play',
+ 'pause',
+ 'stop',
+ 'forward',
+ 'fast-forward',
+ 'step-forward',
+ 'eject',
+ 'chevron-left',
+ 'chevron-right',
+ 'plus-sign',
+ 'minus-sign',
+ 'remove-sign',
+ 'ok-sign',
+ 'question-sign',
+ 'info-sign',
+ 'screenshot',
+ 'remove-circle',
+ 'ok-circle',
+ 'ban-circle',
+ 'arrow-left',
+ 'arrow-right',
+ 'arrow-up',
+ 'arrow-down',
+ 'share-alt',
+ 'resize-full',
+ 'resize-small',
+ 'plus',
+ 'minus',
+ 'asterisk',
+ 'exclamation-sign',
+ 'gift',
+ 'leaf',
+ 'fire',
+ 'eye-open',
+ 'eye-close',
+ 'warning-sign',
+ 'plane',
+ 'calendar',
+ 'random',
+ 'comments',
+ 'magnet',
+ 'chevron-up',
+ 'chevron-down',
+ 'retweet',
+ 'shopping-cart',
+ 'folder-close',
+ 'folder-open',
+ 'resize-vertical',
+ 'resize-horizontal',
+ 'hdd',
+ 'bullhorn',
+ 'bell',
+ 'certificate',
+ 'thumbs-up',
+ 'thumbs-down',
+ 'hand-right',
+ 'hand-left',
+ 'hand-top',
+ 'hand-down',
+ 'circle-arrow-right',
+ 'circle-arrow-left',
+ 'circle-arrow-top',
+ 'circle-arrow-down',
+ 'globe',
+ 'wrench',
+ 'tasks',
+ 'filter',
+ 'briefcase',
+ 'fullscreen',
+ 'dashboard',
+ 'paperclip',
+ 'heart-empty',
+ 'link',
+ 'phone',
+ 'pushpin',
+ 'euro',
+ 'usd',
+ 'gbp',
+ 'sort',
+ 'sort-by-alphabet',
+ 'sort-by-alphabet-alt',
+ 'sort-by-order',
+ 'sort-by-order-alt',
+ 'sort-by-attributes',
+ 'sort-by-attributes-alt',
+ 'unchecked',
+ 'expand',
+ 'collapse',
+ 'collapse-top',
+ 'log_in',
+ 'flash',
+ 'log_out',
+ 'new_window',
+ 'record',
+ 'save',
+ 'open',
+ 'saved',
+ 'import',
+ 'export',
+ 'send',
+ 'floppy_disk',
+ 'floppy_saved',
+ 'floppy_remove',
+ 'floppy_save',
+ 'floppy_open',
+ 'credit_card',
+ 'transfer',
+ 'cutlery',
+ 'header',
+ 'compressed',
+ 'earphone',
+ 'phone_alt',
+ 'tower',
+ 'stats',
+ 'sd_video',
+ 'hd_video',
+ 'subtitles',
+ 'sound_stereo',
+ 'sound_dolby',
+ 'sound_5_1',
+ 'sound_6_1',
+ 'sound_7_1',
+ 'copyright_mark',
+ 'registration_mark',
+ 'cloud',
+ 'cloud_download',
+ 'cloud_upload',
+ 'tree_conifer',
+ 'tree_deciduous',
+ );
+ }
+
+ private function listColors() {
+ return array(
+ null,
+ 'bluegrey',
+ 'white',
+ 'red',
+ 'orange',
+ 'yellow',
+ 'green',
+ 'blue',
+ 'sky',
+ 'indigo',
+ 'violet',
+ );
+ }
+
public function renderExample() {
+ $colors = $this->listColors();
+ $glyphs = $this->listHalflings();
+ $gicons = array();
+ foreach ($glyphs as $glyph) {
+ $gicons[] = id(new PHUIIconView())
+ ->addClass('phui-halfling-name')
+ ->setHalfling($glyph)
+ ->appendChild($glyph);
+ }
+ $cicons = array();
+ foreach ($colors as $color) {
+ $cicons[] = id(new PHUIIconView())
+ ->addClass('phui-halfling-color')
+ ->setHalfling('tag', $color)
+ ->appendChild(pht('tag %s', $color));
+ }
+
$person1 = new PHUIIconView();
$person1->setHeadSize(PHUIIconView::HEAD_MEDIUM);
$person1->setHref('http://en.wikipedia.org/wiki/George_Washington');
@@ -114,88 +352,65 @@
->addClass(PHUI::MARGIN_SMALL_RIGHT);
}
- $layout1 =
- array(
- id(new PHUIBoxView())
- ->appendChild($actionview)
- ->addMargin(PHUI::MARGIN_MEDIUM)
- ->addPadding(PHUI::PADDING_SMALL)
- ->setBorder(true));
-
- $layout2 =
- array(
- id(new PHUIBoxView())
- ->appendChild(array($person1, $person2, $person3))
- ->addMargin(PHUI::MARGIN_MEDIUM)
- ->addPadding(PHUI::PADDING_SMALL)
- ->setBorder(true));
-
- $layout2a =
- array(
- id(new PHUIBoxView())
- ->appendChild(array($person4, $person5, $person6))
- ->addMargin(PHUI::MARGIN_MEDIUM)
- ->addPadding(PHUI::PADDING_SMALL)
- ->setBorder(true));
-
- $layout3 =
- array(
- id(new PHUIBoxView())
- ->appendChild($tokenview)
- ->addMargin(PHUI::MARGIN_MEDIUM)
- ->addPadding(PHUI::PADDING_SMALL)
- ->setBorder(true));
-
- $layout4 =
- array(
- id(new PHUIBoxView())
- ->appendChild(array($card1, $card2, $card3, $card4, $card5))
- ->addMargin(PHUI::MARGIN_MEDIUM)
- ->addPadding(PHUI::PADDING_MEDIUM)
- ->setBorder(true));
-
- $layout5 =
- array(
- id(new PHUIBoxView())
- ->appendChild($loginview)
- ->addMargin(PHUI::MARGIN_MEDIUM)
- ->addPadding(PHUI::PADDING_MEDIUM)
- ->setBorder(true));
-
- $head1 = id(new PHUIHeaderView())
- ->setHeader(pht('Action Icons!'));
-
- $head2 = id(new PHUIHeaderView())
- ->setHeader(pht('People!'));
-
- $head3 = id(new PHUIHeaderView())
- ->setHeader(pht('Tokens'));
-
- $head4 = id(new PHUIHeaderView())
- ->setHeader(pht('Payments'));
-
- $head5 = id(new PHUIHeaderView())
- ->setHeader(pht('Authentication'));
-
- $wrap1 = id(new PHUIBoxView())
- ->appendChild($layout1)
+ $layout_gicons = id(new PHUIBoxView())
+ ->appendChild($gicons)
->addMargin(PHUI::MARGIN_LARGE);
- $wrap2 = id(new PHUIBoxView())
- ->appendChild(array($layout2, $layout2a))
+ $layout_cicons = id(new PHUIBoxView())
+ ->appendChild($cicons)
->addMargin(PHUI::MARGIN_LARGE);
- $wrap3 = id(new PHUIBoxView())
- ->appendChild($layout3)
- ->addMargin(PHUI::MARGIN_LARGE);
+ $layout1 = id(new PHUIBoxView())
+ ->appendChild($actionview)
+ ->addMargin(PHUI::MARGIN_MEDIUM);
- $wrap4 = id(new PHUIBoxView())
- ->appendChild($layout4)
- ->addMargin(PHUI::MARGIN_LARGE);
+ $layout2 = id(new PHUIBoxView())
+ ->appendChild(array($person1, $person2, $person3))
+ ->addMargin(PHUI::MARGIN_MEDIUM);
- $wrap5 = id(new PHUIBoxView())
- ->appendChild($layout5)
- ->addMargin(PHUI::MARGIN_LARGE);
+ $layout2a = id(new PHUIBoxView())
+ ->appendChild(array($person4, $person5, $person6))
+ ->addMargin(PHUI::MARGIN_MEDIUM);
+
+ $layout3 = id(new PHUIBoxView())
+ ->appendChild($tokenview)
+ ->addMargin(PHUI::MARGIN_MEDIUM);
+
+ $layout4 = id(new PHUIBoxView())
+ ->appendChild(array($card1, $card2, $card3, $card4, $card5))
+ ->addMargin(PHUI::MARGIN_MEDIUM);
+
+ $layout5 = id(new PHUIBoxView())
+ ->appendChild($loginview)
+ ->addMargin(PHUI::MARGIN_MEDIUM);
+
+ $halflings = id(new PHUIObjectBoxView())
+ ->setHeaderText(pht('Glyphicon Halflings'))
+ ->appendChild($layout_gicons);
+
+ $halflings_color = id(new PHUIObjectBoxView())
+ ->setHeaderText(pht('Halflings Colors'))
+ ->appendChild($layout_cicons);
+
+ $wrap1 = id(new PHUIObjectBoxView())
+ ->setHeaderText(pht('Action Icons!'))
+ ->appendChild($layout1);
+
+ $wrap2 = id(new PHUIObjectBoxView())
+ ->setHeaderText(pht('People!'))
+ ->appendChild(array($layout2, $layout2a));
+
+ $wrap3 = id(new PHUIObjectBoxView())
+ ->setHeaderText(pht('Tokens'))
+ ->appendChild($layout3);
+
+ $wrap4 = id(new PHUIObjectBoxView())
+ ->setHeaderText(pht('Payments'))
+ ->appendChild($layout4);
+
+ $wrap5 = id(new PHUIObjectBoxView())
+ ->setHeaderText(pht('Authentication'))
+ ->appendChild($layout5);
return phutil_tag(
'div',
@@ -203,15 +418,12 @@
'class' => 'phui-icon-example',
),
array(
- $head1,
+ $halflings,
+ $halflings_color,
$wrap1,
- $head2,
$wrap2,
- $head3,
$wrap3,
- $head4,
$wrap4,
- $head5,
$wrap5
));
}
diff --git a/src/infrastructure/celerity/CelerityResourceController.php b/src/infrastructure/celerity/CelerityResourceController.php
--- a/src/infrastructure/celerity/CelerityResourceController.php
+++ b/src/infrastructure/celerity/CelerityResourceController.php
@@ -93,6 +93,8 @@
'jpg' => 'image/jpeg',
'swf' => 'application/x-shockwave-flash',
'woff' => 'font/woff',
+ 'eot' => 'font/eot',
+ 'ttf' => 'font/ttf',
);
}
diff --git a/src/infrastructure/celerity/resources/CelerityResourcesOnDisk.php b/src/infrastructure/celerity/resources/CelerityResourcesOnDisk.php
--- a/src/infrastructure/celerity/resources/CelerityResourcesOnDisk.php
+++ b/src/infrastructure/celerity/resources/CelerityResourcesOnDisk.php
@@ -34,6 +34,8 @@
'gif',
'swf',
'woff',
+ 'ttf',
+ 'eot',
);
}
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
@@ -19,8 +19,11 @@
private $href = null;
private $image;
private $headSize = null;
+
private $spriteIcon;
private $spriteSheet;
+ private $halfling;
+ private $halflingColor;
public function setHref($href) {
$this->href = $href;
@@ -47,6 +50,12 @@
return $this;
}
+ public function setHalfling($hf, $color=null) {
+ $this->halfling = $hf;
+ $this->halflingColor = $color;
+ return $this;
+ }
+
public function getTagName() {
$tag = 'span';
if ($this->href) {
@@ -66,6 +75,13 @@
require_celerity_resource('sprite-'.$this->spriteSheet.'-css');
$classes[] = 'sprite-'.$this->spriteSheet;
$classes[] = $this->spriteSheet.'-'.$this->spriteIcon;
+ } elseif ($this->halfling) {
+ require_celerity_resource('font-glyphicons-halflings');
+ $classes[] = 'halflings';
+ $classes[] = $this->halfling;
+ if ($this->halflingColor) {
+ $classes[] = $this->halflingColor;
+ }
} else {
if ($this->headSize) {
$classes[] = $this->headSize;
diff --git a/webroot/rsrc/css/application/uiexample/example.css b/webroot/rsrc/css/application/uiexample/example.css
--- a/webroot/rsrc/css/application/uiexample/example.css
+++ b/webroot/rsrc/css/application/uiexample/example.css
@@ -39,9 +39,21 @@
}
.jxui-blue-background {
- background: blue;
+ background: {$blue};
}
.jxui-red-border {
- border-color: red;
+ border-color: {$red};
+}
+
+.phui-icon-view.phui-halfling-name {
+ display: inline-block;
+ width: 140px;
+ padding-bottom: 8px;
+ white-space: nowrap;
+}
+
+.phui-icon-view.phui-halfling-color {
+ display: block;
+ padding-bottom: 8px;
}
diff --git a/webroot/rsrc/css/font/font-glyphicons-halflings.css b/webroot/rsrc/css/font/font-glyphicons-halflings.css
new file mode 100644
--- /dev/null
+++ b/webroot/rsrc/css/font/font-glyphicons-halflings.css
@@ -0,0 +1,666 @@
+/**
+ * @provides font-glyphicons-halflings
+ */
+@font-face {
+ font-family: 'Glyphicons Halflings Regular';
+ src: url('/rsrc/externals/font/glyphicons/glyphicons-halflings-regular.eot');
+ src: url('/rsrc/externals/font/glyphicons/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('/rsrc/externals/font/glyphicons/glyphicons-halflings-regular.woff') format('woff'), url('/rsrc/externals/font/glyphicons/glyphicons-halflings-regular.ttf') format('truetype');
+ font-weight: normal;
+ font-style: normal;
+}
+.phui-icon-view.halflings {
+ display: inline-block;
+ position: relative;
+ padding-left: 20px;
+ color: {$darkgreytext};
+ text-decoration: none;
+ *display: inline;
+ *zoom: 1;
+ vertical-align: middle;
+}
+.phui-icon-view.halflings:before {
+ position: absolute;
+ left: 0;
+ top: 0;
+ display: inline-block;
+ margin: 0 5px 0 0;
+ font: 12px/1em 'Glyphicons Halflings Regular';
+ font-style: normal;
+ font-weight: normal;
+ color: {$darkgreytext};
+ *display: inline;
+ *zoom: 1;
+ vertical-align: middle;
+ text-transform: none;
+ -webkit-font-smoothing: antialiased;
+}
+.halflings.bluegrey:before {
+ color: #7787a6;
+}
+.halflings.white:before {
+ color: #fff;
+}
+.halflings.red:before {
+ color: {$red};
+}
+.halflings.orange:before {
+ color: {$orange};
+}
+.halflings.yellow:before {
+ color: {$yellow};
+}
+.halflings.green:before {
+ color: {$green}
+}
+.halflings.blue:before {
+ color: {$blue};
+}
+.halflings.sky:before {
+ color: {$sky};
+}
+.halflings.indigo:before {
+ color: {$indigo};
+}
+.halflings.violet:before {
+ color: {$violet};
+}
+.halflings.glass:before {
+ content: "\E001";
+}
+.halflings.music:before {
+ content: "\E002";
+}
+.halflings.search:before {
+ content: "\E003";
+}
+.halflings.envelope:before {
+ content: "\2709";
+}
+.halflings.heart:before {
+ content: "\E005";
+}
+.halflings.star:before {
+ content: "\E006";
+}
+.halflings.star-empty:before {
+ content: "\E007";
+}
+.halflings.user:before {
+ content: "\E008";
+}
+.halflings.film:before {
+ content: "\E009";
+}
+.halflings.th-large:before {
+ content: "\E010";
+}
+.halflings.th:before {
+ content: "\E011";
+}
+.halflings.th-list:before {
+ content: "\E012";
+}
+.halflings.ok:before {
+ content: "\E013";
+}
+.halflings.remove:before {
+ content: "\E014";
+}
+.halflings.zoom-in:before {
+ content: "\E015";
+}
+.halflings.zoom-out:before {
+ content: "\E016";
+}
+.halflings.off:before {
+ content: "\E017";
+}
+.halflings.signal:before {
+ content: "\E018";
+}
+.halflings.cog:before {
+ content: "\E019";
+}
+.halflings.trash:before {
+ content: "\E020";
+}
+.halflings.home:before {
+ content: "\E021";
+}
+.halflings.file:before {
+ content: "\E022";
+}
+.halflings.time:before {
+ content: "\E023";
+}
+.halflings.road:before {
+ content: "\E024";
+}
+.halflings.download-alt:before {
+ content: "\E025";
+}
+.halflings.download:before {
+ content: "\E026";
+}
+.halflings.upload:before {
+ content: "\E027";
+}
+.halflings.inbox:before {
+ content: "\E028";
+}
+.halflings.play-circle:before {
+ content: "\E029";
+}
+.halflings.repeat:before {
+ content: "\E030";
+}
+.halflings.refresh:before {
+ content: "\E031";
+}
+.halflings.list-alt:before {
+ content: "\E032";
+}
+.halflings.lock:before {
+ content: "\1F512";
+}
+.halflings.flag:before {
+ content: "\E034";
+}
+.halflings.headphones:before {
+ content: "\E035";
+}
+.halflings.volume-off:before {
+ content: "\E036";
+}
+.halflings.volume-down:before {
+ content: "\E037";
+}
+.halflings.volume-up:before {
+ content: "\E038";
+}
+.halflings.qrcode:before {
+ content: "\E039";
+}
+.halflings.barcode:before {
+ content: "\E040";
+}
+.halflings.tag:before {
+ content: "\E041";
+}
+.halflings.tags:before {
+ content: "\E042";
+}
+.halflings.book:before {
+ content: "\E043";
+}
+.halflings.bookmark:before {
+ content: "\1F516";
+}
+.halflings.print:before {
+ content: "\E045";
+}
+.halflings.camera:before {
+ content: "\1F4F7";
+}
+.halflings.font:before {
+ content: "\E047";
+}
+.halflings.bold:before {
+ content: "\E048";
+}
+.halflings.italic:before {
+ content: "\E049";
+}
+.halflings.text-height:before {
+ content: "\E050";
+}
+.halflings.text-width:before {
+ content: "\E051";
+}
+.halflings.align-left:before {
+ content: "\E052";
+}
+.halflings.align-center:before {
+ content: "\E053";
+}
+.halflings.align-right:before {
+ content: "\E054";
+}
+.halflings.align-justify:before {
+ content: "\E055";
+}
+.halflings.list:before {
+ content: "\E056";
+}
+.halflings.indent-left:before {
+ content: "\E057";
+}
+.halflings.indent-right:before {
+ content: "\E058";
+}
+.halflings.facetime-video:before {
+ content: "\E059";
+}
+.halflings.picture:before {
+ content: "\E060";
+}
+.halflings.pencil:before {
+ content: "\270F";
+}
+.halflings.map-marker:before {
+ content: "\E062";
+}
+.halflings.adjust:before {
+ content: "\E063";
+}
+.halflings.tint:before {
+ content: "\E064";
+}
+.halflings.edit:before {
+ content: "\E065";
+}
+.halflings.share:before {
+ content: "\E066";
+}
+.halflings.check:before {
+ content: "\E067";
+}
+.halflings.move:before {
+ content: "\E068";
+}
+.halflings.step-backward:before {
+ content: "\E069";
+}
+.halflings.fast-backward:before {
+ content: "\E070";
+}
+.halflings.backward:before {
+ content: "\E071";
+}
+.halflings.play:before {
+ content: "\E072";
+}
+.halflings.pause:before {
+ content: "\E073";
+}
+.halflings.stop:before {
+ content: "\E074";
+}
+.halflings.forward:before {
+ content: "\E075";
+}
+.halflings.fast-forward:before {
+ content: "\E076";
+}
+.halflings.step-forward:before {
+ content: "\E077";
+}
+.halflings.eject:before {
+ content: "\E078";
+}
+.halflings.chevron-left:before {
+ content: "\E079";
+}
+.halflings.chevron-right:before {
+ content: "\E080";
+}
+.halflings.plus-sign:before {
+ content: "\E081";
+}
+.halflings.minus-sign:before {
+ content: "\E082";
+}
+.halflings.remove-sign:before {
+ content: "\E083";
+}
+.halflings.ok-sign:before {
+ content: "\E084";
+}
+.halflings.question-sign:before {
+ content: "\E085";
+}
+.halflings.info-sign:before {
+ content: "\E086";
+}
+.halflings.screenshot:before {
+ content: "\E087";
+}
+.halflings.remove-circle:before {
+ content: "\E088";
+}
+.halflings.ok-circle:before {
+ content: "\E089";
+}
+.halflings.ban-circle:before {
+ content: "\E090";
+}
+.halflings.arrow-left:before {
+ content: "\E091";
+}
+.halflings.arrow-right:before {
+ content: "\E092";
+}
+.halflings.arrow-up:before {
+ content: "\E093";
+}
+.halflings.arrow-down:before {
+ content: "\E094";
+}
+.halflings.share-alt:before {
+ content: "\E095";
+}
+.halflings.resize-full:before {
+ content: "\E096";
+}
+.halflings.resize-small:before {
+ content: "\E097";
+}
+.halflings.plus:before {
+ content: "\002B";
+}
+.halflings.minus:before {
+ content: "\2212";
+}
+.halflings.asterisk:before {
+ content: "\002A";
+}
+.halflings.exclamation-sign:before {
+ content: "\E101";
+}
+.halflings.gift:before {
+ content: "\E102";
+}
+.halflings.leaf:before {
+ content: "\E103";
+}
+.halflings.fire:before {
+ content: "\1F525";
+}
+.halflings.eye-open:before {
+ content: "\E105";
+}
+.halflings.eye-close:before {
+ content: "\E106";
+}
+.halflings.warning-sign:before {
+ content: "\E107";
+}
+.halflings.plane:before {
+ content: "\E108";
+}
+.halflings.calendar:before {
+ content: "\1F4C5";
+}
+.halflings.random:before {
+ content: "\E110";
+}
+.halflings.comments:before {
+ content: "\E111";
+}
+.halflings.magnet:before {
+ content: "\E112";
+}
+.halflings.chevron-up:before {
+ content: "\E113";
+}
+.halflings.chevron-down:before {
+ content: "\E114";
+}
+.halflings.retweet:before {
+ content: "\E115";
+}
+.halflings.shopping-cart:before {
+ content: "\E116";
+}
+.halflings.folder-close:before {
+ content: "\E117";
+}
+.halflings.folder-open:before {
+ content: "\E118";
+}
+.halflings.resize-vertical:before {
+ content: "\E119";
+}
+.halflings.resize-horizontal:before {
+ content: "\E120";
+}
+.halflings.hdd:before {
+ content: "\E121";
+}
+.halflings.bullhorn:before {
+ content: "\E122";
+}
+.halflings.bell:before {
+ content: "\1F514";
+}
+.halflings.certificate:before {
+ content: "\E124";
+}
+.halflings.thumbs-up:before {
+ content: "\E125";
+}
+.halflings.thumbs-down:before {
+ content: "\E126";
+}
+.halflings.hand-right:before {
+ content: "\E127";
+}
+.halflings.hand-left:before {
+ content: "\E128";
+}
+.halflings.hand-top:before {
+ content: "\E129";
+}
+.halflings.hand-down:before {
+ content: "\E130";
+}
+.halflings.circle-arrow-right:before {
+ content: "\E131";
+}
+.halflings.circle-arrow-left:before {
+ content: "\E132";
+}
+.halflings.circle-arrow-top:before {
+ content: "\E133";
+}
+.halflings.circle-arrow-down:before {
+ content: "\E134";
+}
+.halflings.globe:before {
+ content: "\E135";
+}
+.halflings.wrench:before {
+ content: "\1F527";
+}
+.halflings.tasks:before {
+ content: "\E137";
+}
+.halflings.filter:before {
+ content: "\E138";
+}
+.halflings.briefcase:before {
+ content: "\1F4BC";
+}
+.halflings.fullscreen:before {
+ content: "\E140";
+}
+.halflings.dashboard:before {
+ content: "\E141";
+}
+.halflings.paperclip:before {
+ content: "\1F4CE";
+}
+.halflings.heart-empty:before {
+ content: "\E143";
+}
+.halflings.link:before {
+ content: "\E144";
+}
+.halflings.phone:before {
+ content: "\E145";
+}
+.halflings.pushpin:before {
+ content: "\1F4CC";
+}
+.halflings.euro:before {
+ content: "\20AC";
+}
+.halflings.usd:before {
+ content: "\E148";
+}
+.halflings.gbp:before {
+ content: "\E149";
+}
+.halflings.sort:before {
+ content: "\E150";
+}
+.halflings.sort-by-alphabet:before {
+ content: "\E151";
+}
+.halflings.sort-by-alphabet-alt:before {
+ content: "\E152";
+}
+.halflings.sort-by-order:before {
+ content: "\E153";
+}
+.halflings.sort-by-order-alt:before {
+ content: "\E154";
+}
+.halflings.sort-by-attributes:before {
+ content: "\E155";
+}
+.halflings.sort-by-attributes-alt:before {
+ content: "\E156";
+}
+.halflings.unchecked:before {
+ content: "\E157";
+}
+.halflings.expand:before {
+ content: "\E158";
+}
+.halflings.collapse:before {
+ content: "\E159";
+}
+.halflings.collapse-top:before {
+ content: "\E160";
+}
+.halflings.log_in:before {
+ content: "\E161";
+}
+.halflings.flash:before {
+ content: "\E162";
+}
+.halflings.log_out:before {
+ content: "\E163";
+}
+.halflings.new_window:before {
+ content: "\E164";
+}
+.halflings.record:before {
+ content: "\E165";
+}
+.halflings.save:before {
+ content: "\E166";
+}
+.halflings.open:before {
+ content: "\E167";
+}
+.halflings.saved:before {
+ content: "\E168";
+}
+.halflings.import:before {
+ content: "\E169";
+}
+.halflings.export:before {
+ content: "\E170";
+}
+.halflings.send:before {
+ content: "\E171";
+}
+.halflings.floppy_disk:before {
+ content: "\E172";
+}
+.halflings.floppy_saved:before {
+ content: "\E173";
+}
+.halflings.floppy_remove:before {
+ content: "\E174";
+}
+.halflings.floppy_save:before {
+ content: "\E175";
+}
+.halflings.floppy_open:before {
+ content: "\E176";
+}
+.halflings.credit_card:before {
+ content: "\E177";
+}
+.halflings.transfer:before {
+ content: "\E178";
+}
+.halflings.cutlery:before {
+ content: "\E179";
+}
+.halflings.header:before {
+ content: "\E180";
+}
+.halflings.compressed:before {
+ content: "\E181";
+}
+.halflings.earphone:before {
+ content: "\E182";
+}
+.halflings.phone_alt:before {
+ content: "\E183";
+}
+.halflings.tower:before {
+ content: "\E184";
+}
+.halflings.stats:before {
+ content: "\E185";
+}
+.halflings.sd_video:before {
+ content: "\E186";
+}
+.halflings.hd_video:before {
+ content: "\E187";
+}
+.halflings.subtitles:before {
+ content: "\E188";
+}
+.halflings.sound_stereo:before {
+ content: "\E189";
+}
+.halflings.sound_dolby:before {
+ content: "\E190";
+}
+.halflings.sound_5_1:before {
+ content: "\E191";
+}
+.halflings.sound_6_1:before {
+ content: "\E192";
+}
+.halflings.sound_7_1:before {
+ content: "\E193";
+}
+.halflings.copyright_mark:before {
+ content: "\E194";
+}
+.halflings.registration_mark:before {
+ content: "\E195";
+}
+.halflings.cloud:before {
+ content: "\2601";
+}
+.halflings.cloud_download:before {
+ content: "\E197";
+}
+.halflings.cloud_upload:before {
+ content: "\E198";
+}
+.halflings.tree_conifer:before {
+ content: "\E199";
+}
+.halflings.tree_deciduous:before {
+ content: "\E200";
+}
diff --git a/webroot/rsrc/css/font/font-source-sans-pro.css b/webroot/rsrc/css/font/font-source-sans-pro.css
--- a/webroot/rsrc/css/font/font-source-sans-pro.css
+++ b/webroot/rsrc/css/font/font-source-sans-pro.css
@@ -8,7 +8,7 @@
font-weight: 400;
src: local('Source Sans Pro'),
local('SourceSansPro-Regular'),
- url(/rsrc/externals/font/SourceSansPro.woff)
+ url(/rsrc/externals/font/sourcesans/SourceSansPro.woff)
format('woff');
}
@@ -18,6 +18,6 @@
font-weight: 700;
src: local('Source Sans Pro Bold'),
local('SourceSansPro-Bold'),
- url(/rsrc/externals/font/SourceSansProBold.woff)
+ url(/rsrc/externals/font/sourcesans/SourceSansProBold.woff)
format('woff');
}
diff --git a/webroot/rsrc/externals/font/glyphicons/LICENSE b/webroot/rsrc/externals/font/glyphicons/LICENSE
new file mode 100644
--- /dev/null
+++ b/webroot/rsrc/externals/font/glyphicons/LICENSE
@@ -0,0 +1,46 @@
+-------------------------------------------
+THANK YOU FOR PURCHASING GLYPHICONS
+-------------------------------------------
+Your payment will help in the future development of new icons. If you would like to be among the first ones to hear about all the news, please, follow @GLYPHICONS on Twitter.
+
+
+-------------------------------------------
+LICENSE
+-------------------------------------------
+By downloading icons from GLYPHICONS.com, you agree to be bound by the terms of this agreement. A buyer is granted an unlimited usage of all icons purchased on GLYPHICONS.com. The icons may be used for both commercial and personal purposes such as mobile applications, web sites, web applications as well as for printing, info-graphics, etc. You do not need an extra license for every new project. The price is final and includes all future updates of GLYPHICONS, which means that no additional purchase is required.
+
+This license is nonexclusive, non-sublicensable. Keep in mind, please, that it is not allowed to resell the icons as such because the icons are the property of the author. Reselling of the icons is prohibited. The license is non transferable and it is tied always only with one buyer (his email address). Please, be aware that in case you would like to use a font or all icons in vector format in your html theme / application, you have to include this license as a part of your product. If your customers would like to use GLYPHICONS as a part of their own (another) product, they have to buy their own license.
+
+You can:
+- use icons in your HTML theme and sell it (you are obliged to include this license)
+- use icons in your mobile or web app, web, print them etc.
+- modify icons and change their color, shape, etc.
+
+You must not:
+- use icons in your HTML theme and sell it without including this license
+- resell icons or offer them for download anywhere on the internet
+- use icons as a part of any application where your customers are not a final customer
+
+All icons are provided "as they are" without a warranty of any kind, either expressed or implied. I am not liable for any damages coused of any defects in this icon set. All logos and trademarks in social icons are the property of the respective trademark owners.®
+
+
+-------------------------------------------
+LICENSE FOR HALFLINGS IN TWITTER BOOTSTRAP
+-------------------------------------------
+GLYPHICONS Halflings are also a part of Bootstrap from Twitter, and they are released under the same license as Bootstrap. While you are not required to include attribution on your Bootstrap-based projects, I would certainly appreciate a visible link back to GLYPHICONS.com in any place you find appropriate (footer, docs, etc).
+
+
+-------------------------------------------
+CONTACT
+-------------------------------------------
+Web: http://glyphicons.com/
+Email: glyphicons@gmail.com
+Twitter: http://twitter.com/glyphicons
+
+
+-------------------------------------------
+NOTE
+-------------------------------------------
+PRO users do not have to indicate the name of the author, but it always makes me happy when I see a link or a nice tweet about GLYPHICONS :) If you use the icons in your application, website or anywherelse and if you want to, email me, please, and maybe I will mention about it on Twitter, eventually publish your application on www.glyphicons.com/examples-of-use/.
+
+Jan Kovařík
diff --git a/webroot/rsrc/externals/font/glyphicons/glyphicons-halflings-regular.eot b/webroot/rsrc/externals/font/glyphicons/glyphicons-halflings-regular.eot
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/webroot/rsrc/externals/font/glyphicons/glyphicons-halflings-regular.ttf b/webroot/rsrc/externals/font/glyphicons/glyphicons-halflings-regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/webroot/rsrc/externals/font/glyphicons/glyphicons-halflings-regular.woff b/webroot/rsrc/externals/font/glyphicons/glyphicons-halflings-regular.woff
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/webroot/rsrc/externals/font/LICENSE b/webroot/rsrc/externals/font/sourcesans/LICENSE
rename from webroot/rsrc/externals/font/LICENSE
rename to webroot/rsrc/externals/font/sourcesans/LICENSE
diff --git a/webroot/rsrc/externals/font/SourceSansPro.woff b/webroot/rsrc/externals/font/sourcesans/SourceSansPro.woff
rename from webroot/rsrc/externals/font/SourceSansPro.woff
rename to webroot/rsrc/externals/font/sourcesans/SourceSansPro.woff
diff --git a/webroot/rsrc/externals/font/SourceSansProBold.woff b/webroot/rsrc/externals/font/sourcesans/SourceSansProBold.woff
rename from webroot/rsrc/externals/font/SourceSansProBold.woff
rename to webroot/rsrc/externals/font/sourcesans/SourceSansProBold.woff

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 16, 2:56 AM (1 w, 2 d ago)
Storage Engine
amazon-s3
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
phabricator/secure/ry/bd/nr4gboh2wl7tw2y5
Default Alt Text
D8798.id.diff (33 KB)

Event Timeline

Phabricator · Built by Phacility