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

Commit

Permalink
Merge pull request #7164 from luixxiul/sync-styling-aphrodite
Browse files Browse the repository at this point in the history
Use <SettingTextbox> for the textbox on the dialog of enabling Sync
  • Loading branch information
bsclifton authored Feb 23, 2017
2 parents ef121fb + 8112dfa commit 8b5b7c1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 20 deletions.
5 changes: 4 additions & 1 deletion app/renderer/components/preferences/syncTab.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const niceware = require('niceware')
const ModalOverlay = require('../../../../js/components/modalOverlay')
const Button = require('../../../../js/components/button')
const {SettingsList, SettingItem, SettingCheckbox} = require('../settings')
const {SettingTextbox} = require('../../../../app/renderer/components/textbox')

const aboutActions = require('../../../../js/about/aboutActions')
const getSetting = require('../../../../js/settings').getSetting
Expand Down Expand Up @@ -135,7 +136,9 @@ class SyncTab extends ImmutableComponent {
get deviceNameInputContent () {
return <SettingItem>
<span data-l10n-id='syncDeviceNameInput' />
<input className='deviceNameInput formControl' spellCheck='false'
<SettingTextbox
data-test-id='deviceNameInput'
spellCheck='false'
ref={(node) => { this.deviceNameInput = node }}
placeholder={this.defaultDeviceName} />
</SettingItem>
Expand Down
4 changes: 1 addition & 3 deletions less/about/preferences.less
Original file line number Diff line number Diff line change
Expand Up @@ -1417,9 +1417,7 @@ table.sortableTable {
.setupContent {
margin: 1em 0;
}
.deviceNameInput {
width: 50%;
}

.device {
background-color: @lightGray;
border-radius: @borderRadiusUIbox;
Expand Down
16 changes: 0 additions & 16 deletions less/forms.less
Original file line number Diff line number Diff line change
Expand Up @@ -773,19 +773,3 @@ select {
}
}
}

// From commonStyles.js
.formControl {
background: white;
border: solid 1px @black10;
border-radius: @borderRadius;
box-shadow: inset 0 1px 1px @black10;
box-sizing: border-box;
display: block;
color: @darkGray;
font-size: 14.5px;
height: 2.25em;
outline: none;
padding: 0.4em;
width: 100%;
}

0 comments on commit 8b5b7c1

Please sign in to comment.