Merge branch 'master' into Develop

# Conflicts: # cps/editbooks.py
2020-05-06 18:47:33 +02:00
parent e1439b529b 6a6c1b6b21
commit 48f4b12c0e
12 changed files with 301 additions and 261 deletions
--- a/cps/templates/config_view_edit.html
+++ b/cps/templates/config_view_edit.html
@@ -6,8 +6,8 @@
 {% block body %}
 <div class="discover">
  <h2>{{title}}</h2>
-  <form role="form" method="POST" autocomplete="off">
-<div class="panel-group col-md-10 col-lg-6">
+  <form role="form" method="POST" autocomplete="off" class="col-md-10 col-lg-6">
+<div class="panel-group">
  <div class="panel panel-default">
    <div class="panel-heading">
      <h4 class="panel-title">