Merge branch 'master' into splimo-redesign-bugfix01

Resolving conflict
This commit is contained in:
Anja Möller
2021-05-10 20:02:12 +02:00
+1 -1
View File
@@ -2721,7 +2721,7 @@
<h3 class="mb--1">Zauberkosten abrechnen</h3>
<div class="d--flex d--flex--align-bottom">
<div class="form__group d--inline mr--1">
<input type="number" name="attr_zauberkosten" placeholder="0" value="0" class="form__field" />
<input type="text" name="attr_zauberkosten" placeholder="0" value="0" class="form__field" />
<label class="form__label">Kosten</label>
</div>
<button class="button" type="action" name="act_zaubercalc">Berechnen</button>