diff --git a/.circleci/config.yml b/.circleci/config.yml index 165051d7cd..8492622fba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -363,7 +363,7 @@ workflows: filters: branches: only: - - mm-leaderboard-theme + - jan-updates-1 # This is stage env for production QA releases - "build-prod-staging": context : org-global diff --git a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap index 314898ca2b..dfc40a93d9 100644 --- a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap +++ b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap @@ -163,15 +163,6 @@ exports[`Matches shallow shapshot 1`] = ` Blog -
  • - - Challenge Pipeline - -
  • diff --git a/src/shared/components/Looker/index.jsx b/src/shared/components/Looker/index.jsx index 03e7ac6ec7..773e7f6cfb 100644 --- a/src/shared/components/Looker/index.jsx +++ b/src/shared/components/Looker/index.jsx @@ -21,6 +21,7 @@ import PT from 'prop-types'; import _ from 'lodash'; import React, { Component } from 'react'; import { fixStyle } from 'utils/contentful'; +import { getRatingColor } from 'utils/tc'; import cn from 'classnames'; import { Scrollbars } from 'react-custom-scrollbars'; import './style.scss'; @@ -46,6 +47,7 @@ export default class Looker extends Component { tableHeight, tableWidth, headerIndexCol, + ratingProp, } = this.props; let { @@ -166,7 +168,11 @@ export default class Looker extends Component { } return value ? ( - {memberLinks ? ({value}) : value} + {memberLinks ? ( + + {value} + + ) : value} ) : null; }) @@ -232,6 +238,7 @@ Looker.defaultProps = { tableHeight: '100%', tableWidth: '100%', headerIndexCol: '', + ratingProp: null, }; Looker.propTypes = { @@ -253,4 +260,5 @@ Looker.propTypes = { PT.func, ]), headerIndexCol: PT.string, + ratingProp: PT.string, }; diff --git a/src/shared/components/Looker/style.scss b/src/shared/components/Looker/style.scss index a320fed4e8..33b53ac099 100644 --- a/src/shared/components/Looker/style.scss +++ b/src/shared/components/Looker/style.scss @@ -106,7 +106,7 @@ $light-gray: #d4d4d4; @include roboto-medium; font-weight: 500; - color: #0d61bf !important; + color: #0d61bf; text-decoration: underline; &:hover { diff --git a/src/shared/components/Settings/Preferences/Email/index.jsx b/src/shared/components/Settings/Preferences/Email/index.jsx index 9b2948d851..036779034b 100644 --- a/src/shared/components/Settings/Preferences/Email/index.jsx +++ b/src/shared/components/Settings/Preferences/Email/index.jsx @@ -26,11 +26,6 @@ function toastrError(title, message) { const SAVE_DELAY = 1000; const newsletters = [ - { - id: '9f950b43a1', - name: 'Challenge Pipeline', - desc: 'Subscribe to this newsletter if you want to get updates on the types of challenges coming up in the future. To view these challenges at your leisure you can always visit the Challenge Pipeline page.', - }, { id: 'd0c48e9da3', name: 'Gig Work', @@ -61,6 +56,11 @@ const newsletters = [ name: 'Rapid Development Match (RDM) Reminders', desc: 'Receive notifications of our brand new RDMs! These rated, development matches will be a fun new way to engage with us!', }, + { + id: 'ee26600945', + name: 'NASA Community', + desc: 'Receive email notifications for all the latest news and announcements of our NASA Member Program.', + }, ]; const programs = [ { diff --git a/src/shared/components/TopcoderFooter/index.jsx b/src/shared/components/TopcoderFooter/index.jsx index 3d073f7b58..d886390320 100644 --- a/src/shared/components/TopcoderFooter/index.jsx +++ b/src/shared/components/TopcoderFooter/index.jsx @@ -69,7 +69,6 @@ export default function TopcoderFooter() {