Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

make button styles consistent #5916

Merged
merged 3 commits into from
Dec 2, 2016
Merged

make button styles consistent #5916

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43e8923
make button styles consistent
jkup Nov 29, 2016
e8955ce
Make button styles consistent (part 2)
Dec 1, 2016
46ee335
Make button styles consistent (part 3)
Dec 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion js/about/preferences.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ class PaymentsTab extends ImmutableComponent {
const onButtonClick = this.props.ledgerData.get('created')
? this.props.showOverlay.bind(this, 'addFunds')
: (this.props.ledgerData.get('creating') ? () => {} : this.createWallet)
return <Button l10nId={buttonText} className='primaryButton addFunds' onClick={onButtonClick.bind(this)} disabled={this.props.ledgerData.get('creating')} />
return <Button l10nId={buttonText} className='primaryButton wideButton' onClick={onButtonClick.bind(this)} disabled={this.props.ledgerData.get('creating')} />
}

get paymentHistoryButton () {
Expand Down
4 changes: 1 addition & 3 deletions less/about/preferences.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,9 +655,7 @@ div.nextPaymentSubmission {
width: auto;
min-width: 235px;
}
span.browserButton.primaryButton.addFunds {
margin-right: 0;
}

.fundsAmount {
display: inline;
margin: 0;
Expand Down
12 changes: 10 additions & 2 deletions less/button.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,10 @@ span.buttonSeparator {
// for about:preferences
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The buttons under this section should be removed if necessary. especially from L171 to L176.

.prefBody {
.settingsList > .settingItem + button,
.settingItem > span + button {
.settingItem > span + button,
#paymentsContainer button:not(.close) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This increases padding except the close "x" button on the payments dialog.

font-size: 0.9em;
padding: 5px 20px;
padding: 8px 20px;
}

.settingsList > .settingItem + button {
Expand All @@ -170,4 +171,11 @@ span.buttonSeparator {
.settingItem > span + button {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See:

browser-laptop/js/about/preferences.js

Lines 731 to 734 in a162181

<SettingItem dataL10nId='importBrowserData'>
<Button l10nId='importNow' className='primaryButton importNowButton'
onClick={this.importBrowserDataNow} />
</SettingItem>

margin-top: 5px;
}

#paymentsContainer {
.browserButton + .browserButton {
margin-left: 8px;
}
}

}