Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-14 03:50:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'alexgleason-fixbug-1298'

Browse source
This commit is contained in:
Matt Westcott 2015-10-23 10:00:02 +01:00
commit 8162003eb4
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -35,6 +35,7 @@ Changelog
* Fix: The "view live" button displayed after publishing a page now correctly reflects any changes made to the page slug (Ryan Pineo)
* Fix: API endpoints now accept and ignore the `_` query parameter used by jQuery for cache-busting
* Fix: Page slugs are no longer cut off when Unicode characters are expanded into multiple characters (Sævar Öfjörð Magnússon)
* Fix: Scrolling an over-long explorer menu no longer causes white background to show through (Alex Gleason)
1.1 (15.09.2015)
~~~~~~~~~~~~~~~~

1
docs/releases/1.2.rst
View file

@ -82,6 +82,7 @@ Bug fixes
* The "view live" button displayed after publishing a page now correctly reflects any changes made to the page slug (Ryan Pineo)
* API endpoints now accept and ignore the ``_`` query parameter used by jQuery for cache-busting
* Page slugs are no longer cut off when Unicode characters are expanded into multiple characters (Sævar Öfjörð Magnússon)
* Scrolling an over-long explorer menu no longer causes white background to show through (Alex Gleason)
Upgrade considerations
======================

12
wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/main-nav.scss
View file

@ -3,12 +3,15 @@ $submenu-color:darken($color-grey-1, 5%);
.nav-wrapper{
position: relative;
background: $color-grey-1;
margin-left: -$menu-width;
width: $menu-width;
float: left;
height:100%;
min-height:800px;
background: $color-grey-1;
.inner {
background: $color-grey-1;
}
}
#nav-toggle{
left: $mobile-nice-padding;
@ -278,7 +281,6 @@ body.explorer-open {
.footer{
padding-top:1em;
background-color:$color-grey-1;
position:fixed;
width:$menu-width - 7;
bottom:0;
@ -404,7 +406,7 @@ body.explorer-open {
}
/* Media query hacks to detect IE10+ which doesn't support 3d transform of static elements and needs a fallback */
@media all and (-ms-high-contrast: none),
@media all and (-ms-high-contrast: none),
all and (-ms-high-contrast: active) {
.wrapper{
@include transition(left 0.2s ease);
@ -414,7 +416,7 @@ body.explorer-open {
.wrapper{
@include transform(none);
left:$menu-width;
position:relative
position:relative
}
}
body.explorer-open {
@ -428,7 +430,7 @@ body.explorer-open {
}
}
@media all and (min-width: $breakpoint-mobile) and (-ms-high-contrast: none),
@media all and (min-width: $breakpoint-mobile) and (-ms-high-contrast: none),
all and (min-width: $breakpoint-mobile) and (-ms-high-contrast: active){
body.explorer-open{
.wrapper {