cleanup after merge

3 files changed, 4 insertions, 7 deletions

diff --git a/app/css/app.css b/app/css/app.css
index d0abf83..1b32625 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -7,7 +7,6 @@
 
 .world {
 	position: relative;
-	background-color: lightyellow;
 	overflow: hidden;
 }
 
diff --git a/app/index.html b/app/index.html
index ac1f1a5..e7a7ea8 100644
--- a/app/index.html
+++ b/app/index.html
@@ -49,8 +49,6 @@
             <div data-pg-line="line" class="line" resize></div>
 
             <div data-ng-repeat="point in points" data-pg-draggable="point" class="point" style="top: {{point.y}}px; left: {{point.x}}px;" data-ng-class="{selected: point.selected==true}"><div></div></div>
-
-            <div data-ng-repeat="point in points | filter:{selected:true} | sliding2">{{point._1}}, {{point._2}}</div>
         </div>
 
         <ul>
diff --git a/app/js/directives.js b/app/js/directives.js
index d20c034..2ae53e6 100644
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -109,11 +109,11 @@ app.directive('pgDraggable', ['$document' , function($document) {
         function mousemove($event) {
           var dx = $event.clientX - initialMouseX;
           var dy = $event.clientY - initialMouseY;
-          var x = startY + dy;
-          var y = startX + dx;
+          var y = startY + dy;
+          var x = startX + dx;
           elm.css({
-            top: x + 'px',
-            left: y + 'px'
+            top: y + 'px',
+            left: x + 'px'
           });
           scope.point.x = x;
           scope.point.y = y;