Adds level sort to feature table (#2053)

* Adds level sort to feature table

* Adds new POI DC check fields.

These fields are optional and do not block submissions nor apply to old
POIs.

This commit also adds some new flex utilities present in Bootstrap 4/5
but not in 3 and they're really nice.

This commit also redoes the Wealth Quick Spend to use these new
utilities.

POI DC checks can be set to any text and number value, but the skill
autopopulates the basic skills and stats.

* Fixes merge issue

* Addresses PR comment

src/charactersheet/viewmodels/character/features/index.html

@@ -7,6 +7,10 @@
           <span class="clickable">Feature</span>
           <span data-bind="css: sortArrow('name')"></span>
         </th>
+        <th class="col-xs-4" data-bind="click: function(){sortBy('level');}">
+          <span class="clickable">Level</span>
+          <span data-bind="css: sortArrow('level')"></span>
+        </th>
         <th class="col-xs-4" data-bind="click: function(){sortBy('characterClass');}">
           <span class="clickable">Class</span>
           <span data-bind="css: sortArrow('characterClass')"></span>
@@ -31,10 +35,10 @@
           <span data-bind="text: $component.shortText(name)"></span>
         </td>
         <td>
-          <span data-bind="text: $component.shortText(characterClass)"></span>
-          <span class="text-muted"
-              data-bind="text:`(Level ${level()})`"></span>
+          <span data-bind="text: level"></span>
         </td>
+        <td>
+          <span data-bind="text: $component.shortText(characterClass)"></span>
         <td class="col-xs-1 text-right">
           <span data-toggle="collapse"
               data-bind="attr:{'data-target': `#feature_list_${uuid()}`}"

src/charactersheet/viewmodels/character/features/index.js

@@ -24,7 +24,9 @@ export class FeaturesViewModel extends AbstractTabularViewModel {
         return {
             ...super.sorts(),
             'characterClass asc': { field: 'characterClass', direction: 'asc'},
-            'characterClass desc': { field: 'characterClass', direction: 'desc'}
+            'characterClass desc': { field: 'characterClass', direction: 'desc'},
+            'level asc': { field: 'level', direction: 'asc'},
+            'level desc': { field: 'level', direction: 'desc'},
         };
     }
 }

src/style/site.css

@@ -2087,7 +2087,6 @@ tr .panel {
   background-color: #fff;
 }
 
-<<<<<<< HEAD
 /* Fix for BS 3 selects as input-group-btn */
 .input-group-btn>select.form-control {
   padding: 2px;