chore(ui): Minor UI/Copy fixes (#17237)

This commit is contained in:
Stuart Taylor
2018-05-25 16:49:47 +01:00
committed by mrugesh mohapatra
parent 0bb4fbfcea
commit 9eb7cf1ae1
11 changed files with 71 additions and 35 deletions

View File

@ -1059,3 +1059,4 @@ and (max-width : 400px) {
&{ @import "./code-mirror.less"; } &{ @import "./code-mirror.less"; }
&{ @import "./toastr.less"; } &{ @import "./toastr.less"; }
&{ @import "../../common/index.less"; } &{ @import "../../common/index.less"; }
&{ @import "./userHome.less"; }

View File

@ -0,0 +1,7 @@
.quote-partial {
blockquote {
font-size: 3.5rem;
border: none;
}
}

View File

@ -42,59 +42,59 @@ const mapStateToProps = createSelector(
currentCerts: [ currentCerts: [
{ {
show: is2018FullStackCert, show: is2018FullStackCert,
title: 'Full Stack Certification:', title: 'Full Stack Certification',
showURL: '2018-full-stack' showURL: '2018-full-stack'
}, },
{ {
show: isRespWebDesignCert, show: isRespWebDesignCert,
title: 'Responsive Web Design Certification:', title: 'Responsive Web Design Certification',
showURL: 'responsive-web-design' showURL: 'responsive-web-design'
}, },
{ {
show: isJsAlgoDataStructCert, show: isJsAlgoDataStructCert,
title: 'JavaScript Algorithms and Data Structures Certification:', title: 'JavaScript Algorithms and Data Structures Certification',
showURL: 'javascript-algorithms-and-data-structures' showURL: 'javascript-algorithms-and-data-structures'
}, },
{ {
show: isFrontEndLibsCert, show: isFrontEndLibsCert,
title: 'Front End Libraries Certification:', title: 'Front End Libraries Certification',
showURL: 'front-end-libraries' showURL: 'front-end-libraries'
}, },
{ {
show: is2018DataVisCert, show: is2018DataVisCert,
title: 'Data Visualization Certification:', title: 'Data Visualization Certification',
showURL: 'data-visualization' showURL: 'data-visualization'
}, },
{ {
show: isApisMicroservicesCert, show: isApisMicroservicesCert,
title: 'APIs and Microservices Certification:', title: 'APIs and Microservices Certification',
showURL: 'apis-and-microservices' showURL: 'apis-and-microservices'
}, },
{ {
show: isInfosecQaCert, show: isInfosecQaCert,
title: 'Information Security and Quality Assurance Certification:', title: 'Information Security and Quality Assurance Certification',
showURL: 'information-security-and-quality-assurance' showURL: 'information-security-and-quality-assurance'
} }
], ],
legacyCerts: [ legacyCerts: [
{ {
show: isFullStackCert, show: isFullStackCert,
title: 'Full Stack Certification:', title: 'Full Stack Certification',
showURL: 'legacy-full-stack' showURL: 'legacy-full-stack'
}, },
{ {
show: isFrontEndCert, show: isFrontEndCert,
title: 'Front End Certification:', title: 'Front End Certification',
showURL: 'legacy-front-end' showURL: 'legacy-front-end'
}, },
{ {
show: isBackEndCert, show: isBackEndCert,
title: 'Back End Certification:', title: 'Back End Certification',
showURL: 'legacy-back-end' showURL: 'legacy-back-end'
}, },
{ {
show: isDataVisCert, show: isDataVisCert,
title: 'Data Visualization Certification:', title: 'Data Visualization Certification',
showURL: 'legacy-data-visualization' showURL: 'legacy-data-visualization'
} }
] ]
@ -124,21 +124,14 @@ const propTypes = {
function renderCertShow(username, cert) { function renderCertShow(username, cert) {
return cert.show ? ( return cert.show ? (
<Row key={ cert.showURL }> <Row key={ cert.showURL }>
<Col sm={ 8 }> <Col sm={ 10 } smPush={ 1 }>
<p className='bigger-text'>
<strong>
{ cert.title }
</strong>
</p>
</Col>
<Col sm={ 2 } smPush={ 2 }>
<Button <Button
block={ true } block={ true }
bsSize='lg' bsSize='lg'
bsStyle='primary' bsStyle='primary'
href={ `/certification/${username}/${cert.showURL}`} href={ `/certification/${username}/${cert.showURL}`}
> >
Show View {cert.title}
</Button> </Button>
</Col> </Col>
</Row> </Row>

View File

@ -6,14 +6,18 @@ import ns from './ns.json';
const propTypes = { const propTypes = {
name: PropTypes.string.isRequired, name: PropTypes.string.isRequired,
offLabel: PropTypes.string,
onChange: PropTypes.func.isRequired, onChange: PropTypes.func.isRequired,
onLabel: PropTypes.string,
value: PropTypes.bool.isRequired value: PropTypes.bool.isRequired
}; };
export default function ToggleButton({ export default function ToggleButton({
name, name,
onChange, onChange,
value value,
onLabel = 'On',
offLabel = 'Off'
}) { }) {
return ( return (
<div className={ `${ns}-container` }> <div className={ `${ns}-container` }>
@ -30,7 +34,7 @@ export default function ToggleButton({
type='radio' type='radio'
value={ 1 } value={ 1 }
> >
On { onLabel }
</TB> </TB>
<TB <TB
bsSize='lg' bsSize='lg'
@ -40,7 +44,7 @@ export default function ToggleButton({
type='radio' type='radio'
value={ 2 } value={ 2 }
> >
Off { offLabel }
</TB> </TB>
</BSBG> </BSBG>
</div> </div>

View File

@ -45,7 +45,7 @@ class Honesty extends PureComponent {
const isHonestAgreed = ( const isHonestAgreed = (
<Panel bsStyle='info'> <Panel bsStyle='info'>
<p> <p>
You have accepted our Academic Honesty Policy You have accepted our Academic Honesty Policy.
</p> </p>
</Panel> </Panel>
); );

View File

@ -57,43 +57,58 @@ function PrivacySettings(props) {
<FullWidthRow> <FullWidthRow>
<p> <p>
The settings in this section enable you to control what is show on{' '} The settings in this section enable you to control what is show on{' '}
your freeCodeCamp public profile. your freeCodeCamp public portfolio.
</p> </p>
<ToggleSetting <ToggleSetting
action='Make my profile completely private' action='Make my profile completely private'
explain='Your certifications will be disabled' explain={
'While your profile is completely private, no one will be able to ' +
'see your certifications'
}
flag={ isLocked } flag={ isLocked }
flagName='isLocked' flagName='isLocked'
offLabel='Public'
onLabel='Private'
toggleFlag={ toggleFlag('isLocked') } toggleFlag={ toggleFlag('isLocked') }
/> />
<ToggleSetting <ToggleSetting
action='Make my name completely private' action='Make my name completely private'
flag={ !showName } flag={ !showName }
flagName='name' flagName='name'
offLabel='Public'
onLabel='Private'
toggleFlag={ toggleFlag('showName') } toggleFlag={ toggleFlag('showName') }
/> />
<ToggleSetting <ToggleSetting
action='Make my location completely private' action='Make my location completely private'
flag={ !showLocation } flag={ !showLocation }
flagName='showLocation' flagName='showLocation'
offLabel='Public'
onLabel='Private'
toggleFlag={ toggleFlag('showLocation') } toggleFlag={ toggleFlag('showLocation') }
/> />
<ToggleSetting <ToggleSetting
action='Make my "about me" completely private' action='Make my "about me" completely private'
flag={ !showAbout } flag={ !showAbout }
flagName='showAbout' flagName='showAbout'
offLabel='Public'
onLabel='Private'
toggleFlag={ toggleFlag('showAbout') } toggleFlag={ toggleFlag('showAbout') }
/> />
<ToggleSetting <ToggleSetting
action='Make my points completely private' action='Make my points completely private'
flag={ !showPoints } flag={ !showPoints }
flagName='showPoints' flagName='showPoints'
offLabel='Public'
onLabel='Private'
toggleFlag={ toggleFlag('showPoints') } toggleFlag={ toggleFlag('showPoints') }
/> />
<ToggleSetting <ToggleSetting
action='Make my heat map completely private' action='Make my heat map completely private'
flag={ !showHeatMap } flag={ !showHeatMap }
flagName='showHeatMap' flagName='showHeatMap'
offLabel='Public'
onLabel='Private'
toggleFlag={ toggleFlag('showHeatMap') } toggleFlag={ toggleFlag('showHeatMap') }
/> />
<ToggleSetting <ToggleSetting
@ -101,18 +116,24 @@ function PrivacySettings(props) {
explain='Your certifications will be disabled' explain='Your certifications will be disabled'
flag={ !showCerts } flag={ !showCerts }
flagName='showCerts' flagName='showCerts'
offLabel='Public'
onLabel='Private'
toggleFlag={ toggleFlag('showCerts') } toggleFlag={ toggleFlag('showCerts') }
/> />
<ToggleSetting <ToggleSetting
action='Make my portfolio completely private' action='Make my portfolio completely private'
flag={ !showPortfolio } flag={ !showPortfolio }
flagName='showPortfolio' flagName='showPortfolio'
offLabel='Public'
onLabel='Private'
toggleFlag={ toggleFlag('showPortfolio') } toggleFlag={ toggleFlag('showPortfolio') }
/> />
<ToggleSetting <ToggleSetting
action='Make my time line completely private' action='Make my time line completely private'
flag={ !showTimeLine } flag={ !showTimeLine }
flagName='showTimeLine' flagName='showTimeLine'
offLabel='Public'
onLabel='Private'
toggleFlag={ toggleFlag('showTimeLine') } toggleFlag={ toggleFlag('showTimeLine') }
/> />
</FullWidthRow> </FullWidthRow>

View File

@ -21,12 +21,13 @@ export default function ToggleSetting({
explain, explain,
flag, flag,
flagName, flagName,
toggleFlag toggleFlag,
...restProps
}) { }) {
return ( return (
<Row className='inline-form'> <Row className='inline-form'>
<Col sm={ 8 } xs={ 12 }> <Col sm={ 8 } xs={ 12 }>
<ControlLabel htmlFor={ flagName }> <ControlLabel className='toggle-label' htmlFor={ flagName }>
<p> <p>
<strong> <strong>
{ action } { action }
@ -43,6 +44,7 @@ export default function ToggleSetting({
name={ flagName } name={ flagName }
onChange={ toggleFlag } onChange={ toggleFlag }
value={ flag } value={ flag }
{...restProps}
/> />
</Col> </Col>
</Row> </Row>

View File

@ -65,6 +65,16 @@
.privacy-settings { .privacy-settings {
.toggle-label {
margin: 0;
p {
display: flex;
flex-direction: column;
margin: 0;
}
}
.inline-form { .inline-form {
display: flex; display: flex;
align-items: center; align-items: center;

View File

@ -1,4 +1,4 @@
.row .row.quote-partial
.col-xs-12.col-sm-8.col-sm-offset-2 .col-xs-12.col-sm-8.col-sm-offset-2
blockquote.blockquote blockquote.blockquote
span=quote span=quote

View File

@ -7,7 +7,7 @@
| &nbsp;of&nbsp; | &nbsp;of&nbsp;
strong strong
span.green-text=challengeCount span.green-text=challengeCount
| &nbsp;lessons. | &nbsp;coding challenges.
p.stats p.stats
| You have built&nbsp; | You have built&nbsp;
strong strong
@ -15,7 +15,7 @@
| out of&nbsp; | out of&nbsp;
strong strong
span.green-text 30 span.green-text 30
| projects | projects.
if !!completedLegacyCertCount if !!completedLegacyCertCount
p.stats p.stats
| You have earned&nbsp; | You have earned&nbsp;
@ -24,7 +24,7 @@
| out of&nbsp; | out of&nbsp;
strong strong
span.green-text 3 span.green-text 3
| legacy certifications | legacy certifications.
p.stats p.stats
| You have earned&nbsp; | You have earned&nbsp;
strong strong
@ -32,4 +32,4 @@
| out of&nbsp; | out of&nbsp;
strong strong
span.green-text 6 span.green-text 6
| certifications | certifications.

View File

@ -84,8 +84,6 @@ block content
a.btn.btn-cta.signup-btn.btn-block(href="/signin") Start coding (it's free) a.btn.btn-cta.signup-btn.btn-block(href="/signin") Start coding (it's free)
.big-break .big-break
.big-break .big-break
include homePartials/quote
.big-break
hr hr
.big-break .big-break
.big-break .big-break