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

Refactor checkDefaultBrowserDialog.js with commonForm #8154

Merged
merged 1 commit into from
Apr 20, 2017
Merged

Refactor checkDefaultBrowserDialog.js with commonForm #8154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
78 changes: 67 additions & 11 deletions app/renderer/components/checkDefaultBrowserDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,31 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const React = require('react')

// Components
const ImmutableComponent = require('./immutableComponent')
const Dialog = require('../../../js/components/dialog')
const Button = require('../../../js/components/button')
const SwitchControl = require('../../../js/components/switchControl')

// Actions
const appActions = require('../../../js/actions/appActions')
const windowActions = require('../../../js/actions/windowActions')

// Constants
const settings = require('../../../js/constants/settings')

const {StyleSheet, css} = require('aphrodite/no-important')
const globalStyles = require('./styles/global')

const braveAbout = require('../../extensions/brave/img/braveAbout.png')

const {
CommonFormMedium,
CommonFormSection,
CommonFormButtonWrapper
} = require('./commonForm')

class CheckDefaultBrowserDialog extends ImmutableComponent {
constructor () {
super()
Expand All @@ -35,19 +52,58 @@ class CheckDefaultBrowserDialog extends ImmutableComponent {
this.props.onHide()
}
render () {
return <Dialog className='checkDefaultBrowserDialog' >
<div className='checkDefaultBrowser' onClick={(e) => e.stopPropagation()}>
<div className='braveIcon' />
<div className='makeBraveDefault' data-l10n-id='makeBraveDefault' />
<SwitchControl className='checkDefaultOnStartup' rightl10nId='checkDefaultOnStartup'
checkedOn={this.props.checkDefaultOnStartup} onClick={this.onCheckDefaultOnStartup} />
<div className='checkDefaultBrowserButtons'>
<Button l10nId='notNow' className='whiteButton' onClick={this.onNotNow} />
<Button l10nId='useBrave' className='primaryButton' onClick={this.onUseBrave} />
</div>
</div>
return <Dialog className='checkDefaultBrowserDialog'>
Copy link
Contributor

Choose a reason for hiding this comment

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

fyi I created another issue to track that change: #8401

<CommonFormMedium onClick={(e) => e.stopPropagation()}>
<CommonFormSection>
<div className={css(styles.flexAlignCenter)}>
<div className={css(styles.section__braveIcon)} />
<div>
<div className={css(styles.section__title)} data-l10n-id='makeBraveDefault' />
<SwitchControl className={css(styles.section__switchControl)}
rightl10nId='checkDefaultOnStartup'
checkedOn={this.props.checkDefaultOnStartup}
onClick={this.onCheckDefaultOnStartup} />
</div>
</div>
</CommonFormSection>
<CommonFormButtonWrapper>
<Button className='whiteButton'
l10nId='notNow'
testId='notNowButton'
onClick={this.onNotNow}
/>
<Button className='primaryButton'
l10nId='useBrave'
testId='useBraveButton'
onClick={this.onUseBrave}
/>
</CommonFormButtonWrapper>
</CommonFormMedium>
</Dialog>
}
}

const styles = StyleSheet.create({
flexAlignCenter: {
display: 'flex',
alignItems: 'center'
},

section__braveIcon: {
backgroundImage: `image-set(url(${braveAbout}) 2x)`,
backgroundRepeat: 'no-repeat',
height: '64px',
width: '64px',
minWidth: '64px',
marginRight: globalStyles.spacing.dialogInsideMargin
},
section__title: {
fontWeight: 'bold'
},
section__switchControl: {
paddingLeft: 0,
marginTop: `calc(${globalStyles.spacing.dialogInsideMargin} / 2)`
}
})

module.exports = CheckDefaultBrowserDialog
17 changes: 17 additions & 0 deletions app/renderer/components/commonForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ class CommonForm extends ImmutableComponent {
}
}

class CommonFormMedium extends ImmutableComponent {
render () {
return <div className={css(
commonStyles.flyoutDialog,
styles.commonForm,
styles.commonFormMedium,
)} {...this.props} />
}
}

class CommonFormLarge extends ImmutableComponent {
render () {
return <div className={css(
Expand Down Expand Up @@ -123,6 +133,10 @@ const styles = StyleSheet.create({
// maxHeight: '100%'
},

commonFormMedium: {
maxWidth: globalStyles.spacing.dialogMediumWidth
},

commonFormLarge: {
maxWidth: globalStyles.spacing.dialogLargeWidth
},
Expand Down Expand Up @@ -168,6 +182,7 @@ const commonFormStyles = StyleSheet.create({
display: 'flex',
justifyContent: 'space-between'
},

inputWrapper: {
display: 'flex',
flexFlow: 'column',
Expand All @@ -179,6 +194,7 @@ const commonFormStyles = StyleSheet.create({
inputWrapper__input: {
flexGrow: 1
},

input__bottomRow: {
marginTop: `calc(${globalStyles.spacing.dialogInsideMargin} / 3)`
},
Expand All @@ -192,6 +208,7 @@ const commonFormStyles = StyleSheet.create({

module.exports = {
CommonForm,
CommonFormMedium,
CommonFormLarge,
CommonFormBookmarkHanger,
CommonFormDropdown,
Expand Down
1 change: 1 addition & 0 deletions app/renderer/components/styles/global.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ const globalStyles = {
closeIconSize: '13px',
narrowIconSize: '12px',
dialogWidth: '422px',
dialogMediumWidth: '500px',
dialogLargeWidth: '600px',
dialogTopOffset: '30px',
dialogInsideMargin: '18px',
Expand Down
59 changes: 0 additions & 59 deletions less/forms.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,65 +153,6 @@ select {
}
}

// TODO: Make this use commonDialog
.checkDefaultBrowserDialog {
.checkDefaultBrowser {
.flyoutDialog;
background-color: #f7f7f7;
border-radius: @borderRadius;
max-width: 422px;
padding: 1;
text-align: left;
width: 614px;
height: 120px;
user-select: none;
cursor: default;
color: #3B3B3B;
overflow-x: hidden;
overflow-y: hidden;
max-height: 100%;

.clickable {
color: #5B5B5B;
&:hover {
color: #000;
}
}

.checkDefaultBrowserButtons {
text-align: right;
padding: 16px 10px;
position: relative;
top: -30px;
}

.makeBraveDefault {
font-weight: bold;
display: inline-block;
position: relative;
top: -35px;
margin-left: 15px;
}

.braveIcon {
background-image: -webkit-image-set(url(../app/extensions/brave/img/braveAbout.png) 2x);
background-repeat: no-repeat;
height: 64px;
width: 64px;
display: inline-block;
position: relative;
top: 10px;
}

.checkDefaultOnStartup {
left: 75px;
position: relative;
top: -25px;
}
}
}


.braveryPanelContainer {
.braveryPanel {
.flyoutDialog;
Expand Down