Merge pull request #367 from plone/fix-sticky-formcontrols

Fix sticky `.formControls`
plone · Apr 22, 2024 · 2dd0f4a · 2dd0f4a
2 parents d50d794 + e6b0fed
commit 2dd0f4a
Show file tree

Hide file tree

Showing 8 changed files with 544 additions and 759 deletions.
diff --git a/news/367.bugfix b/news/367.bugfix
@@ -0,0 +1,2 @@
+Fix sticky `.formControls` to not break modals with buttons.
+[petschki]
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,6 +45,6 @@
     "copy-tinymce-ui-css": "cp \"node_modules/tinymce/skins/ui/oxide/content.css\" \"plonetheme/barceloneta/theme/tinymce/tinymce-ui-content.css\""
   },
   "dependencies": {
-    "bootstrap": "5.3.2"
+    "bootstrap": "5.3.3"
   }
 }
diff --git a/plonetheme/barceloneta/theme/css/barceloneta.css b/plonetheme/barceloneta/theme/css/barceloneta.css
diff --git a/plonetheme/barceloneta/theme/css/barceloneta.css.map b/plonetheme/barceloneta/theme/css/barceloneta.css.map
diff --git a/plonetheme/barceloneta/theme/css/barceloneta.min.css b/plonetheme/barceloneta/theme/css/barceloneta.min.css
diff --git a/plonetheme/barceloneta/theme/css/barceloneta.min.css.map b/plonetheme/barceloneta/theme/css/barceloneta.min.css.map
diff --git a/scss/_forms.scss b/scss/_forms.scss
@@ -30,6 +30,9 @@ label.required:after {
 .formControls {
   margin-top: $spacer * 1.5;
   margin-bottom: $spacer * 0.5;
+}
+
+form.pat-autotoc > .formControls {
   background-color: var(--#{$prefix}body-bg);
   padding:$spacer 0;
   border-top: solid 1px var(--#{$prefix}border-color);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Fix sticky `.formControls` to not break modals with buttons.
		[petschki]