diff --git a/client/less/main.less b/client/less/main.less index bbf9249e6b..894bec2d5a 100644 --- a/client/less/main.less +++ b/client/less/main.less @@ -1059,3 +1059,4 @@ and (max-width : 400px) { &{ @import "./code-mirror.less"; } &{ @import "./toastr.less"; } &{ @import "../../common/index.less"; } +&{ @import "./userHome.less"; } diff --git a/client/less/userHome.less b/client/less/userHome.less new file mode 100644 index 0000000000..2d029e780b --- /dev/null +++ b/client/less/userHome.less @@ -0,0 +1,7 @@ +.quote-partial { + + blockquote { + font-size: 3.5rem; + border: none; + } +} \ No newline at end of file diff --git a/common/app/routes/Profile/components/Certificates.jsx b/common/app/routes/Profile/components/Certificates.jsx index ff2fb607fc..b6f8b97643 100644 --- a/common/app/routes/Profile/components/Certificates.jsx +++ b/common/app/routes/Profile/components/Certificates.jsx @@ -42,59 +42,59 @@ const mapStateToProps = createSelector( currentCerts: [ { show: is2018FullStackCert, - title: 'Full Stack Certification:', + title: 'Full Stack Certification', showURL: '2018-full-stack' }, { show: isRespWebDesignCert, - title: 'Responsive Web Design Certification:', + title: 'Responsive Web Design Certification', showURL: 'responsive-web-design' }, { show: isJsAlgoDataStructCert, - title: 'JavaScript Algorithms and Data Structures Certification:', + title: 'JavaScript Algorithms and Data Structures Certification', showURL: 'javascript-algorithms-and-data-structures' }, { show: isFrontEndLibsCert, - title: 'Front End Libraries Certification:', + title: 'Front End Libraries Certification', showURL: 'front-end-libraries' }, { show: is2018DataVisCert, - title: 'Data Visualization Certification:', + title: 'Data Visualization Certification', showURL: 'data-visualization' }, { show: isApisMicroservicesCert, - title: 'APIs and Microservices Certification:', + title: 'APIs and Microservices Certification', showURL: 'apis-and-microservices' }, { show: isInfosecQaCert, - title: 'Information Security and Quality Assurance Certification:', + title: 'Information Security and Quality Assurance Certification', showURL: 'information-security-and-quality-assurance' } ], legacyCerts: [ { show: isFullStackCert, - title: 'Full Stack Certification:', + title: 'Full Stack Certification', showURL: 'legacy-full-stack' }, { show: isFrontEndCert, - title: 'Front End Certification:', + title: 'Front End Certification', showURL: 'legacy-front-end' }, { show: isBackEndCert, - title: 'Back End Certification:', + title: 'Back End Certification', showURL: 'legacy-back-end' }, { show: isDataVisCert, - title: 'Data Visualization Certification:', + title: 'Data Visualization Certification', showURL: 'legacy-data-visualization' } ] @@ -124,21 +124,14 @@ const propTypes = { function renderCertShow(username, cert) { return cert.show ? ( - -

- - { cert.title } - -

- - +
diff --git a/common/app/routes/Settings/Toggle-Button/Toggle-Button.jsx b/common/app/routes/Settings/Toggle-Button/Toggle-Button.jsx index 8e78c33ccc..76f58c14ac 100644 --- a/common/app/routes/Settings/Toggle-Button/Toggle-Button.jsx +++ b/common/app/routes/Settings/Toggle-Button/Toggle-Button.jsx @@ -6,14 +6,18 @@ import ns from './ns.json'; const propTypes = { name: PropTypes.string.isRequired, + offLabel: PropTypes.string, onChange: PropTypes.func.isRequired, + onLabel: PropTypes.string, value: PropTypes.bool.isRequired }; export default function ToggleButton({ name, onChange, - value + value, + onLabel = 'On', + offLabel = 'Off' }) { return (
@@ -30,7 +34,7 @@ export default function ToggleButton({ type='radio' value={ 1 } > - On + { onLabel } - Off + { offLabel }
diff --git a/common/app/routes/Settings/components/Honesty.jsx b/common/app/routes/Settings/components/Honesty.jsx index 7dd8a0673c..b846aec01a 100644 --- a/common/app/routes/Settings/components/Honesty.jsx +++ b/common/app/routes/Settings/components/Honesty.jsx @@ -45,7 +45,7 @@ class Honesty extends PureComponent { const isHonestAgreed = (

- You have accepted our Academic Honesty Policy + You have accepted our Academic Honesty Policy.

); diff --git a/common/app/routes/Settings/components/Privacy-Settings.jsx b/common/app/routes/Settings/components/Privacy-Settings.jsx index 5f22dc49ce..0dae1d4fa1 100644 --- a/common/app/routes/Settings/components/Privacy-Settings.jsx +++ b/common/app/routes/Settings/components/Privacy-Settings.jsx @@ -57,43 +57,58 @@ function PrivacySettings(props) {

The settings in this section enable you to control what is show on{' '} - your freeCodeCamp public profile. + your freeCodeCamp public portfolio.

diff --git a/common/app/routes/Settings/components/ToggleSetting.jsx b/common/app/routes/Settings/components/ToggleSetting.jsx index 7a0654ef6f..24fe1a5b2d 100644 --- a/common/app/routes/Settings/components/ToggleSetting.jsx +++ b/common/app/routes/Settings/components/ToggleSetting.jsx @@ -21,12 +21,13 @@ export default function ToggleSetting({ explain, flag, flagName, - toggleFlag + toggleFlag, + ...restProps }) { return ( - +

{ action } @@ -43,6 +44,7 @@ export default function ToggleSetting({ name={ flagName } onChange={ toggleFlag } value={ flag } + {...restProps} /> diff --git a/common/app/routes/Settings/settings.less b/common/app/routes/Settings/settings.less index 191218f072..fe86003be7 100644 --- a/common/app/routes/Settings/settings.less +++ b/common/app/routes/Settings/settings.less @@ -65,6 +65,16 @@ .privacy-settings { + .toggle-label { + margin: 0; + + p { + display: flex; + flex-direction: column; + margin: 0; + } + } + .inline-form { display: flex; align-items: center; diff --git a/server/views/homePartials/quote.jade b/server/views/homePartials/quote.jade index 0a435f4434..f5dfd2c368 100644 --- a/server/views/homePartials/quote.jade +++ b/server/views/homePartials/quote.jade @@ -1,4 +1,4 @@ -.row +.row.quote-partial .col-xs-12.col-sm-8.col-sm-offset-2 blockquote.blockquote span=quote diff --git a/server/views/homePartials/stats.jade b/server/views/homePartials/stats.jade index e54a2c3433..950f19138f 100644 --- a/server/views/homePartials/stats.jade +++ b/server/views/homePartials/stats.jade @@ -7,7 +7,7 @@ |  of  strong span.green-text=challengeCount - |  lessons. + |  coding challenges. p.stats | You have built  strong @@ -15,7 +15,7 @@ | out of  strong span.green-text 30 - | projects + | projects. if !!completedLegacyCertCount p.stats | You have earned  @@ -24,7 +24,7 @@ | out of  strong span.green-text 3 - | legacy certifications + | legacy certifications. p.stats | You have earned  strong @@ -32,4 +32,4 @@ | out of  strong span.green-text 6 - | certifications \ No newline at end of file + | certifications. \ No newline at end of file diff --git a/server/views/noUserHome.jade b/server/views/noUserHome.jade index 2872228ec3..6a55cf306f 100644 --- a/server/views/noUserHome.jade +++ b/server/views/noUserHome.jade @@ -84,8 +84,6 @@ block content a.btn.btn-cta.signup-btn.btn-block(href="/signin") Start coding (it's free) .big-break .big-break - include homePartials/quote - .big-break hr .big-break .big-break