aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFawn <fangrui_tong@brown.edu>2019-07-25 19:44:40 -0400
committerFawn <fangrui_tong@brown.edu>2019-07-25 19:44:40 -0400
commit1bedf9e23afe26a284ba4804672ad4f396402813 (patch)
treeb41177cba56db5e0a91e69671e3d25e3daa3a1c8
parent344e2563477fc4524cb287b55a9d5f29d64d4e14 (diff)
merge
-rw-r--r--src/client/views/collections/CollectionSchemaCells.tsx4
-rw-r--r--src/client/views/collections/CollectionSchemaView.scss5
2 files changed, 6 insertions, 3 deletions
diff --git a/src/client/views/collections/CollectionSchemaCells.tsx b/src/client/views/collections/CollectionSchemaCells.tsx
index d453fed47..4a618a436 100644
--- a/src/client/views/collections/CollectionSchemaCells.tsx
+++ b/src/client/views/collections/CollectionSchemaCells.tsx
@@ -158,8 +158,8 @@ export class CollectionSchemaCell extends React.Component<CellProps> {
if (this.props.isFocused && !this.props.isEditable) className += " inactive";
return (
- <div className="collectionSchemaView-cellContainer" ref={dragRef} onPointerEnter={onPointerEnter} onPointerLeave={onPointerLeave}>
- <div className={className} ref={this._focusRef} tabIndex={-1} onPointerDown={this.onPointerDown}>
+ <div className="collectionSchemaView-cellContainer" ref={dragRef} onPointerDown={this.onPointerDown} onPointerEnter={onPointerEnter} onPointerLeave={onPointerLeave}>
+ <div className={className} ref={this._focusRef} tabIndex={-1}>
<div className="collectionSchemaView-cellContents" ref={type === undefined || type === "document" ? this.dropRef : null} key={props.Document[Id]}>
<EditableView
editing={this._isEditing}
diff --git a/src/client/views/collections/CollectionSchemaView.scss b/src/client/views/collections/CollectionSchemaView.scss
index 98ec971ef..e56c705f0 100644
--- a/src/client/views/collections/CollectionSchemaView.scss
+++ b/src/client/views/collections/CollectionSchemaView.scss
@@ -311,7 +311,7 @@ button.add-column {
.row-dragger {
display: flex;
- justify-content: space-evenly;
+ justify-content: space-around;
// height: $MAX_ROW_HEIGHT;
flex: 50 0 auto;
width: 50px;
@@ -406,6 +406,9 @@ button.add-column {
justify-content: flex-end;
padding: 0 10px;
+ border-bottom: 2px solid gray;
+ // margin-bottom: 10px;
+
.collectionSchemaView-toolbar-item {
display: flex;
flex-direction: column;