Merge branch 'release/10.0' into dev

frontend/src/app/modules/boards/board/board.component.ts

@@ -106,7 +106,6 @@ export class BoardComponent implements OnInit, OnDestroy {
         .save(board)
         .then(board => {
           this.inFlight = false;
-          board.sortWidgets();
           return board;
         })
         .catch((error) => {

frontend/src/app/modules/boards/board/board.service.ts

@@ -74,6 +74,7 @@ export class BoardService {
     this.reorderWidgets(board);
     return this.boardDm.save(board)
       .then(board => {
+        board.sortWidgets();
         this.boardCache.update(board);
         return board;
       });

modules/costs/app/views/cost_types/_list.html.erb

@@ -96,9 +96,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                                       method: :delete,
                                       html:   { id:    "delete_cost_type_#{cost_type.id}",
                                                 class: 'delete_cost_type',
-                                                title: t(:button_delete) } do |f| %>
+                                                title: t(:button_lock) } do |f| %>
                 <button type="submit"
-                        class="button submit_cost_type">
+                        class="button--link submit_cost_type">
                   <%= icon_wrapper('icon icon-locked', I18n.t(:button_lock)) %>
                 </button>
               <% end %>

modules/costs/app/views/cost_types/_list_deleted.html.erb

@@ -74,7 +74,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                                           html: { id: "restore_cost_type_#{cost_type.id}",
                                                   class: 'restore_cost_type' } do |f| %>
                     <button type="submit"
-                            class="button submit_cost_type">
+                            class="button--link submit_cost_type">
                       <%= icon_wrapper('icon icon-unlocked', I18n.t(:button_unlock)) %>
                     </button>
                   <% end %>