From 52d02c8354c47cee5f1b2c54b50ea9b7cabfded1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Sun, 7 Oct 2018 17:26:51 +0200
Subject: [PATCH] scss: don't cumulate form gutters (#26806)

---
 static/includes/_grid.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/static/includes/_grid.scss b/static/includes/_grid.scss
index 66fdf5b5..34f57dec 100644
--- a/static/includes/_grid.scss
+++ b/static/includes/_grid.scss
@@ -12,7 +12,7 @@ form.quixote div[class*=grid-] {
 div[class*=grid-] {
 	float: left;
 	box-sizing: border-box;
-	padding-right: 1em;
+	padding-right: $grid-gutter;
 	@media screen and (max-width: $very-small-limit) {
 		width: 100%;
 		padding-right: 0;
@@ -30,6 +30,11 @@ div[class*=grid-] {
 
 div.dataview div[class*=grid-],
 form div[class*=grid-] {
+	@if $grid-gutter != 0px {
+		box-sizing: content-box;
+	} @else {
+		padding-right: 1rem;  // force gutter for form fields
+	}
 	+ h3, + h4 {
 		// give additional padding to compensate the margin being
 		// "absorbed" by the floating element.
-- 
2.19.1