Page MenuHomePhabricator
Files F13988083

D12007.id28906.diff
No OneTemporary
Actions

D12007.id28906.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
@@ -207,7 +207,7 @@
'rsrc/externals/javelin/lib/Resource.js' => '44959b73',
'rsrc/externals/javelin/lib/Routable.js' => 'b3e7d692',
'rsrc/externals/javelin/lib/Router.js' => '29274e2b',
- 'rsrc/externals/javelin/lib/Scrollbar.js' => '5b2f5a08',
+ 'rsrc/externals/javelin/lib/Scrollbar.js' => '1ed54a27',
'rsrc/externals/javelin/lib/URI.js' => '6eff08aa',
'rsrc/externals/javelin/lib/Vector.js' => '2caa8fb8',
'rsrc/externals/javelin/lib/WebSocket.js' => 'e292eaf4',
@@ -676,7 +676,7 @@
'javelin-resource' => '44959b73',
'javelin-routable' => 'b3e7d692',
'javelin-router' => '29274e2b',
- 'javelin-scrollbar' => '5b2f5a08',
+ 'javelin-scrollbar' => '1ed54a27',
'javelin-stratcom' => '6c53634d',
'javelin-tokenizer' => '7644823e',
'javelin-typeahead' => '70baed2f',
@@ -942,6 +942,12 @@
'javelin-dom',
'javelin-reactor-dom',
),
+ '1ed54a27' => array(
+ 'javelin-install',
+ 'javelin-dom',
+ 'javelin-stratcom',
+ 'javelin-vector',
+ ),
'2035b9cb' => array(
'javelin-behavior',
'javelin-dom',
@@ -1175,12 +1181,6 @@
'javelin-vector',
'javelin-dom',
),
- '5b2f5a08' => array(
- 'javelin-install',
- 'javelin-dom',
- 'javelin-stratcom',
- 'javelin-vector',
- ),
'5bc2cb21' => array(
'javelin-behavior',
'javelin-stratcom',
diff --git a/src/view/layout/AphrontSideNavFilterView.php b/src/view/layout/AphrontSideNavFilterView.php
--- a/src/view/layout/AphrontSideNavFilterView.php
+++ b/src/view/layout/AphrontSideNavFilterView.php
@@ -318,7 +318,7 @@
phutil_tag(
'div',
array(
- 'class' => 'phabricator-nav-content mlb',
+ 'class' => 'phabricator-nav-content plb',
'id' => $content_id,
),
array(
diff --git a/webroot/rsrc/externals/javelin/lib/Scrollbar.js b/webroot/rsrc/externals/javelin/lib/Scrollbar.js
--- a/webroot/rsrc/externals/javelin/lib/Scrollbar.js
+++ b/webroot/rsrc/externals/javelin/lib/Scrollbar.js
@@ -320,10 +320,15 @@
var spos = JX.Vector.getAggregateScrollForNode(this._viewport);
var vdim = JX.Vector.getDim(this._viewport);
- var ratio = vdim.y / cdim.y;
+ var ratio = (vdim.y / cdim.y);
+
+ // We're scaling things down very slightly to leave a 2px margin at
+ // either end of the scroll gutter, so the bar doesn't quite bump up
+ // against the chrome.
+ ratio = ratio * (vdim.y / (vdim.y + 4));
var offset = Math.round(ratio * spos.y) + 2;
- var size = Math.floor(ratio * (vdim.y - 2)) - 2;
+ var size = Math.floor(ratio * vdim.y);
if (size < cdim.y) {
this._handle.style.top = offset + 'px';

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 22, 1:03 PM (3 w, 13 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6741847
Default Alt Text
D12007.id28906.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility