Skip to content

Commit d09094f

Browse files
author
Chad Little
committedJul 4, 2016
More tokens
Summary: Ref T11244. 8 more tokens. Probably need better math on the selector? Test Plan: Award Dat Boi. Reviewers: epriestley Reviewed By: epriestley Subscribers: putnam, Korvin Maniphest Tasks: T11244 Differential Revision: https://secure.phabricator.com/D16228
1 parent 01040e4 commit d09094f

23 files changed

+99
-19
lines changed
 

‎resources/celerity/map.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88
return array(
99
'names' => array(
10-
'core.pkg.css' => '55d9bb83',
10+
'core.pkg.css' => '2fbe65a2',
1111
'core.pkg.js' => 'f2139810',
1212
'darkconsole.pkg.js' => 'e7393ebb',
1313
'differential.pkg.css' => '3e81ae60',
@@ -163,7 +163,7 @@
163163
'rsrc/css/phui/workboards/phui-workpanel.css' => '92197373',
164164
'rsrc/css/sprite-login.css' => '60e8560e',
165165
'rsrc/css/sprite-menu.css' => '9dd65b92',
166-
'rsrc/css/sprite-tokens.css' => '72b952bd',
166+
'rsrc/css/sprite-tokens.css' => '9cdfd599',
167167
'rsrc/css/syntax/syntax-default.css' => '9923583c',
168168
'rsrc/externals/d3/d3.min.js' => 'a11a5ff2',
169169
'rsrc/externals/font/aleo/aleo-bold.eot' => 'd3d3bed7',
@@ -344,8 +344,8 @@
344344
'rsrc/image/sprite-login.png' => '03d5af29',
345345
'rsrc/image/sprite-menu-X2.png' => 'cfd8fca5',
346346
'rsrc/image/sprite-menu.png' => 'd7a99faa',
347-
'rsrc/image/sprite-tokens-X2.png' => 'e991bb40',
348-
'rsrc/image/sprite-tokens.png' => 'fe69d6ab',
347+
'rsrc/image/sprite-tokens-X2.png' => '804a5232',
348+
'rsrc/image/sprite-tokens.png' => 'b41d03da',
349349
'rsrc/image/texture/card-gradient.png' => '815f26e8',
350350
'rsrc/image/texture/dark-menu-hover.png' => '5fa7ece8',
351351
'rsrc/image/texture/dark-menu.png' => '7e22296e',
@@ -888,7 +888,7 @@
888888
'setup-issue-css' => 'db7e9c40',
889889
'sprite-login-css' => '60e8560e',
890890
'sprite-menu-css' => '9dd65b92',
891-
'sprite-tokens-css' => '72b952bd',
891+
'sprite-tokens-css' => '9cdfd599',
892892
'syntax-default-css' => '9923583c',
893893
'syntax-highlighting-css' => '769d3498',
894894
'tokens-css' => '3d0f239e',

‎resources/sprite/manifest/tokens.json

+40
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,46 @@
2121
"rule": ".tokens-coin-4",
2222
"hash": "75832b7e42df9287b3c35c6afed12a93"
2323
},
24+
"tokens-emoji-1": {
25+
"name": "tokens-emoji-1",
26+
"rule": ".tokens-emoji-1",
27+
"hash": "17f57bdeb4078f9c05f1f037ccb1c162"
28+
},
29+
"tokens-emoji-2": {
30+
"name": "tokens-emoji-2",
31+
"rule": ".tokens-emoji-2",
32+
"hash": "6877c6e0c63522d5819531aaf4aba787"
33+
},
34+
"tokens-emoji-3": {
35+
"name": "tokens-emoji-3",
36+
"rule": ".tokens-emoji-3",
37+
"hash": "cc67534b0119d4cc385a93ed5aff86e4"
38+
},
39+
"tokens-emoji-4": {
40+
"name": "tokens-emoji-4",
41+
"rule": ".tokens-emoji-4",
42+
"hash": "f2a6febd638670962dfb5fdd76b23cfb"
43+
},
44+
"tokens-emoji-5": {
45+
"name": "tokens-emoji-5",
46+
"rule": ".tokens-emoji-5",
47+
"hash": "22bc23d162449fde492e0fd3eccc7301"
48+
},
49+
"tokens-emoji-6": {
50+
"name": "tokens-emoji-6",
51+
"rule": ".tokens-emoji-6",
52+
"hash": "e3689840f410ff1bbf365f6b06043d3f"
53+
},
54+
"tokens-emoji-7": {
55+
"name": "tokens-emoji-7",
56+
"rule": ".tokens-emoji-7",
57+
"hash": "a689b9fe7c9f6f300d757b5350e2cc4b"
58+
},
59+
"tokens-emoji-8": {
60+
"name": "tokens-emoji-8",
61+
"rule": ".tokens-emoji-8",
62+
"hash": "26570ef132caea33307e1e7574d754e8"
63+
},
2464
"tokens-heart-1": {
2565
"name": "tokens-heart-1",
2666
"rule": ".tokens-heart-1",
611 Bytes
Loading
752 Bytes
Loading
581 Bytes
Loading
516 Bytes
Loading
638 Bytes
Loading
1.49 KB
Loading
1.58 KB
Loading
717 Bytes
Loading
1.37 KB
Loading
1.66 KB
Loading
1.17 KB
Loading
1.03 KB
Loading
1.3 KB
Loading
1.21 KB
Loading
1.32 KB
Loading
1.46 KB
Loading

‎src/applications/tokens/controller/PhabricatorTokenGiveController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ private function buildGiveTokenDialog() {
9090
$aural,
9191
$token->renderIcon(),
9292
));
93-
if ((++$ii % 4) == 0) {
93+
if ((++$ii % 6) == 0) {
9494
$buttons[] = phutil_tag('br');
9595
}
9696
}

‎src/applications/tokens/query/PhabricatorTokenQuery.php

+8
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@ private function getBuiltinTokens() {
4343
array('misc-2', pht('Evil Spooky Haunted Tree')),
4444
array('misc-3', pht('Baby Tequila')),
4545
array('misc-4', pht('The World Burns')),
46+
array('emoji-1', pht('100')),
47+
array('emoji-2', pht('Party Time')),
48+
array('emoji-3', pht('Y So Serious')),
49+
array('emoji-4', pht('Dat Boi')),
50+
array('emoji-5', pht('Cup of Joe')),
51+
array('emoji-6', pht('Hungry Hippo')),
52+
array('emoji-7', pht('Burninate')),
53+
array('emoji-8', pht('Pirate Logo')),
4654
);
4755

4856
$type = PhabricatorTokenTokenPHIDType::TYPECONST;

‎webroot/rsrc/css/sprite-tokens.css

+45-13
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ only screen and (-webkit-min-device-pixel-ratio: 1.5),
1414
only screen and (min-resolution: 1.5dppx) {
1515
.sprite-tokens {
1616
background-image: url(/rsrc/image/sprite-tokens-X2.png);
17-
background-size: 76px 76px;
17+
background-size: 95px 95px;
1818
}
1919
}
2020

@@ -35,50 +35,82 @@ only screen and (min-resolution: 1.5dppx) {
3535
background-position: -57px 0px;
3636
}
3737

38-
.tokens-heart-1 {
38+
.tokens-emoji-1 {
39+
background-position: -76px 0px;
40+
}
41+
42+
.tokens-emoji-2 {
3943
background-position: 0px -19px;
4044
}
4145

42-
.tokens-heart-2 {
46+
.tokens-emoji-3 {
4347
background-position: -19px -19px;
4448
}
4549

46-
.tokens-like-1 {
50+
.tokens-emoji-4 {
4751
background-position: -38px -19px;
4852
}
4953

50-
.tokens-like-2 {
54+
.tokens-emoji-5 {
5155
background-position: -57px -19px;
5256
}
5357

54-
.tokens-medal-1 {
58+
.tokens-emoji-6 {
59+
background-position: -76px -19px;
60+
}
61+
62+
.tokens-emoji-7 {
5563
background-position: 0px -38px;
5664
}
5765

58-
.tokens-medal-2 {
66+
.tokens-emoji-8 {
5967
background-position: -19px -38px;
6068
}
6169

62-
.tokens-medal-3 {
70+
.tokens-heart-1 {
6371
background-position: -38px -38px;
6472
}
6573

66-
.tokens-medal-4 {
74+
.tokens-heart-2 {
6775
background-position: -57px -38px;
6876
}
6977

70-
.tokens-misc-1 {
78+
.tokens-like-1 {
79+
background-position: -76px -38px;
80+
}
81+
82+
.tokens-like-2 {
7183
background-position: 0px -57px;
7284
}
7385

74-
.tokens-misc-2 {
86+
.tokens-medal-1 {
7587
background-position: -19px -57px;
7688
}
7789

78-
.tokens-misc-3 {
90+
.tokens-medal-2 {
7991
background-position: -38px -57px;
8092
}
8193

82-
.tokens-misc-4 {
94+
.tokens-medal-3 {
8395
background-position: -57px -57px;
8496
}
97+
98+
.tokens-medal-4 {
99+
background-position: -76px -57px;
100+
}
101+
102+
.tokens-misc-1 {
103+
background-position: 0px -76px;
104+
}
105+
106+
.tokens-misc-2 {
107+
background-position: -19px -76px;
108+
}
109+
110+
.tokens-misc-3 {
111+
background-position: -38px -76px;
112+
}
113+
114+
.tokens-misc-4 {
115+
background-position: -57px -76px;
116+
}
10.6 KB
Loading

‎webroot/rsrc/image/sprite-tokens.png

4.57 KB
Loading

0 commit comments

Comments
 (0)
Failed to load comments.