Skip to content

Commit 1774032

Browse files
committed
style tweaks to node form and dyad census
1 parent e80048d commit 1774032

File tree

5 files changed

+21
-23
lines changed

5 files changed

+21
-23
lines changed

src/containers/Interfaces/DyadCensus/DyadCensus.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ const fadeVariants = {
2626
};
2727

2828
const optionsVariants = {
29-
show: { opacity: 1, transition: { delay: 0.25, duration: 0.25 } },
30-
hide: { opacity: 0, transition: { delay: 0.25, duration: 0.25 } },
29+
show: { opacity: 1, transition: { delay: 0.15, duration: 0.25 } },
30+
hide: { opacity: 0, transition: { delay: 0.15, duration: 0.25 } },
3131
};
3232

3333
const choiceVariants = {

src/containers/Interfaces/DyadCensus/Pair.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const animationTarget = -50;
88

99
const pairTransition = {
1010
duration: 0.5,
11-
delay: 0.35,
11+
delay: 0.15,
1212
when: 'afterChildren',
1313
};
1414

src/containers/Interfaces/Narrative.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -193,23 +193,23 @@ class Narrative extends Component {
193193
allowPositioning={allowRepositioning}
194194
/>
195195
</Canvas>
196+
<PresetSwitcher
197+
id="drop-obstacle"
198+
presets={presets}
199+
activePreset={presetIndex}
200+
highlightIndex={highlightIndex}
201+
isFrozen={isFrozen}
202+
shouldShowResetButton={shouldShowResetButton}
203+
shouldShowFreezeButton={freeDraw}
204+
onResetInteractions={this.handleResetInteractions}
205+
onChangePreset={this.handleChangePreset}
206+
onToggleFreeze={this.handleToggleFreeze}
207+
onToggleHulls={this.handleToggleHulls}
208+
onToggleEdges={this.handleToggleEdges}
209+
onChangeHighlightIndex={this.handleChangeHighlightIndex}
210+
onToggleHighlighting={this.handleToggleHighlighting}
211+
/>
196212
</LayoutProvider>
197-
<PresetSwitcher
198-
id="drop-obstacle"
199-
presets={presets}
200-
activePreset={presetIndex}
201-
highlightIndex={highlightIndex}
202-
isFrozen={isFrozen}
203-
shouldShowResetButton={shouldShowResetButton}
204-
shouldShowFreezeButton={freeDraw}
205-
onResetInteractions={this.handleResetInteractions}
206-
onChangePreset={this.handleChangePreset}
207-
onToggleFreeze={this.handleToggleFreeze}
208-
onToggleHulls={this.handleToggleHulls}
209-
onToggleEdges={this.handleToggleEdges}
210-
onChangeHighlightIndex={this.handleChangeHighlightIndex}
211-
onToggleHighlighting={this.handleToggleHighlighting}
212-
/>
213213
</div>
214214
</div>
215215
);

src/styles/components/_node-form.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
.overlay__content {
1212
.scrollable {
13-
padding: unit(2) unit(4);
13+
padding: 0 unit(4);
1414
}
1515
}
1616
}

src/styles/components/_overlay.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ $close-button-size: 1rem;
1616
margin: unit(4);
1717

1818
&__title {
19-
padding: 0 unit(4);
20-
margin: unit(4);
19+
padding: unit(4);
2120
flex: 0 0 auto;
2221
display: flex;
2322
align-items: center;
@@ -39,7 +38,6 @@ $close-button-size: 1rem;
3938
overflow-x: hidden;
4039
overflow-y: auto;
4140
padding: 0 unit(4);
42-
margin-bottom: unit(4);
4341
}
4442

4543
&__footer {

0 commit comments

Comments
 (0)