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

Revert "Use <SettingTextbox> for the textbox on the dialog of enabling Sync" #7359

Merged
merged 1 commit into from
Feb 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions app/renderer/components/preferences/syncTab.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ 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 @@ -136,9 +135,7 @@ class SyncTab extends ImmutableComponent {
get deviceNameInputContent () {
return <SettingItem>
<span data-l10n-id='syncDeviceNameInput' />
<SettingTextbox
data-test-id='deviceNameInput'
spellCheck='false'
<input className='deviceNameInput formControl' spellCheck='false'
ref={(node) => { this.deviceNameInput = node }}
placeholder={this.defaultDeviceName} />
</SettingItem>
Expand Down
4 changes: 3 additions & 1 deletion less/about/preferences.less
Original file line number Diff line number Diff line change
Expand Up @@ -1417,7 +1417,9 @@ table.sortableTable {
.setupContent {
margin: 1em 0;
}

.deviceNameInput {
width: 50%;
}
.device {
background-color: @lightGray;
border-radius: @borderRadiusUIbox;
Expand Down
16 changes: 16 additions & 0 deletions less/forms.less
Original file line number Diff line number Diff line change
Expand Up @@ -773,3 +773,19 @@ 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%;
}