Skip to content

vets updates #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ exports[`Snapshot match 1`] = `
composeContextTheme="softly"
link={null}
mapThemrProps={[Function]}
subTitle=""
theme={
Object {
"container": "src-shared-components-tc-communities-CommunityStats-___style__container___3IKHh",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ exports[`Matches shallow shapshot 1`] = `
composeContextTheme="softly"
link={null}
mapThemrProps={[Function]}
subTitle=""
theme={Object {}}
themePriority="adhoc-context-default"
title="Latest News"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ exports[`Match shadow snapshot 1`] = `
composeContextTheme="softly"
link={null}
mapThemrProps={[Function]}
subTitle=""
theme={
Object {
"container": "src-shared-components-tc-communities-communities-community-2-Home-___style__linksContainer___CzMMR",
Expand Down Expand Up @@ -75,6 +76,7 @@ exports[`Match shadow snapshot 1`] = `
composeContextTheme="softly"
link={null}
mapThemrProps={[Function]}
subTitle=""
theme={
Object {
"container": "src-shared-components-tc-communities-communities-community-2-Home-___style__resourcesContainer___1Y23p",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ exports[`Match shadow snapshot 1`] = `
composeContextTheme="softly"
link={null}
mapThemrProps={[Function]}
subTitle=""
theme={
Object {
"container": "src-shared-components-tc-communities-communities-community-2-Learn-___style__learnBasicsContainer___1ZPny",
Expand Down Expand Up @@ -95,6 +96,7 @@ exports[`Match shadow snapshot 1`] = `
}
}
mapThemrProps={[Function]}
subTitle=""
theme={
Object {
"container": "src-shared-components-tc-communities-communities-community-2-Learn-___style__coursesContainer___3SRv4",
Expand Down Expand Up @@ -158,6 +160,7 @@ exports[`Match shadow snapshot 1`] = `
composeContextTheme="softly"
link={null}
mapThemrProps={[Function]}
subTitle=""
theme={
Object {
"container": "src-shared-components-tc-communities-communities-community-2-Learn-___style__resourcesContainer___dzJCp",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ exports[`Snapshot match 1`] = `
composeContextTheme="softly"
link={null}
mapThemrProps={[Function]}
subTitle=""
theme={
Object {
"container": "src-shared-components-tc-communities-communities-demo-expert-Learn-___style__learnBasicsContainer___aCUEb",
Expand Down Expand Up @@ -250,6 +251,7 @@ exports[`Snapshot match 1`] = `
}
}
mapThemrProps={[Function]}
subTitle=""
theme={
Object {
"container": "src-shared-components-tc-communities-communities-demo-expert-Learn-___style__coursesContainer___1l39O",
Expand Down Expand Up @@ -313,6 +315,7 @@ exports[`Snapshot match 1`] = `
composeContextTheme="softly"
link={null}
mapThemrProps={[Function]}
subTitle=""
theme={
Object {
"container": "src-shared-components-tc-communities-communities-demo-expert-Learn-___style__resourcesContainer___299NM",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ exports[`Match shadow snapshot 1`] = `
composeContextTheme="softly"
link={null}
mapThemrProps={[Function]}
subTitle=""
theme={
Object {
"container": "src-shared-components-tc-communities-communities-taskforce-Home-___style__linksContainer___25Lds",
Expand Down Expand Up @@ -99,6 +100,7 @@ exports[`Match shadow snapshot 1`] = `
composeContextTheme="softly"
link={null}
mapThemrProps={[Function]}
subTitle=""
theme={
Object {
"container": "src-shared-components-tc-communities-communities-taskforce-Home-___style__WhatCanYouGetDone___1to7k",
Expand All @@ -125,6 +127,7 @@ exports[`Match shadow snapshot 1`] = `
composeContextTheme="softly"
link={null}
mapThemrProps={[Function]}
subTitle=""
theme={
Object {
"container": "src-shared-components-tc-communities-communities-taskforce-Home-___style__resourcesContainer___tnDQ3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ exports[`Snapshot match 1`] = `
composeContextTheme="softly"
link={null}
mapThemrProps={[Function]}
subTitle=""
theme={
Object {
"container": "src-shared-components-tc-communities-communities-tc-prod-dev-Learn-___style__learnBasicsContainer___1iYDC",
Expand Down Expand Up @@ -234,6 +235,7 @@ exports[`Snapshot match 1`] = `
}
}
mapThemrProps={[Function]}
subTitle=""
theme={
Object {
"container": "src-shared-components-tc-communities-communities-tc-prod-dev-Learn-___style__coursesContainer____PCRk",
Expand Down Expand Up @@ -297,6 +299,7 @@ exports[`Snapshot match 1`] = `
composeContextTheme="softly"
link={null}
mapThemrProps={[Function]}
subTitle=""
theme={
Object {
"container": "src-shared-components-tc-communities-communities-tc-prod-dev-Learn-___style__resourcesContainer___1uPkY",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ exports[`Snapshot match 1`] = `
composeContextTheme="softly"
link={null}
mapThemrProps={[Function]}
subTitle=""
theme={Object {}}
themePriority="adhoc-context-default"
title={null}
Expand Down
Binary file modified src/assets/themes/veterans/home/banner.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/card-01.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/card-02.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/card-03.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/card-04.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/card-05.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/card-06.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/card-07.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/card-b-01.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/card-b-02.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/card-b-03.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/card-b-04.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/card-b-05.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/card-b-06.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/icon-01.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/icon-02.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/icon-03.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/icon-04.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/image-01.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/image-02.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/image-03.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/image-04.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/image-05.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/themes/veterans/home/image-06.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/themes/veterans/home/image-text-do.jpg
Binary file not shown.
Diff not rendered.
Binary file added src/assets/themes/veterans/home/logo-01.jpg
Binary file added src/assets/themes/veterans/home/logo-02.jpg
Binary file added src/assets/themes/veterans/home/logo-03.jpg
Binary file added src/assets/themes/veterans/home/logo-04.jpg
Binary file added src/assets/themes/veterans/home/logo-05.jpg
4 changes: 1 addition & 3 deletions src/server/tc-communities/veterans/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"value": "2"
}],
"groupIds": ["20000007"],
"terms": [21193],
"logos": [{
"img": "/themes/veterans/logo_topcoder_with_name.svg",
"url": "https://www.topcoder.com"
Expand All @@ -27,9 +28,6 @@
}, {
"title": "Challenges",
"url": "/challenges"
}, {
"title": "Leaderboard",
"url": "/leaderboard"
}
],
"leaderboardApiUrl": "https://api.topcoder.com/v4/looks/458/run/json/",
Expand Down
6 changes: 5 additions & 1 deletion src/shared/components/tc-communities/Section/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@ import { Link } from 'utils/router';
import defaultStyle from './style.scss';

function Section(props) {
const { anchor, title, children, link, theme } = props;
const { anchor, subTitle, title, children, link, theme } = props;

return (
<section className={theme.container}>
{anchor && <a name={anchor}>&nbsp;</a>}
{title &&
<h2 className={theme.title}>{title}</h2>
}
{subTitle ? <h3 className={theme.subTitle}>{subTitle}</h3> : null}
<div className={theme.content}>
{children}
</div>
Expand All @@ -42,13 +43,15 @@ function Section(props) {

Section.defaultProps = {
anchor: null,
subTitle: '',
title: null,
link: null,
theme: {},
};

Section.propTypes = {
anchor: PT.string,
subTitle: PT.string,
title: PT.string,
children: PT.node.isRequired,
link: PT.shape({
Expand All @@ -57,6 +60,7 @@ Section.propTypes = {
}),
theme: PT.shape({
container: PT.string,
subTitle: PT.string,
title: PT.string,
content: PT.string,
linkWrap: PT.string,
Expand Down
14 changes: 13 additions & 1 deletion src/shared/components/tc-communities/Section/style.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~styles/tc-styles';
@import '~styles/mixins';

.container {
padding: 35px 0;
Expand All @@ -9,6 +9,18 @@
}
}

.subTitle {
color: #394146;
font: 18px 'Open Sans';
padding: 0 0 30px;
text-align: center;

@include xxs-to-xs {
font-size: 24px;
padding-top: 30px;
}
}

.title {
color: #394146;
font: 600 36px/136.11% 'Open Sans';
Expand Down
Loading