From 6c2550e79226f04c93944c91e7c2e7447cd328c3 Mon Sep 17 00:00:00 2001
From: Nicolas Kruchten <nicolas@datacratic.com>
Date: Tue, 28 Aug 2018 15:32:46 -0400
Subject: [PATCH 1/3] narrowing sidebar from 120px to 100px and panel from
 345px to 335px

---
 src/DefaultEditor.js                     | 4 ++--
 src/styles/components/fields/_field.scss | 2 +-
 src/styles/variables/_layout.scss        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/DefaultEditor.js b/src/DefaultEditor.js
index 365bc6bcb..3f8a2c675 100644
--- a/src/DefaultEditor.js
+++ b/src/DefaultEditor.js
@@ -73,13 +73,13 @@ class DefaultEditor extends Component {
         {logo ? logo : null}
         <GraphCreatePanel group={_('Graph')} name={_('Create')} />
         <GraphSubplotsPanel group={_('Graph')} name={_('Subplots')} />
-        {this.hasTransforms() && <GraphTransformsPanel group={_('Graph')} name={_('Transforms')} />}
+        {this.hasTransforms() && <GraphTransformsPanel group={_('Graph')} name={_('Transform')} />}
         <StyleTracesPanel group={_('Style')} name={_('Traces')} />
         <StyleLayoutPanel group={_('Style')} name={_('Layout')} />
         {this.hasAxes() && <StyleAxesPanel group={_('Style')} name={_('Axes')} />}
         <StyleLegendPanel group={_('Style')} name={_('Legend')} />
         {this.hasColorbars() && <StyleColorbarsPanel group={_('Style')} name={_('Color Bars')} />}
-        <StyleNotesPanel group={_('Style')} name={_('Annotations')} />
+        <StyleNotesPanel group={_('Style')} name={_('Annotate')} />
         <StyleShapesPanel group={_('Style')} name={_('Shapes')} />
         <StyleImagesPanel group={_('Style')} name={_('Images')} />
         {this.hasSliders() && <StyleSlidersPanel group={_('Style')} name={_('Sliders')} />}
diff --git a/src/styles/components/fields/_field.scss b/src/styles/components/fields/_field.scss
index 664d38209..d4ae48a20 100644
--- a/src/styles/components/fields/_field.scss
+++ b/src/styles/components/fields/_field.scss
@@ -40,7 +40,7 @@
     align-self: center;
   }
   &__title {
-    width: 30%;
+    width: 80px;
     //flex-shrink:0;
     padding-left: var(--spacing-half-unit);
     display: block;
diff --git a/src/styles/variables/_layout.scss b/src/styles/variables/_layout.scss
index 8d03afacf..6b979a210 100644
--- a/src/styles/variables/_layout.scss
+++ b/src/styles/variables/_layout.scss
@@ -1,5 +1,5 @@
 /*
  * Layout
  */
-$layout-panel-width: 345px;
-$layout-sidebar-width: 120px;
+$layout-panel-width: 335px;
+$layout-sidebar-width: 100px;

From 9d816f9c623f7526d976807b55c371511ed2cd2d Mon Sep 17 00:00:00 2001
From: Nicolas Kruchten <nicolas@datacratic.com>
Date: Tue, 28 Aug 2018 16:22:21 -0400
Subject: [PATCH 2/3] various width fixes

---
 src/components/fields/RectanglePositioner.js | 179 ++++++++++---------
 src/components/widgets/SymbolSelector.js     |  12 +-
 2 files changed, 93 insertions(+), 98 deletions(-)

diff --git a/src/components/fields/RectanglePositioner.js b/src/components/fields/RectanglePositioner.js
index f092c2c63..d5d17960f 100644
--- a/src/components/fields/RectanglePositioner.js
+++ b/src/components/fields/RectanglePositioner.js
@@ -6,7 +6,7 @@ import ResizableRect from 'react-resizable-rotatable-draggable';
 import RadioBlocks from '../widgets/RadioBlocks';
 import DualNumeric from './DualNumeric';
 
-const maxWidth = 286;
+const maxWidth = 276;
 const gridRes = 8;
 
 class UnconnectedRectanglePositioner extends Component {
@@ -77,94 +77,97 @@ class UnconnectedRectanglePositioner extends Component {
     }
 
     return (
-      <Field {...this.props} attr={attr}>
-        <Field label={_('Snap to Grid')}>
-          <RadioBlocks
-            alignment="center"
-            onOptionChange={snap => this.setState({snap: snap})}
-            activeOption={this.state.snap}
-            options={[{label: _('On'), value: true}, {label: _('Off'), value: false}]}
-          />
-        </Field>
-        <div
-          className="rect-container"
-          style={{
-            width: fieldWidthPx + 1,
-            height: fieldHeightPx + 1,
-          }}
-        >
-          {Array(gridRes * gridRes)
-            .fill(0)
-            .map((v, i) => (
-              <div
-                key={i}
-                className="rect-grid"
-                style={{
-                  width: fieldWidthPx / gridRes - 1,
-                  height: fieldHeightPx / gridRes - 1,
-                  borderBottom: i < gridRes * (gridRes - 1) ? '0' : '1px solid ',
-                  borderRight: (i + 1) % gridRes ? '0' : '1px solid',
-                }}
-              />
-            ))}
-          <ResizableRect
-            bounds="parent"
-            width={width}
-            height={height}
-            left={left}
-            top={top}
-            rotatable={false}
-            draggable={!this.state.snap}
-            zoomable={zoomable}
-            onResize={style => {
-              this.sendUpdate({
-                fieldWidthPx,
-                fieldHeightPx,
-                width: style.width,
-                height: style.height,
-                x: style.left,
-                y: style.top,
-              });
-            }}
-            onDrag={(deltaX, deltaY) => {
-              this.sendUpdate({
-                fieldWidthPx,
-                fieldHeightPx,
-                width,
-                height,
-                x: left + deltaX,
-                y: top + deltaY,
-              });
+      <div style={{marginRight: 25}}>
+        <Field {...this.props} attr={attr}>
+          <Field label={_('Snap to Grid')}>
+            <RadioBlocks
+              alignment="center"
+              onOptionChange={snap => this.setState({snap: snap})}
+              activeOption={this.state.snap}
+              options={[{label: _('On'), value: true}, {label: _('Off'), value: false}]}
+            />
+          </Field>
+          <div
+            className="rect-container"
+            style={{
+              width: fieldWidthPx + 1,
+              height: fieldHeightPx + 1,
+              margin: '0 auto',
             }}
-          />
-        </div>
-        {fullContainer.xaxis && fullContainer.xaxis.overlaying ? (
-          ''
-        ) : (
-          <DualNumeric
-            label={_('X')}
-            attr={this.attr.x[0]}
-            attr2={this.attr.x[1]}
-            percentage
-            step={1}
-            min={0}
-            max={100}
-          />
-        )}
-        {fullContainer.yaxis && fullContainer.yaxis.overlaying ? (
-          ''
-        ) : (
-          <DualNumeric
-            label={_('Y')}
-            attr={this.attr.y[0]}
-            attr2={this.attr.y[1]}
-            percentage
-            step={1}
-            min={0}
-            max={100}
-          />
-        )}
-      </Field>
+          >
+            {Array(gridRes * gridRes)
+              .fill(0)
+              .map((v, i) => (
+                <div
+                  key={i}
+                  className="rect-grid"
+                  style={{
+                    width: fieldWidthPx / gridRes - 1,
+                    height: fieldHeightPx / gridRes - 1,
+                    borderBottom: i < gridRes * (gridRes - 1) ? '0' : '1px solid ',
+                    borderRight: (i + 1) % gridRes ? '0' : '1px solid',
+                  }}
+                />
+              ))}
+            <ResizableRect
+              bounds="parent"
+              width={width}
+              height={height}
+              left={left}
+              top={top}
+              rotatable={false}
+              draggable={!this.state.snap}
+              zoomable={zoomable}
+              onResize={style => {
+                this.sendUpdate({
+                  fieldWidthPx,
+                  fieldHeightPx,
+                  width: style.width,
+                  height: style.height,
+                  x: style.left,
+                  y: style.top,
+                });
+              }}
+              onDrag={(deltaX, deltaY) => {
+                this.sendUpdate({
+                  fieldWidthPx,
+                  fieldHeightPx,
+                  width,
+                  height,
+                  x: left + deltaX,
+                  y: top + deltaY,
+                });
+              }}
+            />
+          </div>
+          {fullContainer.xaxis && fullContainer.xaxis.overlaying ? (
+            ''
+          ) : (
+            <DualNumeric
+              label={_('X')}
+              attr={this.attr.x[0]}
+              attr2={this.attr.x[1]}
+              percentage
+              step={1}
+              min={0}
+              max={100}
+            />
+          )}
+          {fullContainer.yaxis && fullContainer.yaxis.overlaying ? (
+            ''
+          ) : (
+            <DualNumeric
+              label={_('Y')}
+              attr={this.attr.y[0]}
+              attr2={this.attr.y[1]}
+              percentage
+              step={1}
+              min={0}
+              max={100}
+            />
+          )}
+        </Field>
+      </div>
     );
   }
 }
diff --git a/src/components/widgets/SymbolSelector.js b/src/components/widgets/SymbolSelector.js
index 687e170bf..6cc947582 100644
--- a/src/components/widgets/SymbolSelector.js
+++ b/src/components/widgets/SymbolSelector.js
@@ -1,7 +1,6 @@
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import ModalBox from '../containers/ModalBox';
 import {CarretDownIcon} from 'plotly-icons';
 
 export default class SymbolSelector extends Component {
@@ -78,10 +77,7 @@ export default class SymbolSelector extends Component {
         <div
           className="symbol-selector__item"
           key={value}
-          onClick={() => {
-            this.props.onChange(value);
-            this.togglePanel();
-          }}
+          onClick={() => this.props.onChange(value)}
         >
           <svg width="28" height="28" className="symbol-selector__symbol" data-value={value}>
             <g transform="translate(14,14)">
@@ -107,11 +103,7 @@ export default class SymbolSelector extends Component {
             <CarretDownIcon className="symbol-selector__toggle__caret" />
           </span>
         </div>
-        {isOpen ? (
-          <ModalBox onClose={this.togglePanel} backgroundDark={this.props.backgroundDark}>
-            {this.renderOptions()}
-          </ModalBox>
-        ) : null}
+        {isOpen && this.renderOptions()}
       </div>
     );
   }

From 2a1c2ddf0de9c8e7b49908c98788d039cc096507 Mon Sep 17 00:00:00 2001
From: Nicolas Kruchten <nicolas@datacratic.com>
Date: Tue, 28 Aug 2018 16:23:42 -0400
Subject: [PATCH 3/3] CSS

---
 src/components/fields/RectanglePositioner.js | 1 -
 src/styles/components/fields/_field.scss     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/fields/RectanglePositioner.js b/src/components/fields/RectanglePositioner.js
index d5d17960f..c14478b34 100644
--- a/src/components/fields/RectanglePositioner.js
+++ b/src/components/fields/RectanglePositioner.js
@@ -92,7 +92,6 @@ class UnconnectedRectanglePositioner extends Component {
             style={{
               width: fieldWidthPx + 1,
               height: fieldHeightPx + 1,
-              margin: '0 auto',
             }}
           >
             {Array(gridRes * gridRes)
diff --git a/src/styles/components/fields/_field.scss b/src/styles/components/fields/_field.scss
index d4ae48a20..3ca30b05b 100644
--- a/src/styles/components/fields/_field.scss
+++ b/src/styles/components/fields/_field.scss
@@ -89,7 +89,7 @@
     border-left: 1px solid;
   }
   .rect-container {
-    margin: var(--spacing-eighth-unit) auto var(--spacing-quarter-unit) auto;
+    margin: 0 auto;
     position: relative;
     max-width: 294px;
   }