bounty : minor changes

- changed the order of action buttons
- start work turns white on starting work
- added svg background to comment
- fixed margin between action buttons

app/assets/v2/css/bounty.css

@@ -218,7 +218,7 @@ a.btn{
 
 
 #right_actions .button--primary {
-  margin-right: 10px;
+  margin-right: 5px;
   position: relative;
   top: 1px;
 }
@@ -235,12 +235,24 @@ a.btn{
   border: 1px solid #979797;
   color: #0D0764;
   border-radius: 3px;
+  position: relative;
 }
 
+#btn-white img {
+  position: absolute;
+  width: 19px;
+  top: 7px;
+  right: 8px;
+}
+
 #btn-white .github-comment {
   border-left: 1px solid #979797;
   padding-left: 12px;
   margin-left: 5px;
+  z-index: 1;
+  color: #FFFFFF;
+  position: relative;
+  font-size: 10px;
 }
 
 .activity {

app/assets/v2/js/pages/bounty_details.js

@@ -432,24 +432,7 @@ var do_actions = function(result) {
     // actions
     var actions = [];
 
-    if (show_start_stop_work) {
-
-      // is enabled
-      var enabled = start_stop_work_enabled;
-      var interest_entry = {
-        enabled: enabled,
-        href: is_interested ? '/uninterested' : '/interested',
-        text: is_interested ? 'Stop Work' : 'Start Work',
-        parent: 'right_actions',
-        title: is_interested ? 'Notify the funder that you will not be working on this project' : 'Notify the funder that you would like to take on this project'
-      };
-
-      actions.push(interest_entry);
-
-    }
-
     if (show_submit_work) {
-      // is enabled
       var enabled = submit_work_enabled;
       var _entry = {
         enabled: enabled,
@@ -464,6 +447,21 @@ var do_actions = function(result) {
       actions.push(_entry);
     }
 
+    if (show_start_stop_work) {
+      var enabled = start_stop_work_enabled;
+      var interest_entry = {
+        enabled: enabled,
+        href: is_interested ? '/uninterested' : '/interested',
+        text: is_interested ? 'Stop Work' : 'Start Work',
+        parent: 'right_actions',
+        title: is_interested ? 'Notify the funder that you will not be working on this project' : 'Notify the funder that you would like to take on this project',
+        color: is_interested ? 'white' : '',
+        id: 'interest'
+      };
+
+      actions.push(interest_entry);
+    }
+
     if (show_kill_bounty) {
       var enabled = kill_bounty_enabled;
       var _entry = {

app/assets/v2/js/shared.js

@@ -188,10 +188,18 @@ var mutate_interest = function(bounty_pk, direction) {
   var request_url = '/actions/bounty/' + bounty_pk + '/interest/' + direction + '/';
 
   $('#submit').toggleClass('none');
-  if (direction === 'new')
+  $('#interest a').toggleClass('btn')
+    .toggleClass('btn-small')
+    .toggleClass('button')
+    .toggleClass('button--primary');
+
+  if (direction === 'new') {
     _alert({message: "Thanks for letting us know that you're ready to start work."}, 'success');
-  else if (direction === 'remove')
+    $('#interest a').attr('id', 'btn-white');
+  } else if (direction === 'remove') {
     _alert({message: "You've stopped working on this, thanks for letting us know."}, 'success');
+    $('#interest a').attr('id', '');
+  }
 
   $.post(request_url, function(result) {
     result = sanitizeAPIResults(result);

app/dashboard/templates/bounty_details.html

@@ -168,7 +168,7 @@ <h5 class="bounty-heading">Funder</h5>
 
     <script id="action" type="text/x-jsrender">
       [[if enabled]]
-        <span [[if id == 'submit']] id="[[:id]]" [[if !work_started]] class="none" [[/if]] [[/if]]
+        <span id="[[:id]]" [[if id == 'submit']] [[if !work_started]] class="none" [[/if]] [[/if]]
           title='<div class="tooltip-info tooltip-sm">[[:title]]</div>'>
           [[if pending_acceptance]]
             <a class="button button--primary accept" role="button" href="[[:href]]" target="[[:target]]">
@@ -179,6 +179,7 @@ <h5 class="bounty-heading">Funder</h5>
               [[if comments]]
                 <span class="font-caption">
                   [[:text]]
+                  <img src={% static "v2/images/comment.svg" %}>
                   <span class="github-comment">
                     [[:comments]]
                   </span>