Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15383079
D16228.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
10 KB
Referenced Files
None
Subscribers
None
D16228.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
@@ -7,7 +7,7 @@
*/
return array(
'names' => array(
- 'core.pkg.css' => '55d9bb83',
+ 'core.pkg.css' => '2fbe65a2',
'core.pkg.js' => 'f2139810',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '3e81ae60',
@@ -163,7 +163,7 @@
'rsrc/css/phui/workboards/phui-workpanel.css' => '92197373',
'rsrc/css/sprite-login.css' => '60e8560e',
'rsrc/css/sprite-menu.css' => '9dd65b92',
- 'rsrc/css/sprite-tokens.css' => '72b952bd',
+ 'rsrc/css/sprite-tokens.css' => '9cdfd599',
'rsrc/css/syntax/syntax-default.css' => '9923583c',
'rsrc/externals/d3/d3.min.js' => 'a11a5ff2',
'rsrc/externals/font/aleo/aleo-bold.eot' => 'd3d3bed7',
@@ -344,8 +344,8 @@
'rsrc/image/sprite-login.png' => '03d5af29',
'rsrc/image/sprite-menu-X2.png' => 'cfd8fca5',
'rsrc/image/sprite-menu.png' => 'd7a99faa',
- 'rsrc/image/sprite-tokens-X2.png' => 'e991bb40',
- 'rsrc/image/sprite-tokens.png' => 'fe69d6ab',
+ 'rsrc/image/sprite-tokens-X2.png' => '804a5232',
+ 'rsrc/image/sprite-tokens.png' => 'b41d03da',
'rsrc/image/texture/card-gradient.png' => '815f26e8',
'rsrc/image/texture/dark-menu-hover.png' => '5fa7ece8',
'rsrc/image/texture/dark-menu.png' => '7e22296e',
@@ -888,7 +888,7 @@
'setup-issue-css' => 'db7e9c40',
'sprite-login-css' => '60e8560e',
'sprite-menu-css' => '9dd65b92',
- 'sprite-tokens-css' => '72b952bd',
+ 'sprite-tokens-css' => '9cdfd599',
'syntax-default-css' => '9923583c',
'syntax-highlighting-css' => '769d3498',
'tokens-css' => '3d0f239e',
diff --git a/resources/sprite/manifest/tokens.json b/resources/sprite/manifest/tokens.json
--- a/resources/sprite/manifest/tokens.json
+++ b/resources/sprite/manifest/tokens.json
@@ -21,6 +21,46 @@
"rule": ".tokens-coin-4",
"hash": "75832b7e42df9287b3c35c6afed12a93"
},
+ "tokens-emoji-1": {
+ "name": "tokens-emoji-1",
+ "rule": ".tokens-emoji-1",
+ "hash": "17f57bdeb4078f9c05f1f037ccb1c162"
+ },
+ "tokens-emoji-2": {
+ "name": "tokens-emoji-2",
+ "rule": ".tokens-emoji-2",
+ "hash": "6877c6e0c63522d5819531aaf4aba787"
+ },
+ "tokens-emoji-3": {
+ "name": "tokens-emoji-3",
+ "rule": ".tokens-emoji-3",
+ "hash": "cc67534b0119d4cc385a93ed5aff86e4"
+ },
+ "tokens-emoji-4": {
+ "name": "tokens-emoji-4",
+ "rule": ".tokens-emoji-4",
+ "hash": "f2a6febd638670962dfb5fdd76b23cfb"
+ },
+ "tokens-emoji-5": {
+ "name": "tokens-emoji-5",
+ "rule": ".tokens-emoji-5",
+ "hash": "22bc23d162449fde492e0fd3eccc7301"
+ },
+ "tokens-emoji-6": {
+ "name": "tokens-emoji-6",
+ "rule": ".tokens-emoji-6",
+ "hash": "e3689840f410ff1bbf365f6b06043d3f"
+ },
+ "tokens-emoji-7": {
+ "name": "tokens-emoji-7",
+ "rule": ".tokens-emoji-7",
+ "hash": "a689b9fe7c9f6f300d757b5350e2cc4b"
+ },
+ "tokens-emoji-8": {
+ "name": "tokens-emoji-8",
+ "rule": ".tokens-emoji-8",
+ "hash": "26570ef132caea33307e1e7574d754e8"
+ },
"tokens-heart-1": {
"name": "tokens-heart-1",
"rule": ".tokens-heart-1",
diff --git a/resources/sprite/tokens_1x/emoji-1.png b/resources/sprite/tokens_1x/emoji-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/tokens_1x/emoji-2.png b/resources/sprite/tokens_1x/emoji-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/tokens_1x/emoji-3.png b/resources/sprite/tokens_1x/emoji-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/tokens_1x/emoji-4.png b/resources/sprite/tokens_1x/emoji-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/tokens_1x/emoji-5.png b/resources/sprite/tokens_1x/emoji-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/tokens_1x/emoji-6.png b/resources/sprite/tokens_1x/emoji-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/tokens_1x/emoji-7.png b/resources/sprite/tokens_1x/emoji-7.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/tokens_1x/emoji-8.png b/resources/sprite/tokens_1x/emoji-8.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/tokens_2x/emoji-1.png b/resources/sprite/tokens_2x/emoji-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/tokens_2x/emoji-2.png b/resources/sprite/tokens_2x/emoji-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/tokens_2x/emoji-3.png b/resources/sprite/tokens_2x/emoji-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/tokens_2x/emoji-4.png b/resources/sprite/tokens_2x/emoji-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/tokens_2x/emoji-5.png b/resources/sprite/tokens_2x/emoji-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/tokens_2x/emoji-6.png b/resources/sprite/tokens_2x/emoji-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/tokens_2x/emoji-7.png b/resources/sprite/tokens_2x/emoji-7.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/tokens_2x/emoji-8.png b/resources/sprite/tokens_2x/emoji-8.png
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/src/applications/tokens/controller/PhabricatorTokenGiveController.php b/src/applications/tokens/controller/PhabricatorTokenGiveController.php
--- a/src/applications/tokens/controller/PhabricatorTokenGiveController.php
+++ b/src/applications/tokens/controller/PhabricatorTokenGiveController.php
@@ -90,7 +90,7 @@
$aural,
$token->renderIcon(),
));
- if ((++$ii % 4) == 0) {
+ if ((++$ii % 6) == 0) {
$buttons[] = phutil_tag('br');
}
}
diff --git a/src/applications/tokens/query/PhabricatorTokenQuery.php b/src/applications/tokens/query/PhabricatorTokenQuery.php
--- a/src/applications/tokens/query/PhabricatorTokenQuery.php
+++ b/src/applications/tokens/query/PhabricatorTokenQuery.php
@@ -43,6 +43,14 @@
array('misc-2', pht('Evil Spooky Haunted Tree')),
array('misc-3', pht('Baby Tequila')),
array('misc-4', pht('The World Burns')),
+ array('emoji-1', pht('100')),
+ array('emoji-2', pht('Party Time')),
+ array('emoji-3', pht('Y So Serious')),
+ array('emoji-4', pht('Dat Boi')),
+ array('emoji-5', pht('Cup of Joe')),
+ array('emoji-6', pht('Hungry Hippo')),
+ array('emoji-7', pht('Burninate')),
+ array('emoji-8', pht('Pirate Logo')),
);
$type = PhabricatorTokenTokenPHIDType::TYPECONST;
diff --git a/webroot/rsrc/css/sprite-tokens.css b/webroot/rsrc/css/sprite-tokens.css
--- a/webroot/rsrc/css/sprite-tokens.css
+++ b/webroot/rsrc/css/sprite-tokens.css
@@ -14,7 +14,7 @@
only screen and (min-resolution: 1.5dppx) {
.sprite-tokens {
background-image: url(/rsrc/image/sprite-tokens-X2.png);
- background-size: 76px 76px;
+ background-size: 95px 95px;
}
}
@@ -35,50 +35,82 @@
background-position: -57px 0px;
}
-.tokens-heart-1 {
+.tokens-emoji-1 {
+ background-position: -76px 0px;
+}
+
+.tokens-emoji-2 {
background-position: 0px -19px;
}
-.tokens-heart-2 {
+.tokens-emoji-3 {
background-position: -19px -19px;
}
-.tokens-like-1 {
+.tokens-emoji-4 {
background-position: -38px -19px;
}
-.tokens-like-2 {
+.tokens-emoji-5 {
background-position: -57px -19px;
}
-.tokens-medal-1 {
+.tokens-emoji-6 {
+ background-position: -76px -19px;
+}
+
+.tokens-emoji-7 {
background-position: 0px -38px;
}
-.tokens-medal-2 {
+.tokens-emoji-8 {
background-position: -19px -38px;
}
-.tokens-medal-3 {
+.tokens-heart-1 {
background-position: -38px -38px;
}
-.tokens-medal-4 {
+.tokens-heart-2 {
background-position: -57px -38px;
}
-.tokens-misc-1 {
+.tokens-like-1 {
+ background-position: -76px -38px;
+}
+
+.tokens-like-2 {
background-position: 0px -57px;
}
-.tokens-misc-2 {
+.tokens-medal-1 {
background-position: -19px -57px;
}
-.tokens-misc-3 {
+.tokens-medal-2 {
background-position: -38px -57px;
}
-.tokens-misc-4 {
+.tokens-medal-3 {
background-position: -57px -57px;
}
+
+.tokens-medal-4 {
+ background-position: -76px -57px;
+}
+
+.tokens-misc-1 {
+ background-position: 0px -76px;
+}
+
+.tokens-misc-2 {
+ background-position: -19px -76px;
+}
+
+.tokens-misc-3 {
+ background-position: -38px -76px;
+}
+
+.tokens-misc-4 {
+ background-position: -57px -76px;
+}
diff --git a/webroot/rsrc/image/sprite-tokens-X2.png b/webroot/rsrc/image/sprite-tokens-X2.png
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/webroot/rsrc/image/sprite-tokens.png b/webroot/rsrc/image/sprite-tokens.png
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Mar 15, 3:29 PM (3 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7696815
Default Alt Text
D16228.id.diff (10 KB)
Attached To
Mode
D16228: More tokens
Attached
Detach File
Event Timeline
Log In to Comment