diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0cca8c3e9..9de70dfbb 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -17,7 +17,8 @@ Changelog * Fix: Rich text editor is no longer broken in settings (Matt Westcott) * Fix: Link tooltip now shows correct urls for newly inserted document links (Matt Westcott) * Fix: Now page chooser (in a rich text editor) opens up at the link's parent page, rather than at the page itself (Matt Westcott) - + * Fix: Reverted fix for explorer menu scrolling with page content, as it blocked access to menus that exceed screen height + 1.5 (31.05.2016) ~~~~~~~~~~~~~~~~ diff --git a/docs/releases/1.5.1.rst b/docs/releases/1.5.1.rst index e3ead9cce..4d078c620 100644 --- a/docs/releases/1.5.1.rst +++ b/docs/releases/1.5.1.rst @@ -20,3 +20,5 @@ Bug fixes * Rich text editor is no longer broken in settings (Matt Westcott) * Link tooltip now shows correct urls for newly inserted document links (Matt Westcott) * Now page chooser (in a rich text editor) opens up at the link's parent page, rather than at the page itself (Matt Westcott) + * Reverted fix for explorer menu scrolling with page content, as it blocked access to menus that exceed screen height + \ No newline at end of file diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_main-nav.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_main-nav.scss index bc5503dd4..46e5006d5 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_main-nav.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_main-nav.scss @@ -385,14 +385,14 @@ body.explorer-open { .explorer { width: 400px; - position: fixed; - top: 0 !important; - left: $menu-width; + position: absolute; + top: 0; + left: 99%; margin-top: 175px; // same as .nav-main minus 1 pixel for border } .dl-menu { - position: fixed; + position: absolute; } body.nav-open {