revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-09-20 09:18:48 +02:00
Code Issues Releases Wiki Activity

Make Conpherence loading an opacity change.

Browse source 
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
This commit is contained in:
Chad Little 2013-05-31 11:31:19 -07:00
parent 127c8b806f
commit 831590410a
6 changed files with 18 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/__celerity_resource_map__.php
View file

@ -918,7 +918,7 @@ celerity_register_resource_map(array(
),
'conpherence-menu-css' =>
array(
'uri' => '/res/61b6e414/rsrc/css/application/conpherence/menu.css',
'uri' => '/res/621766a2/rsrc/css/application/conpherence/menu.css',
'type' => 'css',
'requires' =>
array(
@ -927,7 +927,7 @@ celerity_register_resource_map(array(
),
'conpherence-message-pane-css' =>
array(
'uri' => '/res/3a94564a/rsrc/css/application/conpherence/message-pane.css',
'uri' => '/res/a3cb0efc/rsrc/css/application/conpherence/message-pane.css',
'type' => 'css',
'requires' =>
array(
@ -945,7 +945,7 @@ celerity_register_resource_map(array(
),
'conpherence-widget-pane-css' =>
array(
'uri' => '/res/5aa0a316/rsrc/css/application/conpherence/widget-pane.css',
'uri' => '/res/228066e4/rsrc/css/application/conpherence/widget-pane.css',
'type' => 'css',
'requires' =>
array(
@ -1311,7 +1311,7 @@ celerity_register_resource_map(array(
),
'javelin-behavior-conpherence-pontificate' =>
array(
'uri' => '/res/d6c5860f/rsrc/js/application/conpherence/behavior-pontificate.js',
'uri' => '/res/27f52fc7/rsrc/js/application/conpherence/behavior-pontificate.js',
'type' => 'js',
'requires' =>
array(

24
src/applications/conpherence/view/ConpherenceLayoutView.php
View file

@ -117,8 +117,6 @@ final class ConpherenceLayoutView extends AphrontView {
)));
$icon_48 = celerity_get_resource_uri('/rsrc/image/loading/loading_48.gif');
$loading_style = 'background-image: url('.$icon_48.');';
return javelin_tag(
'div',
array(
@ -141,14 +139,7 @@ final class ConpherenceLayoutView extends AphrontView {
'class' => 'conpherence-menu-pane phabricator-side-menu',
'sigil' => 'conpherence-menu-pane',
),
nonempty(
$this->threadView,
phutil_tag(
'div',
array(
'class' => 'menu-loading-icon',
'style' => $loading_style),
''))),
$this->threadView),
javelin_tag(
'div',
array(
@ -200,13 +191,6 @@ final class ConpherenceLayoutView extends AphrontView {
'class' => 'widgets-loading-mask'
),
''),
phutil_tag(
'div',
array(
'class' => 'widgets-loading-icon',
'style' => $loading_style,
),
''),
javelin_tag(
'div',
array(
@ -235,12 +219,6 @@ final class ConpherenceLayoutView extends AphrontView {
'class' => 'messages-loading-mask',
),
''),
phutil_tag(
'div',
array(
'class' => 'messages-loading-icon',
'style' => $loading_style,
)),
javelin_tag(
'div',
array(

11
webroot/rsrc/css/application/conpherence/menu.css
View file

@ -31,13 +31,7 @@
margin: 0px 0px 16px 0px;
}
.conpherence-menu-pane .menu-loading-icon {
background-repeat: no-repeat;
background-position: center center;
}
.conpherence-menu-pane,
.loading .menu-loading-icon {
.conpherence-menu-pane {
width: 100%;
position: absolute;
overflow-x: hidden;
@ -46,8 +40,7 @@
bottom: 0;
}
.device-desktop .conpherence-layout .conpherence-menu-pane,
.device-desktop .conpherence-layout .phabricator-nav-column-background,
.device-desktop .loading .menu-loading-icon {
.device-desktop .conpherence-layout .phabricator-nav-column-background {
width: 280px;
}
.device .conpherence-menu-pane {

28
webroot/rsrc/css/application/conpherence/message-pane.css
View file

@ -65,30 +65,16 @@
}
.conpherence-message-pane .messages-loading-mask {
opacity: .22;
background: #222;
opacity: .6;
background: #fff;
display: none;
}
.conpherence-message-pane .messages-loading-icon {
background-repeat: no-repeat;
background-position: center center;
}
.loading .messages-loading-mask,
.loading .messages-loading-icon {
.loading .messages-loading-mask {
display: block;
z-index: 500;
}
.loading .header-loading-mask {
height: 31px;
position: absolute;
width: 100%;
z-index: 5;
background: #222;
opacity: .22;
}
.conpherence-message-pane .phabricator-form-view {
border-width: 0;
background: none;
@ -134,21 +120,19 @@
}
.conpherence-message-pane .date-marker {
border-top: 1px solid #bfbfbf;
border-top: 1px solid #d7d7d7;
margin: 5px 15px;
min-height: auto;
}
.conpherence-message-pane .date-marker .date {
position: relative;
top: -8px;
left: 45px;
left: 40px;
background-color: #FFF;
width: auto;
color: #BFBFBF;
color: #bfbfbf;
font-size: 11px;
padding: 0px 5px;
}
.device-phone .conpherence-message-pane .phabricator-transaction-detail {
min-height: auto;
}

17
webroot/rsrc/css/application/conpherence/widget-pane.css
View file

@ -3,8 +3,7 @@
*/
.conpherence-widget-pane,
.loading .widgets-loading-mask,
.loading .widgets-loading-icon {
.loading .widgets-loading-mask {
position: fixed;
right: 0px;
top: 76px;
@ -18,24 +17,18 @@
}
.device .conpherence-widget-pane,
.device .loading .widgets-loading-mask,
.device .loading .widgets-loading-icon {
.device .loading .widgets-loading-mask {
top: 44px;
width: 100%;
}
.conpherence-widget-pane .widgets-loading-mask {
opacity: .22;
background: #222;
opacity: .6;
background: #fff;
display: none;
}
.conpherence-widget-pane .widgets-loading-icon {
background-repeat: no-repeat;
background-position: center center;
}
.loading .widgets-loading-mask,
.loading .widgets-loading-icon {
.loading .widgets-loading-mask {
display: block;
z-index: 500;
}

2
webroot/rsrc/js/application/conpherence/behavior-pontificate.js
View file

@ -24,8 +24,6 @@ JX.behavior('conpherence-pontificate', function(config) {
} catch (ex) {
// Ignore; maybe no files widget
}
JX.DOM.alterClass(header_root, 'loading', true);
JX.DOM.alterClass(messages_root, 'loading', true);
JX.DOM.alterClass(form_root, 'loading', true);
JX.Workflow.newFromForm(form)