Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
aabfc20
restore reverted changes for sup-2131
thabofletcher Oct 28, 2015
a678ac0
Merge branch 'dev' of https://github.com/appirio-tech/tc-site into su…
thabofletcher Oct 28, 2015
ad13cca
Merge branch 'dev' of https://github.com/appirio-tech/tc-site into su…
thabofletcher Oct 29, 2015
3741758
Merge branch 'release' of https://github.com/appirio-tech/tc-site int…
thabofletcher Oct 29, 2015
02f44d9
remove duplicated sofia pro
thabofletcher Oct 29, 2015
b89687f
remove changes made for community page
thabofletcher Oct 29, 2015
1f25cab
scoped stylish styles
thabofletcher Oct 30, 2015
45b2cbd
Merge branch 'dev' of https://github.com/appirio-tech/tc-site into su…
thabofletcher Oct 30, 2015
5437a33
move scoping of stylish reskin to not affect footer
thabofletcher Oct 30, 2015
85e0da9
challenge listing reskin style changes
thabofletcher Nov 4, 2015
2f4aa4b
match style of search in topcoder app
thabofletcher Nov 4, 2015
42b373e
Merge pull request #205 from appirio-tech/sup-2332-search-style
thabofletcher Nov 4, 2015
68b1910
Merge pull request #206 from appirio-tech/dev
thabofletcher Nov 4, 2015
fa3a612
revert $app_base change
thabofletcher Nov 5, 2015
9b5a469
Left align header with correct padding
Nov 5, 2015
d427934
update forum url for dev build
thabofletcher Nov 7, 2015
058c04c
Merge pull request #207 from appirio-tech/sup-2333-forums-env-url
thabofletcher Nov 7, 2015
8cca7a0
update forum url for qa build
thabofletcher Nov 7, 2015
1d8f156
Merge pull request #208 from appirio-tech/sup-2333-forums-env-url
thabofletcher Nov 7, 2015
979d471
Merge pull request #209 from appirio-tech/dev
thabofletcher Nov 7, 2015
c33fa70
Add new track icons
Nov 11, 2015
6b978f7
Remove hidden arrow background image and adjust margin
Nov 11, 2015
827d716
Center grid view
Nov 11, 2015
704464f
Show new icons for grid and list view
Nov 11, 2015
d603def
Change non ReactJS list view icons
Nov 11, 2015
48ea0c9
Redirect to /logout
Nov 11, 2015
4794caa
Redirect to /logout
Nov 11, 2015
d574f3f
Put back always
Nov 11, 2015
29d0d6a
Remove always for vagrant environment
Nov 12, 2015
d804a14
Merge pull request #210 from appirio-tech/nick-redirect-logout
nlitwin Nov 12, 2015
1e12a8a
Merge branch 'dev' into sup-2131-challenges-ui
Nov 12, 2015
c66117b
Add RSS feed button to header
Nov 12, 2015
4d306f1
Fix challenge details - css and duplication bug
Nov 13, 2015
2ed950a
Replace arrow-button with pure white colored one
Nov 13, 2015
94b5605
Remove box shadow upon hover
Nov 13, 2015
ee53775
Make headers black instead of colored by track
Nov 13, 2015
528b16e
Remove comments
Nov 13, 2015
b61a506
Merge pull request #211 from appirio-tech/sup-2131-challenges-ui
nlitwin Nov 13, 2015
199a1c9
Merge pull request #212 from appirio-tech/dev
nlitwin Nov 16, 2015
11e23a1
Add new banner images
Nov 20, 2015
3cdb77d
Fix font sizes and family
Nov 20, 2015
dde1218
Align rss feed button to the top
Nov 20, 2015
507dca0
Fix text from getting cut off on the bottom:
Nov 20, 2015
5c3497a
Capitalize Topcoder properly and remove <br>'s
Nov 20, 2015
b4eff28
Swap in new banner images
Nov 20, 2015
e8849d5
More CSS tweaks
Nov 20, 2015
8a63957
Merge pull request #213 from appirio-tech/more-more-updates
nlitwin Nov 20, 2015
957cd9e
Merge pull request #214 from appirio-tech/dev
nlitwin Nov 20, 2015
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
2 changes: 1 addition & 1 deletion src/conf/build-dev.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
grunt --main-url=https://www.topcoder-dev.com --auth-main-url=topcoder-dev.auth0.com --auth-client-id=JFDo7HMkf0q2CkVFHojy3zHWafziprhT --auth-callback-url=https://www.topcoder-dev.com/reg2/callback.action --api-url=https://api.topcoder-dev.com/v2 --lc-url=https://dev-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://dev-lc1-discussion-service.herokuapp.com --lc-user-url=https://dev-lc1-user-service.herokuapp.com --lc-site-url=https://dev-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-dev.com --photo-link-base=https://www.topcoder-dev.com --review-app-url=software.topcoder-dev.com/review --help-app-url=help.topcoder-dev.com --forums-app-url=forums.topcoder-dev.com --swift-program-id=3445 --swift-program-url=http://ios.topcoder-dev.com --blog-rss-feed="https://www.topcoder-dev.com/feed/?post_type=blog" --api3-url=https://api.topcoder-dev.com/v3 --use-cdn=1 --use-min=1
grunt --main-url=https://www.topcoder-dev.com --auth-main-url=topcoder-dev.auth0.com --auth-client-id=JFDo7HMkf0q2CkVFHojy3zHWafziprhT --auth-callback-url=https://www.topcoder-dev.com/reg2/callback.action --api-url=https://api.topcoder-dev.com/v2 --lc-url=https://dev-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://dev-lc1-discussion-service.herokuapp.com --lc-user-url=https://dev-lc1-user-service.herokuapp.com --lc-site-url=https://dev-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-dev.com --photo-link-base=https://www.topcoder-dev.com --review-app-url=software.topcoder-dev.com/review --help-app-url=help.topcoder-dev.com --forums-app-url=apps.topcoder-dev.com/forums/ --swift-program-id=3445 --swift-program-url=http://ios.topcoder-dev.com --blog-rss-feed="https://www.topcoder-dev.com/feed/?post_type=blog" --api3-url=https://api.topcoder-dev.com/v3 --use-cdn=1 --use-min=1
2 changes: 1 addition & 1 deletion src/conf/build-qa.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
grunt --main-url=https://www.topcoder-qa.com --auth-main-url=topcoder-qa.auth0.com --auth-client-id=EVOgWZlCtIFlbehkq02treuRRoJk12UR --auth-callback-url="https://www.topcoder-qa.com/reg2/callback.action" --api-url=https://api.topcoder-qa.com/v2 --lc-url=https://qa-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://qa-lc1-discussion-service.herokuapp.com --lc-user-url=https://qa-lc1-user-service.herokuapp.com --lc-site-url=https://qa-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-qa.com --photo-link-base=https://www.topcoder-qa.com --review-app-url=software.topcoder-qa.com/review --help-app-url=help.topcoder-qa.com --forums-app-url=forums.topcoder-qa.com --swift-program-id=3445 --swift-program-url=http://ios.topcoder-qa.com --blog-rss-feed="https://www.topcoder-qa.com/feed/?post_type=blog" --api3-url=https://api.topcoder-qa.com/v3 --use-cdn=1 --use-min=1
grunt --main-url=https://www.topcoder-qa.com --auth-main-url=topcoder-qa.auth0.com --auth-client-id=EVOgWZlCtIFlbehkq02treuRRoJk12UR --auth-callback-url="https://www.topcoder-qa.com/reg2/callback.action" --api-url=https://api.topcoder-qa.com/v2 --lc-url=https://qa-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://qa-lc1-discussion-service.herokuapp.com --lc-user-url=https://qa-lc1-user-service.herokuapp.com --lc-site-url=https://qa-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-qa.com --photo-link-base=https://www.topcoder-qa.com --review-app-url=software.topcoder-qa.com/review --help-app-url=help.topcoder-qa.com --forums-app-url=apps.topcoder-qa.com/forums/ --swift-program-id=3445 --swift-program-url=http://ios.topcoder-qa.com --blog-rss-feed="https://www.topcoder-qa.com/feed/?post_type=blog" --api3-url=https://api.topcoder-qa.com/v3 --use-cdn=1 --use-min=1
2 changes: 1 addition & 1 deletion src/conf/tc-nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ server {

location ~ ^/fonts/ {
add_header 'Access-Control-Allow-Origin' "$http_origin";
add_header 'Access-Control-Allow-Headers' "Content-Type,Accept,Origin,User-Agent,DNT,Cache-Control,X-Mx-ReqToken,Keep-Alive,X-Requested-With,If-Modified-Since" always;
add_header 'Access-Control-Allow-Headers' "Content-Type,Accept,Origin,User-Agent,DNT,Cache-Control,X-Mx-ReqToken,Keep-Alive,X-Requested-With,If-Modified-Since";
root $root_base/dist;
}

Expand Down
78 changes: 37 additions & 41 deletions src/css/advanced-search.css
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
display: block !important;
width: 11px !important;
height: 7px !important;
background: url("../i/icon-filter.png") no-repeat 0 0 !important;
background: url("../i/icon-filter-blue.png") no-repeat 0 0 !important;
right: 10px !important;
top: 14px !important;
position: absolute !important;
Expand Down Expand Up @@ -120,7 +120,7 @@
border-bottom: none;
}
.select2-results .select2-highlighted {
background: #ff9900 !important;
background: #0096FF !important;
color: #fff !important;
}
.select2-results .select2-disabled .select2-result-label {
Expand Down Expand Up @@ -153,12 +153,8 @@
clear: both;
}
.new-search-box {
width: 100%;
display: block;
height: auto;
position: relative;
border: 1px solid #e1e1e1;
border-bottom: 0;
margin: 0 55px 0 55px;
}
.new-search-box input.search-text {
height: 30px;
Expand Down Expand Up @@ -282,7 +278,7 @@ input.search-text::-webkit-input-placeholder {
margin-left: 8px;
margin-right: 6px;
margin-top: 11px;
background: url("../i/close-tag.png") no-repeat;
background: url("../i/close-tag-blue.png") no-repeat;
display: block;
width: 7px;
height: 7px;
Expand Down Expand Up @@ -368,7 +364,7 @@ input.search-text::-webkit-input-placeholder {
display: block;
width: 28px;
height: 28px;
background: url("../i/icon-filter.png") no-repeat 0 -18px;
background: url("../i/icon-filter-blue.png") no-repeat 0 -18px;
position: relative;
top: 3px;
}
Expand Down Expand Up @@ -415,7 +411,7 @@ input.search-text::-webkit-input-placeholder {
.datepic-head {
line-height: 36px;
font-size: 14px;
color: #ff9900;
color: #0096FF;
margin-right: 18px;
}
.from-datepicker.hasDatepicker{
Expand Down Expand Up @@ -503,10 +499,10 @@ input.search-text::-webkit-input-placeholder {
color: #fff;
margin-left: 16px;
}
/* myFilterWrap */
/* myFilterWrap */
.new-search-box .filtersSectn{
background: #f9f9f9;

padding-left: 15px;
width: 304px;
box-sizing: border-box;
Expand Down Expand Up @@ -539,13 +535,13 @@ input.search-text::-webkit-input-placeholder {
padding-left: 8px;
color: #666;
position: relative;
}
}
.myFilterWrap .btnFilter .arrow{
display: block;
width: 12px;
height: 10px;
background: url("../i/icon-filter.png") no-repeat 0 0;
display: block;
width: 12px;
height: 10px;

background: url("../i/icon-filter-blue.png") no-repeat 0 0;
position: absolute;
right: 10px;
top: 15px;
Expand All @@ -566,21 +562,21 @@ input.search-text::-webkit-input-placeholder {
font-size: 22px;
font-weight: normal;
padding: 0 15px;
}
}
.myFilterWrap .caption{
color: #666;
font-size: 13px;
font-weight: 300;
padding: 0 15px 12px;
border-bottom: 1px solid #E7E7E7;
}
}
.myFilterWrap .savedSearchList{
padding: 4px 12px;
max-height: 290px;
overflow: auto;
}
}
.myFilterWrap .filterPop .hr{
height: 1px;
height: 1px;
background: #e7e7e7;
}
.myFilterWrap .savedSearchList h6{
Expand All @@ -597,9 +593,9 @@ input.search-text::-webkit-input-placeholder {
padding: 11px 11px 13px;
min-height: 78px;
box-sizing: border-box;
}
}
.myFilterWrap .savedSearch:hover{
border: 1px solid #f90;
border: 1px solid #0096FF;
cursor: pointer;
}
.myFilterWrap .savedSearch .name{
Expand All @@ -609,23 +605,23 @@ input.search-text::-webkit-input-placeholder {
overflow: hidden;
white-space: nowrap;
height: 18px;
}
}
.myFilterWrap .savedSearch:hover .name{
color: #f90;
color: #0096FF;
}
.myFilterWrap .savedSearch .opts{
margin-top: -18px;

box-sizing: border-box;
height: 18px;
padding-top: 3px;
}
.myFilterWrap .savedSearch .lbl{
line-height: 13px;
}
}
.myFilterWrap .savedSearch .chk{
vertical-align: top;
}
}
.myFilterWrap .savedSearch .chkWrap .chk + .chkLbl{
padding-left: 15px;
}
Expand All @@ -645,14 +641,14 @@ input.search-text::-webkit-input-placeholder {
height: 12px;
width: 12px;
margin-left: 11px;
}
}
.myFilterWrap .btnRemove:hover{
background: url(@@cdn/i/ico-failed-x.png) 50% 50% no-repeat;
}
.myFilterWrap .savedSearch .tags{
margin-top: 16px;
overflow: hidden;
}
}
.myFilterWrap .savedSearch .tags .tag{
max-width: 100%;
text-overflow: ellipsis;
Expand All @@ -666,7 +662,7 @@ input.search-text::-webkit-input-placeholder {
margin-right: 4px;
margin-bottom: 6px;
padding: 0 5px;
}
}

