Skip to content

Commit f903088

Browse files
author
epriestley
committed
Merge branch 'master' into phutil_tag
(Just synchronizing master into the tag branch.)
2 parents a1ff679 + ba3b785 commit f903088

File tree

105 files changed

+1620
-1143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+1620
-1143
lines changed
1.42 KB
Loading
1.86 KB
Loading
1.37 KB
Loading
1.77 KB
Loading
2.69 KB
Loading
1.96 KB
Loading
3.13 KB
Loading
1.86 KB
Loading
2.98 KB
Loading

resources/sprite/manifest/apps-large.json

Lines changed: 172 additions & 152 deletions
Large diffs are not rendered by default.

resources/sprite/manifest/apps.json

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,192 +4,197 @@
44
"app-application-dark" : {
55
"name" : "app-application-dark",
66
"rule" : ".app-application-dark",
7-
"hash" : "89f861c28e97878311885623cff3d314"
7+
"hash" : "60e228106718bf6f3ee5024400d31f24"
88
},
99
"app-audit-dark" : {
1010
"name" : "app-audit-dark",
1111
"rule" : ".app-audit-dark",
12-
"hash" : "2c141bc445c4fe62986cd6cff0c29b36"
12+
"hash" : "38339b9cc4e39cbbbea36dcf039873bb"
1313
},
1414
"app-calendar-dark" : {
1515
"name" : "app-calendar-dark",
1616
"rule" : ".app-calendar-dark",
17-
"hash" : "04c61a081986f0d38cf27fc4e18bce40"
17+
"hash" : "756d60566639ad1424444436a95c6a3f"
1818
},
1919
"app-conduit-dark" : {
2020
"name" : "app-conduit-dark",
2121
"rule" : ".app-conduit-dark",
22-
"hash" : "7b410e96c87e7818fb93bdfa2ed9368f"
22+
"hash" : "01fba8ca32f1cfefb3516b45c9d28b40"
23+
},
24+
"app-conpherence-dark" : {
25+
"name" : "app-conpherence-dark",
26+
"rule" : ".app-conpherence-dark",
27+
"hash" : "dbb6fdd5f082a604b4ef10b7eeedbfa2"
2328
},
2429
"app-countdown-dark" : {
2530
"name" : "app-countdown-dark",
2631
"rule" : ".app-countdown-dark",
27-
"hash" : "8891502317896beea6a5f9ec87eb5e2e"
32+
"hash" : "625f2589ee491aead58aaa5b965a7451"
2833
},
2934
"app-daemon-dark" : {
3035
"name" : "app-daemon-dark",
3136
"rule" : ".app-daemon-dark",
32-
"hash" : "23a9a2927b368e2328dd70f95c5b1a07"
37+
"hash" : "4472be3242150f06ea5bf7b45333c4c5"
3338
},
3439
"app-differential-dark" : {
3540
"name" : "app-differential-dark",
3641
"rule" : ".app-differential-dark",
37-
"hash" : "bb7032f3c17901f242f9bbbcdc9a721c"
42+
"hash" : "508401fe36d9636bdcbdcbcae253c152"
3843
},
3944
"app-diffusion-dark" : {
4045
"name" : "app-diffusion-dark",
4146
"rule" : ".app-diffusion-dark",
42-
"hash" : "46ab6648a6ae04e4fd1a28a9afcc4996"
47+
"hash" : "0a6f8c85079c4a325430197adb05967c"
4348
},
4449
"app-diviner-dark" : {
4550
"name" : "app-diviner-dark",
4651
"rule" : ".app-diviner-dark",
47-
"hash" : "e21a74e866a6fc22a991b8df6efc3ca7"
52+
"hash" : "08872eb1c6bb51b9727290f6fa802633"
4853
},
4954
"app-drydock-dark" : {
5055
"name" : "app-drydock-dark",
5156
"rule" : ".app-drydock-dark",
52-
"hash" : "ed44013d98257a23306bad9c6b24760d"
57+
"hash" : "d50309da57021c676774f9bdc68c5fe7"
5358
},
5459
"app-fact-dark" : {
5560
"name" : "app-fact-dark",
5661
"rule" : ".app-fact-dark",
57-
"hash" : "f373f38e784289b866ab914471c342ec"
62+
"hash" : "0c1be568e1ac05fca814718600190369"
5863
},
5964
"app-feed-dark" : {
6065
"name" : "app-feed-dark",
6166
"rule" : ".app-feed-dark",
62-
"hash" : "c4f1765e70615c6ee4cae6e8135fb969"
67+
"hash" : "830232709eedbe6ce7cdbcebf182c86c"
6368
},
6469
"app-files-dark" : {
6570
"name" : "app-files-dark",
6671
"rule" : ".app-files-dark",
67-
"hash" : "7faf45efa5b9b97e571bc66636ca1a15"
72+
"hash" : "00f5ab7ea3e9367e378cf9f395400ed4"
6873
},
6974
"app-flags-dark" : {
7075
"name" : "app-flags-dark",
7176
"rule" : ".app-flags-dark",
72-
"hash" : "10298f695592714e27f72ef746ffd8a9"
77+
"hash" : "6382f373f7b0e70522d80ce06ef62813"
7378
},
7479
"app-help-dark" : {
7580
"name" : "app-help-dark",
7681
"rule" : ".app-help-dark",
77-
"hash" : "5cf715cc566b98c87958793eebea5f35"
82+
"hash" : "2299a14e27d76fdf66209ef0042cc84f"
7883
},
7984
"app-herald-dark" : {
8085
"name" : "app-herald-dark",
8186
"rule" : ".app-herald-dark",
82-
"hash" : "e3bc39a3dd1d66a0abf4594c608a3846"
87+
"hash" : "b2193b62df3bd4cf5c8de514a07fb6c3"
8388
},
8489
"app-home-dark" : {
8590
"name" : "app-home-dark",
8691
"rule" : ".app-home-dark",
87-
"hash" : "7e01fbdfa526919a2d90d2c29a6c9fa0"
92+
"hash" : "88f020497fcbcf43729aa817695b174f"
8893
},
8994
"app-logo-dark" : {
9095
"name" : "app-logo-dark",
9196
"rule" : ".app-logo-dark",
92-
"hash" : "39701e1282fd120e77b09ed9fcddc686"
97+
"hash" : "02e71ae2421f1949f2ef075c27e052c9"
9398
},
9499
"app-macro-dark" : {
95100
"name" : "app-macro-dark",
96101
"rule" : ".app-macro-dark",
97-
"hash" : "ef89457bcee666ad265de1659b9b8a62"
102+
"hash" : "8e0e72847a8f70eb3f8e60e7fb681c06"
98103
},
99104
"app-mail-dark" : {
100105
"name" : "app-mail-dark",
101106
"rule" : ".app-mail-dark",
102-
"hash" : "4d05a5cd4360052183e91f61967a6c57"
107+
"hash" : "a2a792fddc44be4ae0f1a601380c8449"
103108
},
104109
"app-maniphest-dark" : {
105110
"name" : "app-maniphest-dark",
106111
"rule" : ".app-maniphest-dark",
107-
"hash" : "320da127d7f887e09965a0416d5e44d3"
112+
"hash" : "ea94fc7dbb2267adc33513f78916fe90"
108113
},
109114
"app-metamta-dark" : {
110115
"name" : "app-metamta-dark",
111116
"rule" : ".app-metamta-dark",
112-
"hash" : "51f100c2a7a80149404dbc8b27f595a9"
117+
"hash" : "8abbb6e74d1697f950a01dcd6c8077be"
113118
},
114119
"app-owners-dark" : {
115120
"name" : "app-owners-dark",
116121
"rule" : ".app-owners-dark",
117-
"hash" : "33c064dd3b7fc3f9eb934d0cf84f3af5"
122+
"hash" : "23b948cc1d32a0968785fbfca749dcdf"
118123
},
119124
"app-paste-dark" : {
120125
"name" : "app-paste-dark",
121126
"rule" : ".app-paste-dark",
122-
"hash" : "9482649caa8e5a46d277271092517b12"
127+
"hash" : "9e0c1d1fe03aebcb55a4d19be051e255"
123128
},
124129
"app-people-dark" : {
125130
"name" : "app-people-dark",
126131
"rule" : ".app-people-dark",
127-
"hash" : "67245eafa79367e4e07289549cf34deb"
132+
"hash" : "0b3995fcd043b506a408de6e25ad5292"
128133
},
129134
"app-phame-dark" : {
130135
"name" : "app-phame-dark",
131136
"rule" : ".app-phame-dark",
132-
"hash" : "029d7d48523cc43b0404bf40ccf56f8b"
137+
"hash" : "24ff4d322bce13f1c156ce5361a03a07"
133138
},
134139
"app-phid-dark" : {
135140
"name" : "app-phid-dark",
136141
"rule" : ".app-phid-dark",
137-
"hash" : "2099c2987fe3929ce1d9dec470c7699d"
142+
"hash" : "5a0ac05bbf36a7aeb36753d093c3c9f8"
138143
},
139144
"app-pholio-dark" : {
140145
"name" : "app-pholio-dark",
141146
"rule" : ".app-pholio-dark",
142-
"hash" : "aab47c79d2e03fdcaffb6f41dc1e0f06"
147+
"hash" : "7d3befd1c12dd464a5f5edbef4574a5c"
143148
},
144149
"app-phpast-dark" : {
145150
"name" : "app-phpast-dark",
146151
"rule" : ".app-phpast-dark",
147-
"hash" : "e6db72b398f57d03a400c9c18bd3c412"
152+
"hash" : "de1ad812c7a177c844fcff626b1abebf"
148153
},
149154
"app-phriction-dark" : {
150155
"name" : "app-phriction-dark",
151156
"rule" : ".app-phriction-dark",
152-
"hash" : "8064272206874a324d20d956c8fb10da"
157+
"hash" : "8596da3f375087db6a163c98f0c968ae"
153158
},
154159
"app-ponder-dark" : {
155160
"name" : "app-ponder-dark",
156161
"rule" : ".app-ponder-dark",
157-
"hash" : "abdb353635bed5cfd48a176b4340022f"
162+
"hash" : "232577eb875f383f45cb9dbd9a4e3976"
158163
},
159164
"app-power-dark" : {
160165
"name" : "app-power-dark",
161166
"rule" : ".app-power-dark",
162-
"hash" : "d3e943d1267206963d8f9419629c5581"
167+
"hash" : "e3708b1b4bfdfc614d9cf630943e5bef"
163168
},
164169
"app-projects-dark" : {
165170
"name" : "app-projects-dark",
166171
"rule" : ".app-projects-dark",
167-
"hash" : "6bd7c598e2f2cf0b77918a7b0fa8bd19"
172+
"hash" : "5e799f1e95ecfd33cb67b6e4ac992043"
168173
},
169174
"app-repositories-dark" : {
170175
"name" : "app-repositories-dark",
171176
"rule" : ".app-repositories-dark",
172-
"hash" : "db2823a16dae198145f53e8021170740"
177+
"hash" : "736066962e96df88eacc04d734613a0e"
173178
},
174179
"app-settings-dark" : {
175180
"name" : "app-settings-dark",
176181
"rule" : ".app-settings-dark",
177-
"hash" : "1c84d22b769730d9e8b6fcd3414de72c"
182+
"hash" : "2fadcf918fb084bd3452712f700ae1a0"
178183
},
179184
"app-setup-dark" : {
180185
"name" : "app-setup-dark",
181186
"rule" : ".app-setup-dark",
182-
"hash" : "27db76695d99be0c25368dc9e0932b17"
187+
"hash" : "061b80f3555ade1c36934474b61fe76b"
183188
},
184189
"app-slowvote-dark" : {
185190
"name" : "app-slowvote-dark",
186191
"rule" : ".app-slowvote-dark",
187-
"hash" : "0d5861fab4562ad21242e34f9a29a33e"
192+
"hash" : "e51cc1e6887f2deaff02d9c60aae36e0"
188193
},
189194
"app-uiexamples-dark" : {
190195
"name" : "app-uiexamples-dark",
191196
"rule" : ".app-uiexamples-dark",
192-
"hash" : "6416a3d9d9007673ee558433b80692a1"
197+
"hash" : "dd919fd2c10e7d1e0915f523ac3922ce"
193198
}
194199
},
195200
"scales" : [

resources/sprite/manifest/gradient.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,67 +4,67 @@
44
"gradient-black-dark" : {
55
"name" : "gradient-black-dark",
66
"rule" : ".gradient-black-dark, button.black, a.black, a.black:visited",
7-
"hash" : "b9faf8505427bb14a8c51324e13e2f81"
7+
"hash" : "17425d8c9c53672ab2edbd236e6efd7a"
88
},
99
"gradient-black-light" : {
1010
"name" : "gradient-black-light",
1111
"rule" : ".gradient-black-light, button.black:active, a.black:active",
12-
"hash" : "812c3375d00ccc93c36c6df2eb565df4"
12+
"hash" : "c4fb2231553d2894fd2c97beaa8bfe39"
1313
},
1414
"gradient-blue-dark" : {
1515
"name" : "gradient-blue-dark",
1616
"rule" : ".gradient-blue-dark, button, a.button, a.button:visited, input.inputsubmit",
17-
"hash" : "adc2d0f7397374936384014c5d78550d"
17+
"hash" : "f467612edcdbf984672287c6086492c4"
1818
},
1919
"gradient-blue-light" : {
2020
"name" : "gradient-blue-light",
2121
"rule" : ".gradient-blue-light, button:active, a.button:active",
22-
"hash" : "91b841067a63e543a4dcd9d41e0a2e5c"
22+
"hash" : "471d47c102def6db46b345310aac5a03"
2323
},
2424
"gradient-breadcrumbs" : {
2525
"name" : "gradient-breadcrumbs",
2626
"rule" : ".gradient-breadcrumbs",
27-
"hash" : "688ab77f50cfbc17ec30d798efb1b39e"
27+
"hash" : "3d0f8634df5bc29eaf2a5a01bae79cf1"
2828
},
2929
"gradient-dark-menu-label" : {
3030
"name" : "gradient-dark-menu-label",
3131
"rule" : ".gradient-dark-menu-label, .phabricator-dark-menu .phabricator-menu-item-type-label",
32-
"hash" : "89a908596142d38fbe61a706694cd321"
32+
"hash" : "e0d4a455142f9c4745d36ad8b7dd3f78"
3333
},
3434
"gradient-green-dark" : {
3535
"name" : "gradient-green-dark",
3636
"rule" : ".gradient-green-dark, button.green, a.green, a.green:visited",
37-
"hash" : "0d19ab593772b6b406c0db309b3a14fb"
37+
"hash" : "a6719fe55b2b0e527ed32985691eab34"
3838
},
3939
"gradient-green-light" : {
4040
"name" : "gradient-green-light",
4141
"rule" : ".gradient-green-light, button.green:active, a.green:active",
42-
"hash" : "71c67916327ec7fc65149ab72c3a2924"
42+
"hash" : "124969cc7805bbd754005bc702e24c54"
4343
},
4444
"gradient-grey-dark" : {
4545
"name" : "gradient-grey-dark",
4646
"rule" : ".gradient-grey-dark, button.grey, input.inputaux, a.grey, a.grey:visited, a.button.disabled, button[disabled], button.disabled",
47-
"hash" : "32651902d28d37dca01cf067072c39c0"
47+
"hash" : "fac28a773098fc62bf571e12b843f71a"
4848
},
4949
"gradient-grey-light" : {
5050
"name" : "gradient-grey-light",
5151
"rule" : ".gradient-grey-light, button.grey:active, a.grey:active, button.grey_active, a.dropdown-open",
52-
"hash" : "c3c9ee1ed6f800a4ac86910b94687877"
52+
"hash" : "83c6128f59fc2e426c912c2f73f5b92b"
5353
},
5454
"gradient-menu-hover" : {
5555
"name" : "gradient-menu-hover",
5656
"rule" : ".gradient-menu-hover, .device-desktop .phabricator-side-menu a.phabricator-menu-item-type-link:hover, .phabricator-filetree a.phabricator-filetree-item:hover",
57-
"hash" : "856380207ac8c5cb6770d44dceb245a8"
57+
"hash" : "e6e064156d66952180e99b00996ffc38"
5858
},
5959
"gradient-menu-label" : {
6060
"name" : "gradient-menu-label",
6161
"rule" : ".gradient-menu-label, .phabricator-side-menu .phabricator-menu-item-type-label",
62-
"hash" : "8ad8352b077ae02820ebbbae26dc669b"
62+
"hash" : "04b9943f5b06c8cb21fe6b96714e6662"
6363
},
6464
"gradient-menu-selected" : {
6565
"name" : "gradient-menu-selected",
6666
"rule" : ".gradient-menu-selected, .phabricator-side-menu .phabricator-menu-item-selected, .device-desktop .phabricator-side-menu a.phabricator-menu-item-selected:hover, .phabricator-nav-local a.phabricator-active-nav-focus",
67-
"hash" : "815bafb94e11c23e1a419ea85dcae113"
67+
"hash" : "9b4b039fba177b90bc26f0e6eece339d"
6868
}
6969
},
7070
"scales" : [

0 commit comments

Comments
 (0)