From 1a6ef9d7e2bd8bc37e923deaf078ed6d4154545f Mon Sep 17 00:00:00 2001 From: Corey Johnson & Nathan Sobo Date: Thu, 10 May 2012 18:00:58 -0600 Subject: [PATCH] Revert "Temporarily disable gutter. Add transition affect to margin-top." This reverts commit 811e5264cf9197f312ed4536443afe312c7664f2. --- src/app/editor.coffee | 10 +++++----- static/editor.css | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/app/editor.coffee b/src/app/editor.coffee index b385d401a..3223c7e61 100644 --- a/src/app/editor.coffee +++ b/src/app/editor.coffee @@ -214,11 +214,11 @@ class Editor extends View @lines.css('margin-top', -@scrollbar.scrollTop() % @lineHeight) # @scroller.scrollTop(@scrollbar.scrollTop()) - # @gutter.scrollTop(@scrollbar.scrollTop()) - # if @scroller.scrollLeft() == 0 - # @gutter.removeClass('drop-shadow') - # else - # @gutter.addClass('drop-shadow') + @gutter.scrollTop(@scrollbar.scrollTop()) + if @scroller.scrollLeft() == 0 + @gutter.removeClass('drop-shadow') + else + @gutter.addClass('drop-shadow') $(window).on "resize", => @updateLines() diff --git a/static/editor.css b/static/editor.css index 91d9e9d60..782a86528 100644 --- a/static/editor.css +++ b/static/editor.css @@ -62,7 +62,6 @@ .editor .lines { position: relative; - -webkit-transition: margin-top 30ms ease-in-out; display: table; width: 100%; height: 100%;