Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Promoting to prod #813

Merged
merged 9 commits into from
May 13, 2016
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
2 changes: 1 addition & 1 deletion app/layout/footer/footer.jade
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ footer.bottom-footer
ul.submenu
li.submenu-item #[a.menu-link(ng-href="https://www.{{domain}}/sitemap") SITE MAP]
li.submenu-item #[a.menu-link(ng-href="https://www.{{domain}}/about") ABOUT US]
li.submenu-item #[a.menu-link(ng-href="https://www.{{domain}}/contact-us") CONTACT US]
li.submenu-item #[a.menu-link(ng-href="https://help.{{domain}}/hc/en-us/articles/219069687-Contact-Support") CONTACT US]
li.submenu-item #[a.menu-link(ng-href="https://help.{{domain}}" target="_blank") HELP CENTER]
li.submenu-item #[a.menu-link(ng-href="https://www.{{domain}}/community/how-it-works/privacy-policy/") PRIVACY POLICY]
li.submenu-item #[a.menu-link(ng-href="https://www.{{domain}}/community/how-it-works/terms/") TERMS]
Expand Down
10 changes: 10 additions & 0 deletions app/my-dashboard/my-dashboard.jade
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@
//- tc-banner(theme="black", banner-name="ttl")
.one-million
tc-banner(theme="black", banner-name="1million")
.social-sharing
span #TC1MILLION on
//- hardcoded domain because we need the links to be shared only for prod
//- and after some time we would remove this banner
a.twitter(href="//twitter.com/home?status=Topcoder%20has%20reached%20an%20epic%20milestone%20and%20is%20now%20over%201%20Million%20Strong!%20https%3A//www.topcoder.com/blog/1-million-members-strong/%20%23TC1MILLION")
img(src="//topcoder.com/wp-content/uploads/2016/05/btn-social-twitter.png")

a.facebook(href="http://www.facebook.com/sharer/sharer.php?s=100&p[url]=https://www.topcoder.com/blog/1-million-members-strong/&p[images][0]=https://www.topcoder.com/wp-content/uploads/2016/05/Blog_banner_1mil.png&p[title]=1 Million Members Strong&p[summary]=1+Million+Members+Strong%0A")
img(src="//topcoder.com/wp-content/uploads/2016/05/btn-social-fb.png")


.tco
tc-banner(theme="black", banner-name="tco16")
Expand Down
2 changes: 1 addition & 1 deletion app/settings/email/email.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ import angular from 'angular'
vm.loading = false
if (!subscription) {
// add member to the list with default preferences
MailchimpService.addSubscription(userData, {}).then(function(resp) {
MailchimpService.addSubscription(userData).then(function(resp) {
logger.debug(resp)
}).catch(function(err) {
// no error to user
Expand Down
20 changes: 20 additions & 0 deletions assets/css/my-dashboard/my-dashboard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,32 @@
.one-million {
.tc-banner-placeholder {
background: none $tc-gray-90;

.image {
img {
width: auto;
}
}

.content {
margin-top: 0px;
}

.social-sharing {
margin-bottom: 20px;
span {
color: $white;
@include sofia-pro-bold;
margin-right: 10px;
}

img {
height: 40px;
padding: 0 10px 0 0px;
vertical-align: middle;
}
}

.ctas {
// specific css override to reduce the gap between image and ctas
// ideally we should have separate title, image and description
Expand Down