Skip to content

Commit 00e8aaa

Browse files
authored
Merge pull request #972 from CDLUC3/feature/964/change-remove-buttons-to-secondary
Changed 'remove' buttons in Repository and Metadata Standards selectors
2 parents e83af63 + d5ff0b8 commit 00e8aaa

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
### Updated
66
- Updated Project Details subdomains field to only display once a user selects a research domain [#947]
7+
- Updated `Remove` buttons to be `secondary` buttons, rather than `red` [#964]
78

89
### Fixed
910

components/QuestionAdd/MetaDataStandards.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ const MetaDataStandardsSelector = ({
202202
<Button
203203
onClick={removeAllStandards}
204204
isDisabled={selectedCount === 0}
205-
className="danger medium"
205+
className="secondary medium"
206206
>
207207
{Global('buttons.removeAll')}
208208
</Button>
@@ -219,7 +219,7 @@ const MetaDataStandardsSelector = ({
219219
</div>
220220
<Button
221221
onClick={() => removeStandard(std.id)}
222-
className="danger small"
222+
className="secondary small"
223223
>
224224
{Global('buttons.remove')}
225225
</Button>
@@ -374,7 +374,7 @@ const MetaDataStandardsSelector = ({
374374
<div className={styles.searchResultTitle}>{std.name}</div>
375375
<Button
376376
onClick={() => toggleSelection(std)}
377-
className={`small ${isSelected ? 'danger' : 'primary'}`}
377+
className={`small ${isSelected ? 'secondary' : 'primary'}`}
378378
>
379379
{isSelected ? Global('buttons.remove') : Global('buttons.select')}
380380
</Button>

components/QuestionAdd/ReposSelector.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ const RepositorySelectionSystem = ({
279279
<Button
280280
onClick={removeAllRepos}
281281
isDisabled={selectedCount === 0}
282-
className="danger medium"
282+
className="medium secondary"
283283
>
284284
{Global('buttons.removeAll')}
285285
</Button>
@@ -311,7 +311,7 @@ const RepositorySelectionSystem = ({
311311
</div>
312312
<Button
313313
onClick={() => removeRepo(repo.id)}
314-
className={`${styles.removeBtn} danger small`}
314+
className={`${styles.removeBtn} secondary small`}
315315
>
316316
{Global('buttons.remove')}
317317
</Button>
@@ -504,7 +504,7 @@ const RepositorySelectionSystem = ({
504504
<div className={styles.searchResultTitle}>{repo.name}</div>
505505
<Button
506506
onClick={() => toggleSelection(repo)}
507-
className={`small ${isSelected ? 'danger' : 'primary'}`}
507+
className={`small ${isSelected ? 'secondary' : 'primary'}`}
508508
>
509509
{isSelected ? Global('buttons.remove') : Global('buttons.select')}
510510
</Button>

styles/form/_button.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
}
7272

7373
@mixin button-secondary {
74-
background: transparent;
74+
background: var(--bg-white);
7575

7676
// box-shadow makes border appear on the inside of button, keeping it same size as primary button, as opposed to
7777
// border, which renders the border on the outside of the button, making secondary larger than primary. An

0 commit comments

Comments
 (0)