Skip to content

f2f join-dec-btn #159

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.

Sign up for GitHub

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 1 commit into from
Oct 16, 2019
Merged

f2f join-dec-btn #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 43 additions & 15 deletions emails/src/partials/project-team.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,23 +105,51 @@
<table class="main-child">
<tr>
<td class="empty-child-one"></td>
<td class="second-child" align="center">
{{#if notifications.[0].[connect.notification.project.member.invite.requested]}}
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}#manageTopcoderTeam">
Manage project team
</a>
{{#if notifications.[0].[connect.notification.project.member.invite.created]}}
{{#if notifications.[0].[isSSO]}}
<td class="second-child project-team" align="center">
<a href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.connectURL}}/projects/{{notifications.[0].projectId}}%3Finvitation%3Daccept">
Join Project
</a>
</td>
<td class="empty-child-10"></td>
<td class="second-child project-team decline-sec" align="center">
<a class="decline-btn" href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.connectURL}}/projects/{{notifications.[0].projectId}}%3Finvitation%3Ddecline">
Decline
</a>
</td>
{{else}}
{{#if notifications.[0].[isSSO]}}
<a href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.connectURL}}/projects/{{notifications.[0].projectId}}">
SSO Login
</a>
{{else}}
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}">
View project on Connect
</a>
{{/if}}
<td class="second-child project-team" align="center">
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}?invitation=accept">
Join Project
</a>
</td>
<td class="empty-child-10"></td>
<td class="second-child project-team decline-sec" align="center">
<a class="decline-btn" href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}?invitation=decline">
Decline
</a>
</td>
{{/if}}
</td>
{{else}}
<td class="second-child project-team" align="center">
{{#if notifications.[0].[connect.notification.project.member.invite.requested]}}
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}#manageTopcoderTeam">
Manage project team
</a>
{{else}}
{{#if notifications.[0].[isSSO]}}
<a href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.connectURL}}/projects/{{notifications.[0].projectId}}">
SSO Login
</a>
{{else}}
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}">
View project on Connect
</a>
{{/if}}
{{/if}}
</td>
{{/if}}
<td class="empty-child-one"></td>
</tr>
</table>
Expand Down
9 changes: 9 additions & 0 deletions emails/src/styles/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ table.container, table.footer-container {
height: 15px;
background-color: #FFFFFF; }

.empty-child-10 {
width: 10px; }

.post-details .main-child {
background-color: #FFFFFF; }
.post-details .main-child .empty-child-one {
Expand Down Expand Up @@ -220,6 +223,12 @@ table.container, table.footer-container {
text-align: center;
color: #FFFFFF;
font-size: 13px; }
.button-row .main-child .second-child.project-team.decline-sec {
background-color: #FFFFFF; }
.button-row .main-child .second-child.project-team a.decline-btn {
color: #555555;
border: 1px solid #808080;
background-color: #FFFFFF; }

.button-one .main-child .empty-child-one, .button-three .main-child .empty-child-one {
width: 216px; }
Expand Down
1 change: 1 addition & 0 deletions emails/src/styles/modules/_color.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ $grey-color: #888894;
$blue-color: #006DEA;
$grey-hyperlink: #808080;
$button-color: #0681FF;
$tc-gray-70: #555555;
16 changes: 16 additions & 0 deletions emails/src/styles/partials/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,10 @@ table.container, table.footer-container {
}
}

.empty-child-10 {
width: 10px;
}

// emptys end

// post details
Expand Down Expand Up @@ -321,6 +325,18 @@ table.container, table.footer-container {
color: $white-background;
font-size: 13px;
}
&.project-team {
&.decline-sec {
background-color: $white-background;
}
a {
&.decline-btn {
color: $tc-gray-70;
border: 1px solid $grey-hyperlink;
background-color: $white-background;
}
}
}
}
}
}
Expand Down