diff --git a/resources/frontend_client/app/css/core/colors.css b/resources/frontend_client/app/css/core/colors.css index 5f2c4e90d66dcf0a3196d14fa22e696e4f9c1779..6c24bae41b187d06735354e6642f888250005775 100644 --- a/resources/frontend_client/app/css/core/colors.css +++ b/resources/frontend_client/app/css/core/colors.css @@ -96,6 +96,8 @@ } .bg-gold { background-color: var(--gold-color); } +.bg-purple { background-color: var(--purple-color); } +.bg-green { background-color: var(--green-color); } /* alt */ .bg-alt { background-color: var(--alt-color); } diff --git a/resources/frontend_client/app/home/components/Activity.react.js b/resources/frontend_client/app/home/components/Activity.react.js index 467a513938125a185336774aaaf09672a99b76f2..c77dfae89e378ad3b7c9a4cc6504e03f1b556ebe 100644 --- a/resources/frontend_client/app/home/components/Activity.react.js +++ b/resources/frontend_client/app/home/components/Activity.react.js @@ -18,7 +18,7 @@ export default class Activity extends Component { super(); this.state = { error: null, userColors: {} }; - this.colorClasses = ['bg-brand', 'bg-gold', 'bg-error', 'bg-gold', 'bg-gold', 'bg-gold']; + this.colorClasses = ['bg-brand', 'bg-purple', 'bg-error', 'bg-green', 'bg-gold', 'bg-grey-2']; this.styles = { modelLink: { @@ -47,7 +47,7 @@ export default class Activity extends Component { const colors = [1,2,3,4,5]; const maxColorUsed = (_.isEmpty(userColors)) ? 0 : _.max(_.values(userColors)); - var currColor = (maxColorUsed && maxColorUsed < 5) ? maxColorUsed : 0; + var currColor = (maxColorUsed && maxColorUsed < colors.length) ? maxColorUsed : 0; for (var item of activity) { if (!(item.user_id in userColors)) { @@ -243,8 +243,8 @@ export default class Activity extends Component { <div className="full flex flex-column"> <div className=""> { activity.length === 0 ? - <div className="flex flex-column layout-centered"> - <span className="QuestionCircle">?</span> + <div className="flex flex-column layout-centered mt4"> + <span className="QuestionCircle">!</span> <div className="text-normal mt3 mb1">Hmmm, looks like nothing has happened yet.</div> <div className="text-normal text-grey-2">Save a question and get this baby going!</div> </div>