From ac68db97b9c8f8429b58505a5d0866bfaee64650 Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Tue, 23 Aug 2016 13:33:10 +0200 Subject: [PATCH 1/4] fixes tile size in edit canvas --- app/assets/javascripts/projects/canvas.js | 4 ++-- app/assets/stylesheets/projects.scss | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/projects/canvas.js b/app/assets/javascripts/projects/canvas.js index b5bf108d8..517ebda27 100644 --- a/app/assets/javascripts/projects/canvas.js +++ b/app/assets/javascripts/projects/canvas.js @@ -78,8 +78,8 @@ var GRID_DIST_SMALL_Y = 100; UPDATE my_modules SET x=x*32, y=y*16 themodel.connection.execute("UPDATE my_modules SET x=x*32, y=y*16") */ -var GRID_DIST_FULL_X = 12; -var GRID_DIST_FULL_Y = 12; +var GRID_DIST_FULL_X = 10; +var GRID_DIST_FULL_Y = 10; var GRID_DIST_MEDIUM_X = 8; var GRID_DIST_MEDIUM_Y = 8; var GRID_DIST_SMALL_X = 5; diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 938ebf207..84891c8d6 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -159,7 +159,8 @@ path, ._jsPlumb_endpoint { } } .module { - width: 250px; + width: 290px; + height: 130px; cursor: pointer; position: absolute; display: block; From 86ed4c18d862e583bb72d6b9e0c5bf4a717129d0 Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Tue, 23 Aug 2016 13:51:20 +0200 Subject: [PATCH 2/4] fixes hound --- app/assets/stylesheets/projects.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 84891c8d6..19341e5a7 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -159,11 +159,11 @@ path, ._jsPlumb_endpoint { } } .module { - width: 290px; - height: 130px; cursor: pointer; - position: absolute; display: block; + height: 130px; + position: absolute; + width: 290px; .panel-heading { height: 40px; From 126cf0c2105e3a48bb8bbea20efb6e36d44e913f Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Tue, 23 Aug 2016 16:08:05 +0200 Subject: [PATCH 3/4] fixes drag connections area --- app/assets/stylesheets/projects.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 19341e5a7..05aec6748 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -161,7 +161,6 @@ path, ._jsPlumb_endpoint { .module { cursor: pointer; display: block; - height: 130px; position: absolute; width: 290px; @@ -174,7 +173,7 @@ path, ._jsPlumb_endpoint { } } .panel-body { - height: 45px; + height: 90px; } .ep { From d04df349d5ec12d5274072b96df209df8731ed1c Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Wed, 24 Aug 2016 14:18:12 +0200 Subject: [PATCH 4/4] fixes medium and small zoom --- app/assets/javascripts/projects/canvas.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/projects/canvas.js b/app/assets/javascripts/projects/canvas.js index 517ebda27..60b1ed2f0 100644 --- a/app/assets/javascripts/projects/canvas.js +++ b/app/assets/javascripts/projects/canvas.js @@ -80,9 +80,9 @@ var GRID_DIST_SMALL_Y = 100; */ var GRID_DIST_FULL_X = 10; var GRID_DIST_FULL_Y = 10; -var GRID_DIST_MEDIUM_X = 8; -var GRID_DIST_MEDIUM_Y = 8; -var GRID_DIST_SMALL_X = 5; +var GRID_DIST_MEDIUM_X = 7.3; +var GRID_DIST_MEDIUM_Y = 4; +var GRID_DIST_SMALL_X = 2.4; var GRID_DIST_SMALL_Y = 5; var SUBMIT_FORM_NAME_SEPARATOR = "|";