Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15414828
D12789.id30742.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
6 KB
Referenced Files
None
Subscribers
None
D12789.id30742.diff
View Options
diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
*/
return array(
'names' => array(
- 'core.pkg.css' => 'a821cfc9',
+ 'core.pkg.css' => 'ae5559e5',
'core.pkg.js' => '919c56b5',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => 'bb338e4b',
@@ -37,7 +37,7 @@
'rsrc/css/application/base/main-menu-view.css' => '663e3810',
'rsrc/css/application/base/notification-menu.css' => '3c9d8aa1',
'rsrc/css/application/base/phabricator-application-launch-view.css' => '16ca323f',
- 'rsrc/css/application/base/standard-page-view.css' => 'd3e1abe9',
+ 'rsrc/css/application/base/standard-page-view.css' => '2acd4611',
'rsrc/css/application/chatlog/chatlog.css' => '852140ff',
'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4',
'rsrc/css/application/config/config-options.css' => '7fedf08b',
@@ -45,11 +45,11 @@
'rsrc/css/application/config/config-welcome.css' => '6abd79be',
'rsrc/css/application/config/setup-issue.css' => '22270af2',
'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
- 'rsrc/css/application/conpherence/durable-column.css' => '2e68a92f',
+ 'rsrc/css/application/conpherence/durable-column.css' => 'df164abf',
'rsrc/css/application/conpherence/menu.css' => 'f389e048',
'rsrc/css/application/conpherence/message-pane.css' => '0e75feef',
'rsrc/css/application/conpherence/notification.css' => 'd208f806',
- 'rsrc/css/application/conpherence/transaction.css' => '885433f0',
+ 'rsrc/css/application/conpherence/transaction.css' => '42a457f6',
'rsrc/css/application/conpherence/update.css' => '1099a660',
'rsrc/css/application/conpherence/widget-pane.css' => '2af42ebe',
'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4',
@@ -108,7 +108,7 @@
'rsrc/css/application/slowvote/slowvote.css' => '266df6a1',
'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
'rsrc/css/application/uiexample/example.css' => '528b19de',
- 'rsrc/css/core/core.css' => '76e8ee93',
+ 'rsrc/css/core/core.css' => 'aaea7a7a',
'rsrc/css/core/remarkup.css' => '0037bdbf',
'rsrc/css/core/syntax.css' => '6b7b24d9',
'rsrc/css/core/z-index.css' => '3b612549',
@@ -512,12 +512,12 @@
'conduit-api-css' => '7bc725c4',
'config-options-css' => '7fedf08b',
'config-welcome-css' => '6abd79be',
- 'conpherence-durable-column-view' => '2e68a92f',
+ 'conpherence-durable-column-view' => 'df164abf',
'conpherence-menu-css' => 'f389e048',
'conpherence-message-pane-css' => '0e75feef',
'conpherence-notification-css' => 'd208f806',
'conpherence-thread-manager' => '9e507b59',
- 'conpherence-transaction-css' => '885433f0',
+ 'conpherence-transaction-css' => '42a457f6',
'conpherence-update-css' => '1099a660',
'conpherence-widget-pane-css' => '2af42ebe',
'differential-changeset-view-css' => 'e19cfd6e',
@@ -718,7 +718,7 @@
'phabricator-busy' => '59a7976a',
'phabricator-chatlog-css' => '852140ff',
'phabricator-content-source-view-css' => '4b8b05d4',
- 'phabricator-core-css' => '76e8ee93',
+ 'phabricator-core-css' => 'aaea7a7a',
'phabricator-countdown-css' => '86b7b0a0',
'phabricator-dashboard-css' => '17937d22',
'phabricator-drag-and-drop-file-upload' => '07de8873',
@@ -747,7 +747,7 @@
'phabricator-side-menu-view-css' => 'c1db9e9c',
'phabricator-slowvote-css' => '266df6a1',
'phabricator-source-code-view-css' => '2ceee894',
- 'phabricator-standard-page-view' => 'd3e1abe9',
+ 'phabricator-standard-page-view' => '2acd4611',
'phabricator-textareautils' => '5c93c52c',
'phabricator-title' => 'df5e11d2',
'phabricator-tooltip' => '1d298e3a',
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -377,15 +377,6 @@
}
}
- if (!$this->isQuicksandBlacklistURI()) {
- Javelin::initBehavior(
- 'scrollbar',
- array(
- 'nodeID' => 'phabricator-standard-page',
- 'isMainContent' => true,
- ));
- }
-
$main_page = phutil_tag(
'div',
array(
diff --git a/webroot/rsrc/css/application/base/standard-page-view.css b/webroot/rsrc/css/application/base/standard-page-view.css
--- a/webroot/rsrc/css/application/base/standard-page-view.css
+++ b/webroot/rsrc/css/application/base/standard-page-view.css
@@ -126,27 +126,6 @@
margin: 2px 2px -2px 0;
}
-.main-page-frame {
- position: absolute;
- top: 0;
- bottom: 0;
- right: 0;
- left: 0;
- overflow: hidden;
-}
-
-.phabricator-standard-page {
- /* If we don't activate JX.Scrollbar because the default scrollbars are
- satisfactory, make sure the page still has sensible behavior. These
- settings will be overwritten by .jx-scrollbar-frame if JX.Scrollbar
- activates. */
- position: relative;
- height: 100%;
- overflow-y: scroll;
-
- -webkit-overflow-scrolling: touch;
-}
-
.jx-scrollbar-frame {
position: relative;
overflow: hidden;
diff --git a/webroot/rsrc/css/application/conpherence/durable-column.css b/webroot/rsrc/css/application/conpherence/durable-column.css
--- a/webroot/rsrc/css/application/conpherence/durable-column.css
+++ b/webroot/rsrc/css/application/conpherence/durable-column.css
@@ -3,7 +3,7 @@
*/
.with-durable-column .phabricator-standard-page {
- margin-right: 300px;
+ margin-right: 312px;
}
.with-durable-column
@@ -17,16 +17,17 @@
}
.with-durable-column .global-upload-mask {
- right: 300px;
+ right: 312px;
}
.conpherence-durable-column {
- position: absolute;
+ position: fixed;
top: 0;
bottom: 0;
- right: 0;
+ right: 12px;
width: 300px;
background: #fff;
+ box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1);
}
.conpherence-durable-column .loading-mask {
@@ -124,6 +125,7 @@
right: 0;
left: 0;
border-left: 1px solid {$lightblueborder};
+ border-right: 1px solid {$lightblueborder};
}
.conpherence-durable-column-main {
diff --git a/webroot/rsrc/css/core/core.css b/webroot/rsrc/css/core/core.css
--- a/webroot/rsrc/css/core/core.css
+++ b/webroot/rsrc/css/core/core.css
@@ -54,6 +54,10 @@
breaks lots of things and prevents you from using landscape to see more
columns in source code views. */
-webkit-text-size-adjust: none;
+
+ /* Prevent content from resizing abruptly when shifting between scrollable
+ and unscrollable pages. */
+ overflow-y: scroll;
}
textarea {
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mar 21 2025, 2:40 AM (7 w, 4 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7714816
Default Alt Text
D12789.id30742.diff (6 KB)
Attached To
Mode
D12789: Stop using JX.Scrollbar for main page content
Attached
Detach File
Event Timeline
Log In to Comment