From 9d9e236ad3dc66ec72512a0728b5523abba0e6a9 Mon Sep 17 00:00:00 2001
From: Agate Berriot <aberriot@entrouvert.com>
Date: Wed, 30 Nov 2022 09:58:57 +0100
Subject: [PATCH 1/4] saumur: align form buttons to the right (#71773)

---
 static/saumur/_vars.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/saumur/_vars.scss b/static/saumur/_vars.scss
index d55123fe..e7369c1b 100644
--- a/static/saumur/_vars.scss
+++ b/static/saumur/_vars.scss
@@ -81,8 +81,8 @@ $button-hover-background: $orange;
 $button-hover-color: $white;
 $button-focus-outline: 2px solid $orange;
 $button-focus-outline-offset: 2px;
-$buttons-order: previous, cancel (grow), submit;
-
+$buttons-order: previous, cancel, submit;
+$buttons-alignment: flex-end;
 $widget-background: $gray-light-1;
 $widget-border: 1px solid $gray-dark-1;
 $widget-focus-border: 1px solid $orange;
-- 
2.39.2


From 04e8cf3bb3f90432612f68461cd3abb5da1f0237 Mon Sep 17 00:00:00 2001
From: Agate Berriot <aberriot@entrouvert.com>
Date: Wed, 30 Nov 2022 11:16:38 +0100
Subject: [PATCH 2/4] saumur: unify background and spacing for cells (#71774)

---
 static/saumur/_custom.scss | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/static/saumur/_custom.scss b/static/saumur/_custom.scss
index 96db0122..7d4f638d 100644
--- a/static/saumur/_custom.scss
+++ b/static/saumur/_custom.scss
@@ -183,7 +183,7 @@ div.link-cell {
         position: relative;
     }
     h2:first-child {
-        padding-left: $space-large * 1.5;
+        padding-left: $space-large;
         width: 100%;
     }
     img {
@@ -191,18 +191,29 @@ div.link-cell {
         padding: 0 !important;
         width: $space-large;
         top: $space-small;
-        left: $space-medium;
+        left: 0;
     }
     &.foldable:not(.folded) picture::after {
         @extend %orange-border;
-        margin: 0 1rem;
+        margin: 0;
     }
     &:not(.foldable) picture::after {
         @extend %orange-border;
-        margin: 0 1rem;
+        margin: 0;
     }
 }
 
+
+// borderless cells in grid
+
+.gru-content > #columns-wrapper > #columns {
+    border: $widget-border;
+    background: white;
+    padding: $space-medium;
+    .cell {
+        border: none;
+    }
+}
 // forms
 .form-content {
     @extend %cell;
-- 
2.39.2


From 997f377b3f11bb1cd9ed42fdc18b8e409c288d34 Mon Sep 17 00:00:00 2001
From: Agate Berriot <aberriot@entrouvert.com>
Date: Wed, 30 Nov 2022 11:40:27 +0100
Subject: [PATCH 3/4] saumur: fix overlapping nav and logo on narrow screens
 (#71133)

---
 static/saumur/_custom.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/static/saumur/_custom.scss b/static/saumur/_custom.scss
index 7d4f638d..c8804410 100644
--- a/static/saumur/_custom.scss
+++ b/static/saumur/_custom.scss
@@ -26,6 +26,7 @@ main {
 #logo {
     @media screen and ($max-mobile-viewport) { 
         padding: 0 $space-small;
+        display: inline-block;
         
     }
 }
@@ -87,7 +88,8 @@ div.gru-nav {
 
 #toplinks {
     @media screen and ($max-mobile-viewport) {
-        margin-top: $space-small;
+        position: static;
+        display: inline-block;
         margin-right: $nav-menu-side;
         background: transparent;
     }
-- 
2.39.2


From 31f12bb6200690265b0f803de65ccb34450d8bb8 Mon Sep 17 00:00:00 2001
From: Agate Berriot <aberriot@entrouvert.com>
Date: Wed, 30 Nov 2022 11:50:01 +0100
Subject: [PATCH 4/4] saumur: added city selector cell (#71821)

---
 static/saumur/_custom.scss                    |  9 +++++++
 .../services-communes/link-list-cell.html     | 24 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 templates/variants/saumur/combo/cells/services-communes/link-list-cell.html

diff --git a/static/saumur/_custom.scss b/static/saumur/_custom.scss
index c8804410..a920f6dd 100644
--- a/static/saumur/_custom.scss
+++ b/static/saumur/_custom.scss
@@ -216,6 +216,15 @@ div.link-cell {
         border: none;
     }
 }
+
+// communes selector
+
+div#services-communes {
+	select {
+		width: 100%;
+	}
+}
+
 // forms
 .form-content {
     @extend %cell;
diff --git a/templates/variants/saumur/combo/cells/services-communes/link-list-cell.html b/templates/variants/saumur/combo/cells/services-communes/link-list-cell.html
new file mode 100644
index 00000000..29a9b927
--- /dev/null
+++ b/templates/variants/saumur/combo/cells/services-communes/link-list-cell.html
@@ -0,0 +1,24 @@
+{% block cell-content %}
+  <h2>{{ title }}</h2>
+  <div class="cell--body">
+    <form>
+      <select id="commune--select-{{ cell.id }}">
+        <option value="">Sélectionnez</option>
+        {% for link in links %}
+          <option value="{{ link.url }}">{{ link.title }}</option>
+        {% endfor %}
+      </select>
+      <p>Sélectionnez une commune pour découvrir ses services en ligne.</p>
+    </form>
+  </div>
+{% endblock %}
+<script>
+  $(function() {
+    $('#commune--select-{{ cell.id }}').change(function(e){
+      const link = this.options[this.selectedIndex].value;
+      if (link) {
+        window.location.href = link;
+      }
+    })
+  });
+</script>
-- 
2.39.2