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

Promote to prod - Bug Bash 3 #1096

Merged
merged 14 commits into from
Mar 22, 2017
Merged

Promote to prod - Bug Bash 3 #1096

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2a5ce5a
Fix #1058 Update TCO17 Banner in TC Dashboard
Mar 13, 2017
ea261e3
Fix for issue #1003 Color of the Complete Appeals button
Savvas-cl Mar 13, 2017
1044c75
Merge pull request #1082 from Savvas-cl/dev
birdofpreyru Mar 13, 2017
1924fa8
Merge pull request #1081 from shizhouxing/dev
birdofpreyru Mar 13, 2017
8da7825
Fix #1071 - Add Unregister button to Dashboard
Mar 14, 2017
d1f1dc6
Merge pull request #1084 from shizhouxing/dev
birdofpreyru Mar 14, 2017
88ffd7d
Fix #995 - Stats row in the dashboard (mobile view)
shizhouxing Mar 15, 2017
4030764
Issue 1048: List view of past challenges (Mobile view)
Colinh84 Feb 22, 2017
629fd2a
wrap content for smallest mobile sizes for no overflow
Colinh84 Feb 27, 2017
9092315
Merge pull request #1063 from Colinh84/issue_1048
birdofpreyru Mar 17, 2017
9451289
Fix #995 - Stats row in the dashboard (mobile view)
shizhouxing Mar 17, 2017
07430e1
Merge pull request #1086 from shizhouxing/dev
birdofpreyru Mar 18, 2017
257bd5f
Fix for issue #1083 Complete Appeals shown only when Submitter role p…
Savvas-cl Mar 19, 2017
46ce862
Merge pull request #1094 from Savvas-cl/dev
birdofpreyru Mar 20, 2017
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
Prev Previous commit
Next Next commit
Fix for issue #1003 Color of the Complete Appeals button 
The color of the complete appeals color has been changed.
A new class btn-danger has been added which changes the styling color
of the button to #e66 as requested. Also hover and active states are supported
To test just modify file challenge-tile.jade so the Complete Appeals buttons
appears.
  • Loading branch information
@Savvas-cl
Savvas-cl committed Mar 13, 2017
commit ea261e3a15cd00f02263481c690cd140d9c8ac67
4 changes: 2 additions & 2 deletions app/directives/challenge-tile/challenge-tile.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
.phase-action(ng-show="challenge.userAction", ng-switch="challenge.userAction")
a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit", ng-href="{{challenge|challengeLinks:'submit'}}") Submit
a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'viewScorecards'}}") View Scorecards
a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'completeAppeals'}}") Complete Appeals
a.tc-btn.tc-btn-s.tc-btn-wide.btn-danger.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'completeAppeals'}}") Complete Appeals

.submitted(ng-switch-when="Submitted") Submitted

Expand Down Expand Up @@ -100,7 +100,7 @@
.phase-action(ng-switch="challenge.userAction")
a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit", ng-href="{{challenge|challengeLinks:'submit'}}") Submit
a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'viewScorecards'}}") View Scorecards
a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'completeAppeals'}}") Complete Appeals
a.tc-btn.tc-btn-s.tc-btn-wide.btn-danger.submit(ng-switch-when="Appeal", ng-href="{{challenge|challengeLinks:'completeAppeals'}}") Complete Appeals

.submitted(ng-switch-when="Submitted") Submitted

Expand Down
32 changes: 32 additions & 0 deletions assets/css/directives/challenge-tile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,22 @@ challenge-tile .challenge.tile-view {
.submit {
margin: 12px;
display: block;

&.btn-danger {
color: #e66e66;
background-color: $white;
border-color: #e66e66;

&:hover {
background-color: #e66e66;
color: $white;
}

&:active {
background-color: #e0493e;
box-shadow: inset 0px 1px 1px 0px rgba(0,0,0,0.30);
}
}
}

.submitted {
Expand Down Expand Up @@ -508,6 +524,22 @@ challenge-tile .challenge.list-view {
.submit {
display: block;
margin: 6px 0;

&.btn-danger {
color: #e66e66;
background-color: $white;
border-color: #e66e66;

&:hover {
background-color: #e66e66;
color: $white;
}

&:active {
background-color: #e0493e;
box-shadow: inset 0px 1px 1px 0px rgba(0,0,0,0.30);
}
}
}

.submitted {
Expand Down