Skip to content

Commit e221b58

Browse files
author
Parth Shah
committed
Merge branch 'dev'
2 parents 4f2b9a3 + 9fdca35 commit e221b58

File tree

17 files changed

+739
-375
lines changed

17 files changed

+739
-375
lines changed

‎src/components/ActionCard/Comment.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const Comment = ({avatarUrl, authorName, date, children, active, self}) => (
1717
{date}
1818
</div>
1919
</div>
20-
<div className="comment-body">
20+
<div className="comment-body draftjs-post">
2121
<p>
2222
{children}
2323
</p>

‎src/components/ConnectTerms/ConnectTerms.jsx‎

Lines changed: 77 additions & 0 deletions
Large diffs are not rendered by default.

‎src/components/ConnectTerms/ConnectTerms.scss‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
@import 'tc-includes';
2+
3+
.terms-page-wrapper {
4+
background-color: $tc-gray-neutral-light;
5+
text-align: center;
6+
padding-right: 40px;
7+
padding-left: 40px;
8+
padding-bottom: 40px;
9+
@include roboto-light;
10+
11+
.terms-page {
12+
display: block;
13+
max-width: 960px;
14+
padding: 70px 100px;
15+
margin: 20px auto;
16+
17+
text-align: left;
18+
19+
background: $tc-white;
20+
box-shadow: 0px 1px 3px 0px $tc-gray-30;
21+
strong {
22+
@include roboto-bold;
23+
}
24+
25+
& h1,h2,h3 {
26+
text-transform: uppercase;
27+
color: $tc-gray-80;
28+
}
29+
30+
& h1 {
31+
font-size: 28px;
32+
line-height: 35px;
33+
font-weight: 300;
34+
padding-bottom: 15px;
35+
}
36+
& h2 {
37+
font-size: 20px;
38+
line-height: 30px;
39+
padding-bottom: 15px;
40+
padding-top: 10px;
41+
font-weight: 500;
42+
}
43+
44+
& h3 {
45+
font-size: 16px;
46+
line-height: 25px;
47+
padding-bottom: 0;
48+
padding-top: 10px;
49+
font-weight: bold;
50+
}
51+
52+
& p {
53+
@include roboto;
54+
font-size: 16px;
55+
line-height: 25px;
56+
color: $tc-gray-80;
57+
font-weight: 300;
58+
padding-bottom: 1em;
59+
}
60+
61+
& a {
62+
color: $tc-dark-blue;
63+
&:hover {
64+
text-decoration: underline;
65+
}
66+
}
67+
68+
& ol,
69+
& ul {
70+
list-style: outside;
71+
padding-left: 1em;
72+
padding-bottom: 1em;
73+
padding-top: 1em;
74+
font-weight: bold;
75+
li {
76+
@include roboto-light;
77+
font-size: 16px;
78+
line-height: 25px;
79+
color: $tc-gray-80;
80+
padding-bottom: 1em;
81+
padding-left: 1em;
82+
font-weight: 300;
83+
}
84+
}
85+
86+
& ol {
87+
list-style-type: decimal;
88+
}
89+
90+
& ul {
91+
list-style-type: disc;
92+
}
93+
}
94+
}

‎src/components/FileList/FileList.scss‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// reset styles of panel class, we need panel class to activate the modal-overlay
55
border: none;
66
box-shadow: none;
7-
> h4 {
87

8+
> h4 {
99
@include roboto-medium;
1010
font-size: 15px;
1111
color: $tc-gray-50;
@@ -20,45 +20,56 @@
2020
padding: 15px 0;
2121
width: 100%;
2222
align-items: stretch;
23+
2324
.icon-col {
2425
padding-top: 3px;
2526
width: 60px;
2627
}
28+
2729
.content-col {
2830
flex: 2;
2931

3032
h4 {
3133
@include roboto-bold;
3234
font-size: 15px;
3335
color: $tc-gray-80;
36+
max-width: 380px;
3437
}
38+
3539
p {
3640
@include roboto;
3741
font-size: 13px;
38-
color: $tc-gray-60;
39-
line-height: 25px;
42+
font-weight: 400;
43+
color: $tc-gray-70;
44+
line-height: 20px;
4045
}
46+
4147
.title {
4248
width: 100%;
4349
display: flex;
4450
line-height: 25px;
4551
}
52+
4653
.size {
4754
@include roboto;
4855
font-size: 15px;
4956
color: $tc-gray-60;
5057
margin-left: auto;
5158
}
59+
5260
.edit-icons {
5361
margin-left: 5px;
62+
5463
i {
5564
cursor: pointer;
5665
}
5766
}
67+
5868
.title-edit {
5969
display: flex;
6070
align-items: center;
6171
margin-bottom: 10px;
72+
6273
input {
6374
@include roboto-bold;
6475
font-size: 15px;
@@ -83,22 +94,25 @@
8394
resize: none;
8495
}
8596
}
97+
8698
.icon-trash,
8799
.icon-edit {
88100
margin-left: 13px;
89101
vertical-align: middle;
90102
}
103+
91104
.icon-trash {
92105
margin-left: 22px;
93106
}
107+
94108
.icon-save {
95109
margin-right: 25px;
96110
}
111+
97112
.icon-close {
98113
margin-right: 10px;
99114
}
100115
}
101116

102117
.delete-file-modal {
103-
104118
}

‎src/components/Footer/Footer.jsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ require('./Footer.scss')
77
const Footer = () => {
88
const currentYear = moment().format('YYYY')
99
const otherNavigationItems = [
10-
{img: '', text: 'About', link: 'https://www.topcoder.com/about-topcoder/'},
11-
{img: '', text: 'Contact', link: 'https://www.topcoder.com/about-topcoder/contact/'},
12-
{img: '', text: 'Help', link: 'https://help.topcoder.com/hc/en-us'},
13-
{img: '', text: 'Privacy', link: 'https://www.topcoder.com/community/how-it-works/privacy-policy/'},
10+
{img: '', text: 'About', link: 'https://www.topcoder.com/about-topcoder/', target: '_blank'},
11+
{img: '', text: 'Contact', link: 'https://www.topcoder.com/about-topcoder/contact/', target: '_blank'},
12+
{img: '', text: 'Help', link: 'https://help.topcoder.com/hc/en-us', target: '_blank'},
13+
{img: '', text: 'Privacy', link: 'https://www.topcoder.com/community/how-it-works/privacy-policy/', target: '_blank'},
1414
{img: '', text: 'Terms', link: 'https://connect.topcoder.com/terms'}
1515
]
1616
const isProjectDetails = /projects\/\d+/.test(window.location.pathname)

‎src/components/FooterV2/FooterV2.jsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import './FooterV2.scss'
44
const FooterV2 = () => (
55
<div className="footer-v2">
66
<ul className="footer-links">
7-
<li><a href="https://www.topcoder.com/about-topcoder/">About</a></li>
8-
<li><a href="https://www.topcoder.com/about-topcoder/contact/">Contact</a></li>
9-
<li><a href="https://help.topcoder.com/hc/en-us">Help</a></li>
10-
<li><a href="https://www.topcoder.com/community/how-it-works/privacy-policy/">Privacy</a></li>
7+
<li><a href="https://www.topcoder.com/about-topcoder/" target="_blank">About</a></li>
8+
<li><a href="https://www.topcoder.com/about-topcoder/contact/" target="_blank">Contact</a></li>
9+
<li><a href="https://help.topcoder.com/hc/en-us" target="_blank">Help</a></li>
10+
<li><a href="https://www.topcoder.com/community/how-it-works/privacy-policy/" target="_blank">Privacy</a></li>
1111
<li><a href="https://connect.topcoder.com/terms">Terms</a></li>
1212
</ul>
1313
<div className="footer-copyright">

‎src/config/constants.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,4 +212,6 @@ export const CODER_BOT_USER_LNAME = 'Bot'
212212

213213
export const PROJECT_MAX_COLORS = 5
214214

215-
export const AUTOCOMPLETE_TRIGGER_LENGTH = 3
215+
export const AUTOCOMPLETE_TRIGGER_LENGTH = 3
216+
217+
export const HEAP_ANALYTICS_APP_ID = process.env.HEAP_ANALYTICS_APP_ID || '4153837120'

‎src/index.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<meta http-equiv="X-UA-Compatible" content="IE=edge">
77
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
88
<base href="/">
9+
<script type="text/javascript">
10+
</script>
911
</head>
1012
<body>
1113
<div id="root"></div>

‎src/index.jsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,18 @@ import Router from 'react-router/lib/Router'
88
import store from './config/store'
99
import routes from './routes'
1010
import { TCEmitter } from './helpers'
11-
import { EVENT_ROUTE_CHANGE } from './config/constants'
11+
import { EVENT_ROUTE_CHANGE, HEAP_ANALYTICS_APP_ID } from './config/constants'
1212

1313
const mountNode = document.getElementById('root')
1414
const onRouteChange = () => {
1515
TCEmitter.emit(EVENT_ROUTE_CHANGE, window.location.pathname)
1616
}
1717

18+
/* eslint-disable */
19+
window.heap=window.heap||[],heap.load=function(e,t){window.heap.appid=e,window.heap.config=t=t||{};var r=t.forceSSL||"https:"===document.location.protocol,a=document.createElement("script");a.type="text/javascript",a.async=!0,a.src=(r?"https:":"http:")+"//cdn.heapanalytics.com/js/heap-"+e+".js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(a,n);for(var o=function(e){return function(){heap.push([e].concat(Array.prototype.slice.call(arguments,0)))}},p=["addEventProperties","addUserProperties","clearEventProperties","identify","removeEventProperty","setEventProperties","track","unsetEventProperty"],c=0;c<p.length;c++)heap[p[c]]=o(p[c])};
20+
heap.load(HEAP_ANALYTICS_APP_ID);
21+
/* eslint-enable */
22+
1823
render((
1924
<Provider store={store}>
2025
<Router history={browserHistory} routes={routes} onUpdate={onRouteChange} />

0 commit comments

Comments
 (0)