Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:koenbok/Framer

  • Loading branch information...
koenbok committed Apr 26, 2014
2 parents e175596 + c02f919 commit 2205ba01871ee32327d79e2f202b5196927d2e1f
Showing with 3 additions and 1 deletion.
  1. +2 −1 build/framer.js
  2. +1 −0 src/debug.coffee
@@ -2218,7 +2218,8 @@ require.define("/src/debug.coffee",function(require,module,exports,__dirname,__f
backgroundColor: "rgba(255,0,0,0.5)",
padding: "12px",
border: "1px solid rgba(255,0,0,0.5)",
borderRadius: "5px"
borderRadius: "5px",
zIndex: "99999"
};
errorView.scale = 0.5;
return errorView.animate({
@@ -11,6 +11,7 @@ exports.errorWarning = (e) ->
padding: "12px"
border: "1px solid rgba(255,0,0,0.5)"
borderRadius: "5px"
zIndex: "99999"
errorView.scale = 0.5
errorView.animate
properties: {scale:1.0}

0 comments on commit 2205ba0

Please sign in to comment.
You can’t perform that action at this time.