From c046b003dbd0c723c09dd0539dd58db3513f5bfc Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 20 May 2016 11:49:54 -0400 Subject: [PATCH] FIX: More iPad fixes for the timeline --- app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 | 3 --- app/assets/stylesheets/desktop/topic-timeline.scss | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 index 8182655de20..590601138fa 100644 --- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 +++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 @@ -178,9 +178,6 @@ createWidget('topic-timeline-container', { buildAttributes(attrs) { if (attrs.dockAt) { - if (this.capabilities.isIOS) { - return { style: `display: none` }; - } return { style: `top: ${attrs.dockAt}px` }; }; diff --git a/app/assets/stylesheets/desktop/topic-timeline.scss b/app/assets/stylesheets/desktop/topic-timeline.scss index 8b609d6d6dc..92a9b4fa6e7 100644 --- a/app/assets/stylesheets/desktop/topic-timeline.scss +++ b/app/assets/stylesheets/desktop/topic-timeline.scss @@ -3,11 +3,11 @@ } .timeline-container { - width: 100%; box-sizing: border-box; z-index: 1; margin-left: 757px; position: fixed; + -webkit-transform: translate3d(0,0,0); &.timeline-docked { position: absolute; @@ -32,6 +32,7 @@ border-left: 1px solid; border-color: dark-light-choose(scale-color($tertiary, $lightness: 80%), scale-color($tertiary, $lightness: 20%)); position: relative; + -webkit-transform: translate3d(0,0,0); } .timeline-padding {