diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d8e3e22303..e9a86b8bd5 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -13,6 +13,7 @@ Changelog * Fix: Locked pages can no longer be unpublished (Alex Bridge) * Fix: Site records now implement `get_by_natural_key` * Fix: Creating pages at the root level (and any other instances of the base `Page` model) now properly respects the `parent_page_types` setting + * Fix: Settings menu now opens correctly from the page editor and styleguide views 1.2 (12.11.2015) ~~~~~~~~~~~~~~~~ diff --git a/docs/releases/1.3.rst b/docs/releases/1.3.rst index 8db041b2a9..28426fa368 100644 --- a/docs/releases/1.3.rst +++ b/docs/releases/1.3.rst @@ -28,6 +28,7 @@ Bug fixes * Locked pages can no longer be unpublished (Alex Bridge) * Site records now implement ``get_by_natural_key`` * Creating pages at the root level (and any other instances of the base ``Page`` model) now properly respects the `parent_page_types` setting + * Settings menu now opens correctly from the page editor and styleguide views Upgrade considerations diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/icons.scss index 188b6af3f8..26bab4a731 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/icons.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/icons.scss @@ -264,8 +264,6 @@ .icon-spinner:after { width: 1em; animation: spin 0.5s infinite linear; - -webkit-animation: spin 0.5s infinite linear; - -moz-animation: spin 0.5s infinite linear; content: '1'; } @@ -376,23 +374,3 @@ transform: rotate(360deg); } } - -@-webkit-keyframes spin { - from { - -webkit-transform: rotate(0deg); - } - - to { - -webkit-transform: rotate(360deg); - } -} - -@-moz-keyframes spin { - from { - -moz-transform: rotate(0deg); - } - - to { - -moz-transform: rotate(360deg); - } -} 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 7a63bc77fd..363a95e0fd 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/main-nav.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/main-nav.scss @@ -324,6 +324,7 @@ body.explorer-open { } .nav-submenu { + transform: translate3d(0, 0, 0); position: fixed; height: 100%; width: 0;