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

Use <SettingTextbox> for the textbox on the dialog of enabling Sync #7164

Merged
merged 2 commits into from
Feb 23, 2017
Merged

Use <SettingTextbox> for the textbox on the dialog of enabling Sync #7164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c97878
Use <SettingTextbox> for the textbox on the dialog of enabling Sync
Feb 10, 2017
8112dfa
Removing unused style, per comment (I searched and did not find anyth…
bsclifton Feb 23, 2017
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: 4 additions & 1 deletion app/renderer/components/preferences/syncTab.js
View file
Open in desktop
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
View file
Open in desktop
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 {
Copy link
Contributor Author

@luixxiul luixxiul Feb 10, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

Please let me know if this should not be removed. <SettingTextbox> has its own width.

background-color: @lightGray;
border-radius: @borderRadiusUIbox;
Expand Down
16 changes: 0 additions & 16 deletions less/forms.less
View file
Open in desktop
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%;
}