diff --git a/ghost/admin/assets/sass/layouts/content.scss b/ghost/admin/assets/sass/layouts/content.scss index ef8cfda14f..b75bfdab7c 100644 --- a/ghost/admin/assets/sass/layouts/content.scss +++ b/ghost/admin/assets/sass/layouts/content.scss @@ -14,6 +14,25 @@ } } +// Show/hide content list & preview on mobile +.content-list { + &.show-menu { + display: block; + } + &.show-content { + display: none; + } +} + +.content-preview { + &.show-menu { + display: none; + } + &.show-content { + display: block; + } +} + .content-list { width: 33%; padding: 15px; @@ -31,7 +50,6 @@ border: none; } - .content-filter { position: relative; z-index: 300; @@ -55,7 +73,6 @@ color: #fff !important; // getting overridden by floatingheader } - .content-list-content { position: absolute; top: 0; @@ -173,18 +190,16 @@ width: 67%; padding: 15px; position: absolute; - bottom:0; - top:0; - right:0; + bottom: 0; + top: 0; + right: 0; overflow: auto; -webkit-overflow-scrolling: touch; background: #fff; + @media (max-width: 900px) { - width: auto; - left: 100%; - right: -100%; - margin-left: 15px; - border:none; + width: 100%; + border: none; } .unfeatured { diff --git a/ghost/admin/assets/sass/layouts/default.scss b/ghost/admin/assets/sass/layouts/default.scss index 2eeb5d22b5..b06b0fb7ae 100644 --- a/ghost/admin/assets/sass/layouts/default.scss +++ b/ghost/admin/assets/sass/layouts/default.scss @@ -80,7 +80,9 @@ overflow: auto; -webkit-overflow-scrolling: touch; - transition: transform $side-outlet-transition-duration cubic-bezier(0.1, 0.7, 0.1, 1); + @media (min-width: 901px) { + transition: transform $side-outlet-transition-duration cubic-bezier(0.1, 0.7, 0.1, 1); + } &.outlet-pane-out-left { transform: translate3d(-100%, 0px, 0px); diff --git a/ghost/admin/views/posts.js b/ghost/admin/views/posts.js index d6a926a168..21960febc5 100644 --- a/ghost/admin/views/posts.js +++ b/ghost/admin/views/posts.js @@ -6,16 +6,15 @@ var PostsView = MobileParentView.extend({ // Mobile parent view callbacks showMenu: function () { - $('.js-content-list').animate({right: '0', left: '0', 'margin-right': '0'}, 300); - $('.js-content-preview').animate({right: '-100%', left: '100%', 'margin-left': '15px'}, 300); + $('.js-content-list').addClass('show-menu').removeClass('show-content'); + $('.js-content-preview').addClass('show-menu').removeClass('show-content'); }, showContent: function () { - $('.js-content-list').animate({right: '100%', left: '-100%', 'margin-right': '15px'}, 300); - $('.js-content-preview').animate({right: '0', left: '0', 'margin-left': '0'}, 300); + $('.js-content-list').addClass('show-content').removeClass('show-menu'); + $('.js-content-preview').addClass('show-content').removeClass('show-menu'); }, showAll: function () { - $('.js-content-list').removeAttr('style'); - $('.js-content-preview').removeAttr('style'); + $('.js-content-list, .js-content-preview').removeClass('show-menu show-content'); } });