Skip to content

Commit 8315904

Browse files
committed
Make Conpherence loading an opacity change.
Summary: Fixes T3295 Test Plan: Tested loading new messages, pontificating. Reviewers: epriestley, btrahan Reviewed By: btrahan CC: aran, Korvin Maniphest Tasks: T3295 Differential Revision: https://secure.phabricator.com/D6097
1 parent 127c8b8 commit 8315904

File tree

6 files changed

+18
-72
lines changed

6 files changed

+18
-72
lines changed

src/__celerity_resource_map__.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -918,7 +918,7 @@
918918
),
919919
'conpherence-menu-css' =>
920920
array(
921-
'uri' => '/res/61b6e414/rsrc/css/application/conpherence/menu.css',
921+
'uri' => '/res/621766a2/rsrc/css/application/conpherence/menu.css',
922922
'type' => 'css',
923923
'requires' =>
924924
array(
@@ -927,7 +927,7 @@
927927
),
928928
'conpherence-message-pane-css' =>
929929
array(
930-
'uri' => '/res/3a94564a/rsrc/css/application/conpherence/message-pane.css',
930+
'uri' => '/res/a3cb0efc/rsrc/css/application/conpherence/message-pane.css',
931931
'type' => 'css',
932932
'requires' =>
933933
array(
@@ -945,7 +945,7 @@
945945
),
946946
'conpherence-widget-pane-css' =>
947947
array(
948-
'uri' => '/res/5aa0a316/rsrc/css/application/conpherence/widget-pane.css',
948+
'uri' => '/res/228066e4/rsrc/css/application/conpherence/widget-pane.css',
949949
'type' => 'css',
950950
'requires' =>
951951
array(
@@ -1311,7 +1311,7 @@
13111311
),
13121312
'javelin-behavior-conpherence-pontificate' =>
13131313
array(
1314-
'uri' => '/res/d6c5860f/rsrc/js/application/conpherence/behavior-pontificate.js',
1314+
'uri' => '/res/27f52fc7/rsrc/js/application/conpherence/behavior-pontificate.js',
13151315
'type' => 'js',
13161316
'requires' =>
13171317
array(

src/applications/conpherence/view/ConpherenceLayoutView.php

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ public function render() {
117117
)));
118118

119119

120-
$icon_48 = celerity_get_resource_uri('/rsrc/image/loading/loading_48.gif');
121-
$loading_style = 'background-image: url(http://github.com/%3C/span%3E'%3C/span%3E.%3Cspan%20class=pl-s1%3E%3Cspan%20class=pl-c1%3E$%3C/span%3Eicon_48%3C/span%3E.%3Cspan%20class=pl-s%3E'%3Cspan%20class=pl-s%3E);';
122120
return javelin_tag(
123121
'div',
124122
array(
@@ -141,14 +139,7 @@ public function render() {
141139
'class' => 'conpherence-menu-pane phabricator-side-menu',
142140
'sigil' => 'conpherence-menu-pane',
143141
),
144-
nonempty(
145-
$this->threadView,
146-
phutil_tag(
147-
'div',
148-
array(
149-
'class' => 'menu-loading-icon',
150-
'style' => $loading_style),
151-
''))),
142+
$this->threadView),
152143
javelin_tag(
153144
'div',
154145
array(
@@ -200,13 +191,6 @@ public function render() {
200191
'class' => 'widgets-loading-mask'
201192
),
202193
''),
203-
phutil_tag(
204-
'div',
205-
array(
206-
'class' => 'widgets-loading-icon',
207-
'style' => $loading_style,
208-
),
209-
''),
210194
javelin_tag(
211195
'div',
212196
array(
@@ -235,12 +219,6 @@ public function render() {
235219
'class' => 'messages-loading-mask',
236220
),
237221
''),
238-
phutil_tag(
239-
'div',
240-
array(
241-
'class' => 'messages-loading-icon',
242-
'style' => $loading_style,
243-
)),
244222
javelin_tag(
245223
'div',
246224
array(

webroot/rsrc/css/application/conpherence/menu.css

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,7 @@
3131
margin: 0px 0px 16px 0px;
3232
}
3333

34-
.conpherence-menu-pane .menu-loading-icon {
35-
background-repeat: no-repeat;
36-
background-position: center center;
37-
}
38-
39-
.conpherence-menu-pane,
40-
.loading .menu-loading-icon {
34+
.conpherence-menu-pane {
4135
width: 100%;
4236
position: absolute;
4337
overflow-x: hidden;
@@ -46,8 +40,7 @@
4640
bottom: 0;
4741
}
4842
.device-desktop .conpherence-layout .conpherence-menu-pane,
49-
.device-desktop .conpherence-layout .phabricator-nav-column-background,
50-
.device-desktop .loading .menu-loading-icon {
43+
.device-desktop .conpherence-layout .phabricator-nav-column-background {
5144
width: 280px;
5245
}
5346
.device .conpherence-menu-pane {

webroot/rsrc/css/application/conpherence/message-pane.css

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -65,30 +65,16 @@
6565
}
6666

6767
.conpherence-message-pane .messages-loading-mask {
68-
opacity: .22;
69-
background: #222;
68+
opacity: .6;
69+
background: #fff;
7070
display: none;
7171
}
72-
.conpherence-message-pane .messages-loading-icon {
73-
background-repeat: no-repeat;
74-
background-position: center center;
75-
}
7672

77-
.loading .messages-loading-mask,
78-
.loading .messages-loading-icon {
73+
.loading .messages-loading-mask {
7974
display: block;
8075
z-index: 500;
8176
}
8277

83-
.loading .header-loading-mask {
84-
height: 31px;
85-
position: absolute;
86-
width: 100%;
87-
z-index: 5;
88-
background: #222;
89-
opacity: .22;
90-
}
91-
9278
.conpherence-message-pane .phabricator-form-view {
9379
border-width: 0;
9480
background: none;
@@ -134,21 +120,19 @@
134120
}
135121

136122
.conpherence-message-pane .date-marker {
137-
border-top: 1px solid #bfbfbf;
123+
border-top: 1px solid #d7d7d7;
138124
margin: 5px 15px;
139125
min-height: auto;
140126
}
141127
.conpherence-message-pane .date-marker .date {
142128
position: relative;
143129
top: -8px;
144-
left: 45px;
130+
left: 40px;
145131
background-color: #FFF;
146-
width: auto;
147-
color: #BFBFBF;
132+
color: #bfbfbf;
148133
font-size: 11px;
149134
padding: 0px 5px;
150135
}
151-
152136
.device-phone .conpherence-message-pane .phabricator-transaction-detail {
153137
min-height: auto;
154138
}

webroot/rsrc/css/application/conpherence/widget-pane.css

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
*/
44

55
.conpherence-widget-pane,
6-
.loading .widgets-loading-mask,
7-
.loading .widgets-loading-icon {
6+
.loading .widgets-loading-mask {
87
position: fixed;
98
right: 0px;
109
top: 76px;
@@ -18,24 +17,18 @@
1817
}
1918

2019
.device .conpherence-widget-pane,
21-
.device .loading .widgets-loading-mask,
22-
.device .loading .widgets-loading-icon {
20+
.device .loading .widgets-loading-mask {
2321
top: 44px;
2422
width: 100%;
2523
}
2624

2725
.conpherence-widget-pane .widgets-loading-mask {
28-
opacity: .22;
29-
background: #222;
26+
opacity: .6;
27+
background: #fff;
3028
display: none;
3129
}
32-
.conpherence-widget-pane .widgets-loading-icon {
33-
background-repeat: no-repeat;
34-
background-position: center center;
35-
}
3630

37-
.loading .widgets-loading-mask,
38-
.loading .widgets-loading-icon {
31+
.loading .widgets-loading-mask {
3932
display: block;
4033
z-index: 500;
4134
}

webroot/rsrc/js/application/conpherence/behavior-pontificate.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ JX.behavior('conpherence-pontificate', function(config) {
2424
} catch (ex) {
2525
// Ignore; maybe no files widget
2626
}
27-
JX.DOM.alterClass(header_root, 'loading', true);
28-
JX.DOM.alterClass(messages_root, 'loading', true);
2927
JX.DOM.alterClass(form_root, 'loading', true);
3028

3129
JX.Workflow.newFromForm(form)

0 commit comments

Comments
 (0)