Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: More iPad fixes for the timeline

This commit is contained in:
Robin Ward 2016-05-20 11:49:54 -04:00
parent 8a047e2708
commit c046b003db
No known key found for this signature in database
GPG Key ID: 0E091E2B4ED1B83D
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
View File

@ -178,9 +178,6 @@ createWidget('topic-timeline-container', {
buildAttributes(attrs) { buildAttributes(attrs) {
if (attrs.dockAt) { if (attrs.dockAt) {
if (this.capabilities.isIOS) {
return { style: `display: none` };
}
return { style: `top: ${attrs.dockAt}px` }; return { style: `top: ${attrs.dockAt}px` };
}; };

3
app/assets/stylesheets/desktop/topic-timeline.scss
View File

@ -3,11 +3,11 @@
} }
.timeline-container { .timeline-container {
width: 100%;
box-sizing: border-box; box-sizing: border-box;
z-index: 1; z-index: 1;
margin-left: 757px; margin-left: 757px;
position: fixed; position: fixed;
-webkit-transform: translate3d(0,0,0);
&.timeline-docked { &.timeline-docked {
position: absolute; position: absolute;
@ -32,6 +32,7 @@
border-left: 1px solid; border-left: 1px solid;
border-color: dark-light-choose(scale-color($tertiary, $lightness: 80%), scale-color($tertiary, $lightness: 20%)); border-color: dark-light-choose(scale-color($tertiary, $lightness: 80%), scale-color($tertiary, $lightness: 20%));
position: relative; position: relative;
-webkit-transform: translate3d(0,0,0);
} }
.timeline-padding { .timeline-padding {