Merge branch 'beta'

# Conflicts: # babel/App.js # babel/Editor.js # babel/Info.js # babel/Preview.js # dist/css/stylesheet.css # dist/index.html # dist/js/App.js # dist/js/Editor.js # dist/js/Info.js # dist/js/Overlays.js # dist/js/Preview.js # dist/js/index.js
Andrea · May 19, 2018 · 9ea8b33 · 9ea8b33
1 parent 66de1a2
commit 9ea8b33
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 160 deletions.
diff --git a/babel/App.js b/babel/App.js
@@ -881,7 +881,6 @@ PPPPPPPPPP            RRRRRRRR     RRRRRRR  EEEEEEEEEEEEEEEEEEEEEE
       this.update();
     });
 
-
   }
 
 }

diff --git a/babel/Editor.js b/babel/Editor.js
@@ -49,6 +49,10 @@ class Editor extends Window_Controls
 
   }
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> beta
   update(all_data)
   {
     this.canvas_element.width = this.width;
@@ -179,7 +183,6 @@ class Editor extends Window_Controls
   get_grid() { return this.grid; }
 
 
-
 }
 
 
diff --git a/babel/Preview.js b/babel/Preview.js
@@ -40,6 +40,7 @@ class Preview extends Window_Controls
 
   }
 
+
   update(all_data)
   {
     this.canvas_element.width = this.width;

diff --git a/dist/css/stylesheet.css b/dist/css/stylesheet.css
@@ -726,6 +726,11 @@ img.center
     padding: .5em .5em;
 }
 
+.list.ui-dialog-content
+{
+  /* list window should not scroll */
+  overflow: hidden;
+}
 
 .colors.ui-dialog-content
 {

diff --git a/dist/js/Overlays.js b/dist/js/Overlays.js
diff --git a/dist/js/Playfield.js b/dist/js/Playfield.js
diff --git a/dist/js/index.js b/dist/js/index.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -881,7 +881,6 @@ PPPPPPPPPP RRRRRRRR RRRRRRR EEEEEEEEEEEEEEEEEEEEEE @@
           this.update();
         });
       }
     }
@@ Expand Down @@