Merge pull request #79 from concord-consortium/185267555-drawing-tool…

…-wider-layout Support new wideLayout option for use with labbook interactive. (PT-185267555)
concord-consortium · Jun 14, 2023 · cb0536e · cb0536e
2 parents da3f176 + d55eb5f
commit cb0536e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/app/scripts/ui/ui-manager.js b/app/scripts/ui/ui-manager.js
@@ -11,6 +11,9 @@ function UIManager(drawingTool) {
     .addClass('dt-tools')
     .prependTo(drawingTool.$element);
 
+  // Toolbar should be the height of the canvas.
+  this.$tools.css("height", this.drawingTool.options.height);
+
   this._palettes = {};
   this._buttons = {};
   this._paletteActiveButton = {};

diff --git a/app/styles/drawing-tool.scss b/app/styles/drawing-tool.scss
@@ -80,6 +80,8 @@ $text: Arial, sans-serif;
     margin: 0;
     position: relative;
 
+    background-color: #f5fbfc;
+
     border: $border;
     border-radius: $borderRadius 0 0 $borderRadius;
     border-right: none;

diff --git a/dist/drawing-tool.js b/dist/drawing-tool.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "drawing-tool",
   "description": "HTML5 Drawing Tool",
   "author": "",
-  "version": "2.2.1",
+  "version": "2.3.0-pre.1",
   "bugs": {
     "url": "https://github.com/concord-consortium/drawing-tool/issues"
   },