Skip to content

Commit ba76526

Browse files
committed
Fix Conpherence layout with setup issues
Summary: Make Conpherence usable when there is a setup issue as well. Fixes T3427 Test Plan: Test an ongoing thread, create a new thread. Test mobile and tablet layouts. Reviewers: epriestley, btrahan Reviewed By: epriestley CC: Korvin, epriestley, aran Maniphest Tasks: T3427 Differential Revision: https://secure.phabricator.com/D7669
1 parent 280751f commit ba76526

File tree

4 files changed

+11
-18
lines changed

4 files changed

+11
-18
lines changed

src/__celerity_resource_map__.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,7 @@
993993
),
994994
'conpherence-menu-css' =>
995995
array(
996-
'uri' => '/res/cae40b18/rsrc/css/application/conpherence/menu.css',
996+
'uri' => '/res/4c356703/rsrc/css/application/conpherence/menu.css',
997997
'type' => 'css',
998998
'requires' =>
999999
array(
@@ -1002,7 +1002,7 @@
10021002
),
10031003
'conpherence-message-pane-css' =>
10041004
array(
1005-
'uri' => '/res/150f96d4/rsrc/css/application/conpherence/message-pane.css',
1005+
'uri' => '/res/3627d418/rsrc/css/application/conpherence/message-pane.css',
10061006
'type' => 'css',
10071007
'requires' =>
10081008
array(
@@ -1029,7 +1029,7 @@
10291029
),
10301030
'conpherence-widget-pane-css' =>
10311031
array(
1032-
'uri' => '/res/13478b94/rsrc/css/application/conpherence/widget-pane.css',
1032+
'uri' => '/res/b80fc69c/rsrc/css/application/conpherence/widget-pane.css',
10331033
'type' => 'css',
10341034
'requires' =>
10351035
array(

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

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

55
.conpherence-layout {
6-
position: fixed;
7-
bottom: 0;
8-
left: 0;
9-
right: 0;
10-
top: 44px;
11-
background: #fff;
6+
position: relative;
127
}
138

149
.conpherence-layout .conpherence-no-threads {
@@ -37,16 +32,17 @@
3732
position: absolute;
3833
overflow-x: hidden;
3934
overflow-y: auto;
40-
top: 0;
41-
bottom: 0;
4235
}
36+
4337
.device-desktop .conpherence-layout .conpherence-menu-pane,
4438
.device-desktop .conpherence-layout .phabricator-nav-column-background {
4539
width: 280px;
4640
}
41+
4742
.device .conpherence-menu-pane {
4843
top: 41px;
4944
}
45+
5046
.device .conpherence-role-list .conpherence-menu-pane {
5147
top: 0px;
5248
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
bottom: 0px;
1414
min-width: 300px;
1515
width: auto;
16+
background: #fff;
1617
}
1718

1819
.device .conpherence-message-pane,

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
.loading .widgets-loading-mask {
77
position: fixed;
88
right: 0px;
9-
top: 76px;
10-
bottom: 0px;
119
width: 240px;
1210
border-width: 0 0 0 1px;
13-
border-color: #CCC;
11+
border-color: {$lightblueborder};
1412
border-style: solid;
1513
overflow-y: auto;
14+
background: #fff;
15+
height: 100%;
1616
-webkit-overflow-scrolling: touch;
1717
}
1818

@@ -68,19 +68,15 @@
6868
}
6969

7070
.conpherence-widget-pane .widgets-body {
71-
position: fixed;
7271
overflow-y: auto;
73-
bottom: 0px;
7472
width: 100%;
75-
top: 76px;
7673
}
7774

7875
#widgets-settings {
7976
padding: 3px 6px;
8077
}
8178

8279
.device-desktop .conpherence-widget-pane .widgets-body {
83-
top: 108px;
8480
width: 240px;
8581
}
8682

0 commit comments

Comments
 (0)