Skip to content

Commit e0cc277

Browse files
author
epriestley
committedOct 23, 2012
Fix mask positioning and use mask classes in lightbox
Summary: See D3795 / D3797. Also made the mask darker. Test Plan: Mask now sizes properly on window resize in all browsers / mask uses. Reviewers: btrahan Reviewed By: btrahan CC: aran Differential Revision: https://secure.phabricator.com/D3798
1 parent 1a8232f commit e0cc277

File tree

5 files changed

+59
-68
lines changed

5 files changed

+59
-68
lines changed
 

‎externals/javelin

Submodule javelin updated from 59342b2 to 888a4aa

‎src/__celerity_resource_map__.php

+49-50
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@
579579
),
580580
'aphront-dialog-view-css' =>
581581
array(
582-
'uri' => '/res/eedc489d/rsrc/css/aphront/dialog-view.css',
582+
'uri' => '/res/539f1755/rsrc/css/aphront/dialog-view.css',
583583
'type' => 'css',
584584
'requires' =>
585585
array(
@@ -1385,7 +1385,7 @@
13851385
),
13861386
'javelin-behavior-lightbox-attachments' =>
13871387
array(
1388-
'uri' => '/res/bf398927/rsrc/js/application/core/behavior-lightbox-attachments.js',
1388+
'uri' => '/res/0cfebd8a/rsrc/js/application/core/behavior-lightbox-attachments.js',
13891389
'type' => 'js',
13901390
'requires' =>
13911391
array(
@@ -1932,13 +1932,12 @@
19321932
),
19331933
'javelin-mask' =>
19341934
array(
1935-
'uri' => '/res/03ef78b8/rsrc/js/javelin/lib/Mask.js',
1935+
'uri' => '/res/d2a35fff/rsrc/js/javelin/lib/Mask.js',
19361936
'type' => 'js',
19371937
'requires' =>
19381938
array(
19391939
0 => 'javelin-install',
1940-
1 => 'javelin-vector',
1941-
2 => 'javelin-dom',
1940+
1 => 'javelin-dom',
19421941
),
19431942
'disk' => '/rsrc/js/javelin/lib/Mask.js',
19441943
),
@@ -2238,7 +2237,7 @@
22382237
),
22392238
'lightbox-attachment-css' =>
22402239
array(
2241-
'uri' => '/res/398fdb62/rsrc/css/aphront/lightbox-attachment.css',
2240+
'uri' => '/res/136d479b/rsrc/css/aphront/lightbox-attachment.css',
22422241
'type' => 'css',
22432242
'requires' =>
22442243
array(
@@ -3071,7 +3070,7 @@
30713070
), array(
30723071
'packages' =>
30733072
array(
3074-
'8eb36c35' =>
3073+
'4322f368' =>
30753074
array(
30763075
'name' => 'core.pkg.css',
30773076
'symbols' =>
@@ -3100,10 +3099,10 @@
31003099
21 => 'phabricator-flag-css',
31013100
22 => 'aphront-error-view-css',
31023101
),
3103-
'uri' => '/res/pkg/8eb36c35/core.pkg.css',
3102+
'uri' => '/res/pkg/4322f368/core.pkg.css',
31043103
'type' => 'css',
31053104
),
3106-
'f3d6fc91' =>
3105+
'f5ccc73b' =>
31073106
array(
31083107
'name' => 'core.pkg.js',
31093108
'symbols' =>
@@ -3126,7 +3125,7 @@
31263125
15 => 'javelin-behavior-phabricator-tooltips',
31273126
16 => 'phabricator-prefab',
31283127
),
3129-
'uri' => '/res/pkg/f3d6fc91/core.pkg.js',
3128+
'uri' => '/res/pkg/f5ccc73b/core.pkg.js',
31303129
'type' => 'js',
31313130
),
31323131
'2ba14b3d' =>
@@ -3267,20 +3266,20 @@
32673266
'reverse' =>
32683267
array(
32693268
'aphront-attached-file-view-css' => '7839ae2d',
3270-
'aphront-crumbs-view-css' => '8eb36c35',
3271-
'aphront-dialog-view-css' => '8eb36c35',
3272-
'aphront-error-view-css' => '8eb36c35',
3273-
'aphront-form-view-css' => '8eb36c35',
3269+
'aphront-crumbs-view-css' => '4322f368',
3270+
'aphront-dialog-view-css' => '4322f368',
3271+
'aphront-error-view-css' => '4322f368',
3272+
'aphront-form-view-css' => '4322f368',
32743273
'aphront-headsup-action-list-view-css' => '2ba14b3d',
3275-
'aphront-headsup-view-css' => '8eb36c35',
3276-
'aphront-list-filter-view-css' => '8eb36c35',
3277-
'aphront-pager-view-css' => '8eb36c35',
3278-
'aphront-panel-view-css' => '8eb36c35',
3279-
'aphront-side-nav-view-css' => '8eb36c35',
3280-
'aphront-table-view-css' => '8eb36c35',
3281-
'aphront-tokenizer-control-css' => '8eb36c35',
3282-
'aphront-tooltip-css' => '8eb36c35',
3283-
'aphront-typeahead-control-css' => '8eb36c35',
3274+
'aphront-headsup-view-css' => '4322f368',
3275+
'aphront-list-filter-view-css' => '4322f368',
3276+
'aphront-pager-view-css' => '4322f368',
3277+
'aphront-panel-view-css' => '4322f368',
3278+
'aphront-side-nav-view-css' => '4322f368',
3279+
'aphront-table-view-css' => '4322f368',
3280+
'aphront-tokenizer-control-css' => '4322f368',
3281+
'aphront-tooltip-css' => '4322f368',
3282+
'aphront-typeahead-control-css' => '4322f368',
32843283
'differential-changeset-view-css' => '2ba14b3d',
32853284
'differential-core-view-css' => '2ba14b3d',
32863285
'differential-inline-comment-editor' => '8136e4a6',
@@ -3299,7 +3298,7 @@
32993298
'javelin-behavior-aphront-basic-tokenizer' => 'dd024ca1',
33003299
'javelin-behavior-aphront-drag-and-drop' => '8136e4a6',
33013300
'javelin-behavior-aphront-drag-and-drop-textarea' => '8136e4a6',
3302-
'javelin-behavior-aphront-form-disable-on-submit' => 'f3d6fc91',
3301+
'javelin-behavior-aphront-form-disable-on-submit' => 'f5ccc73b',
33033302
'javelin-behavior-audit-preview' => '5e68be89',
33043303
'javelin-behavior-differential-accept-with-errors' => '8136e4a6',
33053304
'javelin-behavior-differential-add-reviewers-and-ccs' => '8136e4a6',
@@ -3318,20 +3317,20 @@
33183317
'javelin-behavior-maniphest-transaction-controls' => '7707de41',
33193318
'javelin-behavior-maniphest-transaction-expand' => '7707de41',
33203319
'javelin-behavior-maniphest-transaction-preview' => '7707de41',
3321-
'javelin-behavior-phabricator-autofocus' => 'f3d6fc91',
3322-
'javelin-behavior-phabricator-keyboard-shortcuts' => 'f3d6fc91',
3320+
'javelin-behavior-phabricator-autofocus' => 'f5ccc73b',
3321+
'javelin-behavior-phabricator-keyboard-shortcuts' => 'f5ccc73b',
33233322
'javelin-behavior-phabricator-object-selector' => '8136e4a6',
3324-
'javelin-behavior-phabricator-oncopy' => 'f3d6fc91',
3325-
'javelin-behavior-phabricator-tooltips' => 'f3d6fc91',
3326-
'javelin-behavior-phabricator-watch-anchor' => 'f3d6fc91',
3327-
'javelin-behavior-refresh-csrf' => 'f3d6fc91',
3323+
'javelin-behavior-phabricator-oncopy' => 'f5ccc73b',
3324+
'javelin-behavior-phabricator-tooltips' => 'f5ccc73b',
3325+
'javelin-behavior-phabricator-watch-anchor' => 'f5ccc73b',
3326+
'javelin-behavior-refresh-csrf' => 'f5ccc73b',
33283327
'javelin-behavior-repository-crossreference' => '8136e4a6',
3329-
'javelin-behavior-workflow' => 'f3d6fc91',
3328+
'javelin-behavior-workflow' => 'f5ccc73b',
33303329
'javelin-dom' => 'c50bbf3a',
33313330
'javelin-event' => 'c50bbf3a',
33323331
'javelin-install' => 'c50bbf3a',
33333332
'javelin-json' => 'c50bbf3a',
3334-
'javelin-mask' => 'f3d6fc91',
3333+
'javelin-mask' => 'f5ccc73b',
33353334
'javelin-request' => 'c50bbf3a',
33363335
'javelin-stratcom' => 'c50bbf3a',
33373336
'javelin-tokenizer' => 'dd024ca1',
@@ -3343,30 +3342,30 @@
33433342
'javelin-uri' => 'c50bbf3a',
33443343
'javelin-util' => 'c50bbf3a',
33453344
'javelin-vector' => 'c50bbf3a',
3346-
'javelin-workflow' => 'f3d6fc91',
3345+
'javelin-workflow' => 'f5ccc73b',
33473346
'maniphest-task-summary-css' => '7839ae2d',
33483347
'maniphest-transaction-detail-css' => '7839ae2d',
3349-
'phabricator-app-buttons-css' => '8eb36c35',
3348+
'phabricator-app-buttons-css' => '4322f368',
33503349
'phabricator-content-source-view-css' => '2ba14b3d',
3351-
'phabricator-core-buttons-css' => '8eb36c35',
3352-
'phabricator-core-css' => '8eb36c35',
3353-
'phabricator-directory-css' => '8eb36c35',
3350+
'phabricator-core-buttons-css' => '4322f368',
3351+
'phabricator-core-css' => '4322f368',
3352+
'phabricator-directory-css' => '4322f368',
33543353
'phabricator-drag-and-drop-file-upload' => '8136e4a6',
3355-
'phabricator-dropdown-menu' => 'f3d6fc91',
3356-
'phabricator-flag-css' => '8eb36c35',
3357-
'phabricator-jump-nav' => '8eb36c35',
3358-
'phabricator-keyboard-shortcut' => 'f3d6fc91',
3359-
'phabricator-keyboard-shortcut-manager' => 'f3d6fc91',
3360-
'phabricator-menu-item' => 'f3d6fc91',
3354+
'phabricator-dropdown-menu' => 'f5ccc73b',
3355+
'phabricator-flag-css' => '4322f368',
3356+
'phabricator-jump-nav' => '4322f368',
3357+
'phabricator-keyboard-shortcut' => 'f5ccc73b',
3358+
'phabricator-keyboard-shortcut-manager' => 'f5ccc73b',
3359+
'phabricator-menu-item' => 'f5ccc73b',
33613360
'phabricator-object-selector-css' => '2ba14b3d',
3362-
'phabricator-paste-file-upload' => 'f3d6fc91',
3363-
'phabricator-prefab' => 'f3d6fc91',
3361+
'phabricator-paste-file-upload' => 'f5ccc73b',
3362+
'phabricator-prefab' => 'f5ccc73b',
33643363
'phabricator-project-tag-css' => '7839ae2d',
3365-
'phabricator-remarkup-css' => '8eb36c35',
3364+
'phabricator-remarkup-css' => '4322f368',
33663365
'phabricator-shaped-request' => '8136e4a6',
3367-
'phabricator-standard-page-view' => '8eb36c35',
3368-
'phabricator-tooltip' => 'f3d6fc91',
3369-
'phabricator-transaction-view-css' => '8eb36c35',
3370-
'syntax-highlighting-css' => '8eb36c35',
3366+
'phabricator-standard-page-view' => '4322f368',
3367+
'phabricator-tooltip' => 'f5ccc73b',
3368+
'phabricator-transaction-view-css' => '4322f368',
3369+
'syntax-highlighting-css' => '4322f368',
33713370
),
33723371
));

‎webroot/rsrc/css/aphront/dialog-view.css

+7-7
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,18 @@
4848

4949
.jx-mask {
5050
opacity: .37;
51-
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=37)";
52-
filter: alpha(opacity=37);
5351
background: #222;
54-
position: absolute;
55-
z-index: 5;
52+
position: fixed;
53+
z-index: 10;
5654
top: 0;
5755
left: 0;
5856
right: 0;
5957
bottom: 0;
60-
width: 100%;
61-
height: 100%;
62-
min-height: 100%;
58+
}
59+
60+
.jx-dark-mask {
61+
background: #000000;
62+
opacity: 0.9;
6363
}
6464

6565
.aphront-exception-dialog {

‎webroot/rsrc/css/aphront/lightbox-attachment.css

+1-9
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,11 @@
77
overflow-y: hidden;
88
}
99

10-
.lightbox-attached .jx-mask {
11-
opacity: 0.76;
12-
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=76)";
13-
filter: alpha(opacity=76);
14-
/* jx-mask behavior sets this dynamically so !important to win */
15-
width: 100% !important;
16-
}
17-
1810
.lightbox-attachment {
1911
position: fixed;
2012
top: 44px;
2113
left: 0;
22-
z-index: 6;
14+
z-index: 12;
2315
width: 100%;
2416
}
2517

‎webroot/rsrc/js/application/core/behavior-lightbox-attachments.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ JX.behavior('lightbox-attachments', function (config) {
171171
);
172172
JX.DOM.appendContent(lightbox, statusHTML);
173173
JX.DOM.alterClass(document.body, 'lightbox-attached', true);
174-
JX.Mask.show();
174+
JX.Mask.show('jx-dark-mask');
175175
document.body.appendChild(lightbox);
176176
img.src = img_uri;
177177
}

0 commit comments

Comments
 (0)
Failed to load comments.