.btnSecondary{
background: #c2c2c2;
Expand Down Expand Up @@ -700,14 +696,14 @@ input.search-text::-webkit-input-placeholder {
}
.filterWidget .details{
padding-top: 19px;
}
}
.filterWidget .rw{
padding: 0 12px 12px;
}
}
.filterWidget .lbl{
margin-bottom: 10px;
display: block;
}
}
.filterWidget #searchSaveTxt{
background: #fff;
border: 1px solid #e7e7e7;
Expand All @@ -723,7 +719,7 @@ input.search-text::-webkit-input-placeholder {
}
.filterWidget .alertMe{
margin: 23px 26px 12px;
}
}
.chkWrap{
position: relative;
}
Expand All @@ -732,14 +728,14 @@ input.search-text::-webkit-input-placeholder {
top: 0;
left: 0;
opacity: 0;
}
}
.chkWrap .chk + .chkLbl{
padding-left: 30px;
max-width: 215px;
display: inline-block;
-webkit-user-select: none;
line-height: 16px;
}
}
.chkWrap .chk + .chkLbl:before{
content: '';
position: absolute;
Expand All @@ -756,7 +752,7 @@ input.search-text::-webkit-input-placeholder {
}
.chkWrap .myChallengesLabel .chk + .chkLbl{
padding-left: 20px;

}
.chkWrap .myChallengesLabel .chk + .chkLbl:before{
background-image: url(@@cdn/i/chk3.png);
Expand All @@ -766,11 +762,11 @@ input.search-text::-webkit-input-placeholder {
border-top: 1px solid #e7e7e7;
padding: 10px 5px 10px 0;
text-align: right;
}
}
.filterWidget .actn .btnCancel{
width: 86px;
margin: 0 4px;
}
}
.filterWidget .actn .btnSaveSearch{
margin: 0 4px;
width: 145px;
Expand Down
Loading