Page MenuHomePhabricator
Files F87164

D7696.diff
All Users
Actions

D7696.diff
View Options

diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -993,16 +993,16 @@
),
'conpherence-menu-css' =>
array(
- 'uri' => '/res/4c356703/rsrc/css/application/conpherence/menu.css',
+ 'uri' => '/res/cd61e53d/rsrc/css/application/conpherence/menu.css',
'type' => 'css',
'requires' =>
array(
),
'disk' => '/rsrc/css/application/conpherence/menu.css',
),
'conpherence-message-pane-css' =>
array(
- 'uri' => '/res/3627d418/rsrc/css/application/conpherence/message-pane.css',
+ 'uri' => '/res/d3ccc391/rsrc/css/application/conpherence/message-pane.css',
'type' => 'css',
'requires' =>
array(
@@ -1029,7 +1029,7 @@
),
'conpherence-widget-pane-css' =>
array(
- 'uri' => '/res/b80fc69c/rsrc/css/application/conpherence/widget-pane.css',
+ 'uri' => '/res/a1ebb7cc/rsrc/css/application/conpherence/widget-pane.css',
'type' => 'css',
'requires' =>
array(
diff --git a/webroot/rsrc/css/application/conpherence/menu.css b/webroot/rsrc/css/application/conpherence/menu.css
--- a/webroot/rsrc/css/application/conpherence/menu.css
+++ b/webroot/rsrc/css/application/conpherence/menu.css
@@ -3,7 +3,12 @@
*/
.conpherence-layout {
- position: relative;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ top: 44px;
+ background: #fff;
}
.conpherence-layout .conpherence-no-threads {
@@ -32,6 +37,8 @@
position: absolute;
overflow-x: hidden;
overflow-y: auto;
+ top: 0;
+ bottom: 0;
}
.device-desktop .conpherence-layout .conpherence-menu-pane,
diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css
--- a/webroot/rsrc/css/application/conpherence/message-pane.css
+++ b/webroot/rsrc/css/application/conpherence/message-pane.css
@@ -13,7 +13,6 @@
bottom: 0px;
min-width: 300px;
width: auto;
- background: #fff;
}
.device .conpherence-message-pane,
@@ -136,6 +135,9 @@
margin: 5px 15px;
min-height: auto;
}
+.device-phone .conpherence-message-pane .date-marker {
+ margin: 5px 0;
+}
.conpherence-message-pane .date-marker .date {
position: relative;
top: -8px;
diff --git a/webroot/rsrc/css/application/conpherence/widget-pane.css b/webroot/rsrc/css/application/conpherence/widget-pane.css
--- a/webroot/rsrc/css/application/conpherence/widget-pane.css
+++ b/webroot/rsrc/css/application/conpherence/widget-pane.css
@@ -6,13 +6,13 @@
.loading .widgets-loading-mask {
position: fixed;
right: 0px;
+ top: 76px;
+ bottom: 0;
width: 240px;
border-width: 0 0 0 1px;
border-color: {$lightblueborder};
border-style: solid;
overflow-y: auto;
- background: #fff;
- height: 100%;
-webkit-overflow-scrolling: touch;
}
@@ -68,15 +68,19 @@
}
.conpherence-widget-pane .widgets-body {
+ position: fixed;
overflow-y: auto;
+ bottom: 0;
+ top: 76px;
width: 100%;
}
#widgets-settings {
padding: 3px 6px;
}
.device-desktop .conpherence-widget-pane .widgets-body {
+ top: 108px;
width: 240px;
}

File Metadata

Mime Type
text/x-diff
Storage Engine
amazon-s3
Storage Format
Raw Data
Storage Handle
phabricator/sk/te/3ci37y4b7optzy3n
Default Alt Text
D7696.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility