Update to bootstrap 5 alpha 3 (#438)

thsmi · Nov 15, 2020 · bab75dc · bab75dc
1 parent 71923f5
commit bab75dc
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 16 deletions.
diff --git a/src/common/libSieve/templates/sidebar.html b/src/common/libSieve/templates/sidebar.html
@@ -1,16 +1,34 @@
 <div id="accordion">
-  <div class="card">
-    <div data-i18n="sidebar.actions" class="card-header" data-toggle="collapse" data-target="#collapseOne"></div>
-    <div class="collapse show" data-parent="#accordion" id="collapseOne">
-      <div class="card-body p-2" id="sivActions"></div>
+  <div class="accordion" id="accordionExample">
+    <div class="accordion-item">
+      <h2 class="accordion-header" id="headingOne">
+        <button data-i18n="sidebar.actions" class="accordion-button bg-light" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+        </button>
+      </h2>
+      <div id="collapseOne" class="accordion-collapse collapse show" aria-labelledby="headingOne" data-parent="#accordionExample">
+        <div class="accordion-body" id="sivActions">
+        </div>
+      </div>
     </div>
-    <div data-i18n="sidebar.tests" class="card-header" data-toggle="collapse" data-target="#collapseTwo"></div>
-    <div class="collapse" data-parent="#accordion" id="collapseTwo">
-      <div class="card-body p-2" id="sivTests"></div>
+    <div class="accordion-item">
+      <h2 class="accordion-header" id="headingTwo">
+        <button data-i18n="sidebar.tests" class="accordion-button collapsed bg-light" type="button" data-toggle="collapse" data-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
+        </button>
+      </h2>
+      <div id="collapseTwo" class="accordion-collapse collapse" aria-labelledby="headingTwo" data-parent="#accordionExample">
+        <div class="accordion-body"  id="sivTests">
+        </div>
+      </div>
     </div>
-    <div data-i18n="sidebar.operators" class="card-header" data-toggle="collapse" data-target="#collapseThree"></div>
-    <div class="collapse" data-parent="#accordion" id="collapseThree">
-      <div class="card-body p-2" id="sivOperators"></div>
+    <div class="accordion-item">
+      <h2 class="accordion-header" id="headingThree">
+        <button data-i18n="sidebar.operators" class="accordion-button collapsed bg-light" type="button" data-toggle="collapse" data-target="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
+        </button>
+      </h2>
+      <div id="collapseThree" class="accordion-collapse collapse" aria-labelledby="headingThree" data-parent="#accordionExample">
+        <div class="accordion-body" id="sivOperators">
+        </div>
+      </div>
     </div>
   </div>
 

diff --git a/yarn.lock b/yarn.lock
@@ -385,9 +385,9 @@ boolean@^3.0.1:
   integrity sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==
 
 bootstrap@^5.0.0-alpha2:
-  version "5.0.0-alpha2"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.0.0-alpha2.tgz#e37ce5836ef57c691d7e2369f7381b872d215f83"
-  integrity sha512-ZhW32+m5ImJoEkDKn43QQk2KovpJFisV/7TAg/RCzDi+B8m7FUgLHWx1Auu0Jt3/DQXDYwp6iwsprP3ej4u3ng==
+  version "5.0.0-alpha3"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.0.0-alpha3.tgz#f5abbd38740383d6b8e041212aef5ea220e7daaa"
+  integrity sha512-ghwrMFNzqOwfB0nJ1iYbkERd+EK1PblUl7rEEynY35jD0TUlSY6yrjG2M42qI++NhAUBEqGcjmmHkMGs3QyNHA==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -1039,9 +1039,9 @@ escape-string-regexp@^4.0.0:
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
 eslint-plugin-jsdoc@^30.7.7:
-  version "30.7.7"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.7.tgz#2af2c68e5adaf8a59fc3c72081a4b137098268bb"
-  integrity sha512-DmVMJC2AbpYX7X1KhnVT1a9ex1AUvG+q9G8i6hzjp3cpjW8vmKQTUmZnRS0//W+7HvMqeb+eXPANdCOzGVVZBQ==
+  version "30.7.8"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.8.tgz#4a678c25ddb2c5732163f0258bb1d05edf34f61c"
+  integrity sha512-OWm2AYvXjCl7nRbpcw5xisfSVkpVAyp4lGqL9T+DeK4kaPm6ecnmTc/G5s1PtcRrwbaI8bIWGzwScqv5CdGyxA==
   dependencies:
     comment-parser "^0.7.6"
     debug "^4.2.0"