Skip to content

Commit fc61ad1

Browse files
authored
Merge pull request #89 from back4app/analytics-report-event
Fix dropdown color
2 parents e56eb3e + 8d182d0 commit fc61ad1

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

src/components/ChromeDropdown/ChromeDropdown.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
padding: 0 30px 0 10px;
5656
background: $darkBlue;
5757
border-radius: 5px;
58+
color: white;
5859

5960
div {
6061
overflow-x: hidden;

src/components/ExplorerQueryComposer/ExplorerQueryComposer.react.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ export default class ExplorerQueryComposer extends React.Component {
174174
groups: query.groups || defaultState.groups,
175175
limit: query.limit || defaultState.limit,
176176
filters: query.filters || [],
177-
orders: query.orders || []
177+
orders: query.orders || [],
178+
isSaved: query.isSaved || false
178179
};
179180
}
180181

@@ -602,13 +603,14 @@ export default class ExplorerQueryComposer extends React.Component {
602603
headerView = (
603604
<div className={[base.center, styles.headerView].join(' ')}>
604605
<h3 className={styles.headerLabel}>{ this.state.name || 'Build a custom query' }</h3>
605-
{ isNew ? null : <a
606-
href='javascript:;'
607-
role='button'
608-
className={[styles.headerButton, styles.secondaryColor].join(' ')}
609-
onClick={this.toggleEditing.bind(this)}>
610-
{ this.state.isSaved ? 'Rename' : 'Save' }
611-
</a> }
606+
{ isNew ? null :
607+
<Button
608+
color='white'
609+
primary={true}
610+
value={ this.state.isSaved ? 'Rename' : 'Save' }
611+
onClick={this.toggleEditing.bind(this)}>
612+
</Button>
613+
}
612614
</div>
613615
);
614616
}

src/components/ExplorerQueryPicker/ExplorerQueryPicker.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
.del {
3737
position: absolute;
3838
right: 24px;
39-
color: #d8d8d8;
39+
color: $red;
4040
font-size: 18px;
4141
line-height: 18px;
4242
}

0 commit comments

Comments
 (0)