Skip to content

Commit 03ce6e0

Browse files
authored
Merge pull request #4196 from topcoder-platform/comcast-community
Fixes #4195
2 parents 8c0cd76 + b0da9f4 commit 03ce6e0

File tree

8 files changed

+231
-32
lines changed

8 files changed

+231
-32
lines changed
Loading
Loading

src/assets/themes/comcast/logo_topcoder_with_name.svg

-29
This file was deleted.

src/server/tc-communities/comcast/metadata.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"img": "/community-app-assets/themes/comcast/corporate_Official-Comcast-Logo.png",
1717
"url": "https://www.comcast.com"
1818
}, {
19-
"img": "/community-app-assets/themes/comcast/logo_topcoder_with_name.svg",
19+
"img": "/community-app-assets/themes/comcast/logo_topcoder_with_name.png",
2020
"url": "https://www.topcoder.com"
2121
}],
2222
"footerText": "© Copyright Topcoder, 2020",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/**
2+
* Default button style: white background, dark gray text, gray border,
3+
* a bit rounded corners.
4+
*/
5+
6+
@import "~styles/mixins";
7+
8+
@mixin feedback {
9+
&:active {
10+
background: white;
11+
border: 1px solid #00a2e0;
12+
}
13+
14+
&:focus {
15+
background: white;
16+
border: 1px solid #00a2e0;
17+
}
18+
19+
&:hover {
20+
background: white;
21+
border: 1px solid #00a2e0;
22+
}
23+
}
24+
25+
.button {
26+
background: white;
27+
border: 1px solid #00a2e0;
28+
border-radius: 40px;
29+
// display: inline-block;
30+
font: 16px/36px "Akkurat regular", monospace !important;
31+
// margin: $base-unit;
32+
width: 250px;
33+
text-align: center;
34+
vertical-align: top;
35+
36+
a,
37+
&,
38+
&:visited {
39+
color: #00a2e0 !important;
40+
text-decoration: none !important;
41+
}
42+
}
43+
44+
.disabled {
45+
background: white;
46+
color: #00a2e0;
47+
cursor: not-allowed;
48+
}
49+
50+
.link {
51+
@include feedback;
52+
}
53+
54+
.regular {
55+
@include feedback;
56+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
/*
2+
Theme for Header component used in Comcast site
3+
*/
4+
@import '~styles/mixins';
5+
6+
.container {
7+
background-color: #2a2a2a;
8+
box-shadow: none;
9+
min-height: 80px;
10+
11+
@include lg-to-xl {
12+
display: flex;
13+
justify-content: space-between;
14+
align-items: center;
15+
}
16+
}
17+
18+
.challengeDropdown {
19+
@include roboto-regular;
20+
21+
font-size: 13px;
22+
font-weight: 700;
23+
line-height: 25px;
24+
color: $tc-white;
25+
text-transform: uppercase;
26+
27+
:global {
28+
.Select-menu-outer {
29+
padding-left: 0;
30+
padding-right: 0;
31+
border-radius: 0 0 6px 6px;
32+
box-shadow: 0 2px 9px 0 rgba(38, 38, 40, 0.15);
33+
34+
.Select-option {
35+
@include roboto-regular;
36+
37+
font-size: 13px;
38+
font-weight: 400;
39+
line-height: 30px;
40+
text-transform: uppercase;
41+
color: #47474f;
42+
padding-left: 10px;
43+
padding-right: 20px;
44+
45+
&.is-selected,
46+
&:hover {
47+
background-color: #dcdce0;
48+
}
49+
}
50+
}
51+
}
52+
53+
@include lg-to-xl {
54+
border-left: none;
55+
padding-left: 90px;
56+
}
57+
}
58+
59+
.header {
60+
.mobileToggle {
61+
display: none;
62+
}
63+
64+
.logosWrap {
65+
margin-left: 21px;
66+
display: flex;
67+
align-items: center;
68+
69+
@include sm-to-md {
70+
display: flex;
71+
padding-top: 15px;
72+
margin-left: 15px;
73+
}
74+
}
75+
}
76+
77+
.menuWrap {
78+
@include lg-to-xl {
79+
max-width: $screen-lg;
80+
margin-left: -255px;
81+
}
82+
83+
.menu {
84+
display: flex;
85+
86+
@include sm-to-md {
87+
display: flex;
88+
padding: 15px;
89+
justify-content: flex-start;
90+
}
91+
}
92+
93+
.menuItem {
94+
margin-right: 30px;
95+
96+
.menuLink {
97+
color: #fff;
98+
font-family: Roboto, sans-serif;
99+
font-size: 14px;
100+
font-weight: 700;
101+
line-height: 30px;
102+
103+
&:hover {
104+
color: #43d7b0;
105+
}
106+
}
107+
108+
.menuLinkActive {
109+
color: #43d7b0;
110+
}
111+
}
112+
}
113+
114+
.menuWrapOpen {
115+
@include xs-to-md {
116+
overflow: visible;
117+
}
118+
}
119+
120+
.userWrap {
121+
@include lg-to-xl {
122+
margin-right: 30px;
123+
}
124+
125+
@include sm-to-md {
126+
display: none;
127+
}
128+
129+
.additionalLogos {
130+
@include xs-to-sm {
131+
margin: 0;
132+
}
133+
}
134+
135+
.userMenu {
136+
@include lg-to-xl {
137+
display: flex;
138+
align-items: center;
139+
}
140+
141+
.userMenuHandle {
142+
color: white !important;
143+
font-family: Roboto, sans-serif;
144+
font-size: 14px;
145+
font-weight: 400;
146+
line-height: 30px;
147+
text-decoration: underline;
148+
}
149+
}
150+
}
151+
152+
.logo {
153+
img {
154+
max-height: 34px;
155+
margin-right: 20px;
156+
}
157+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import dangerButtonTheme from
2+
'components/buttons/outline/round/akkurat/danger.scss';
3+
import primaryButtonTheme from
4+
'components/buttons/outline/round/akkurat/primary.scss';
5+
import defaultButtonTheme from
6+
'components/buttons/outline/round/akkurat/default.scss';
7+
import headerTheme from './header.scss';
8+
9+
export default {
10+
CommunityHeader: headerTheme,
11+
DangerButton: dangerButtonTheme,
12+
DefaultButton: defaultButtonTheme,
13+
PrimaryButton: primaryButtonTheme,
14+
SecondaryButton: primaryButtonTheme,
15+
};

src/shared/routes/Communities/Comcast/Routes.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import ChallengeDetails from 'routes/ChallengeDetails';
66
import ChallengeListing from 'routes/Communities/ChallengeListing';
77
import Error404 from 'components/Error404';
8-
import Footer from 'components/tc-communities/communities/cs/Footer';
8+
import Footer from 'components/TopcoderFooter';
99
import Header from 'containers/tc-communities/Header';
1010
import PT from 'prop-types';
1111
import React from 'react';
@@ -15,7 +15,7 @@ import TermsDetail from 'routes/TermsDetail';
1515
import Profile from 'routes/Profile';
1616
import ProfileStats from 'routes/ProfileStats';
1717
import Settings from 'routes/Settings';
18-
import theme from 'components/tc-communities/communities/cs/theme';
18+
import theme from 'components/tc-communities/communities/comcast/theme';
1919
import { ThemeProvider } from 'react-css-super-themr';
2020
import { Route, Switch } from 'react-router-dom';
2121
import ContentfulRoute from 'components/Contentful/Route';

0 commit comments

Comments
 (0)