From 1b4e73b705d84b9202b5f992e8747a8b9b45d88b Mon Sep 17 00:00:00 2001
From: Thomas JUND <tjund@entrouvert.com>
Date: Fri, 27 Nov 2020 15:21:16 +0100
Subject: [PATCH] avray: remove custom page_template-sidebar template (#48928)

page_template_sidebar is used to place sidebar after columns, $sidebar-position scss var is better for that.
---
 static/avray/_custom.scss                         |  2 +-
 static/avray/_vars.scss                           |  1 +
 .../avray/combo/page_template_sidebar.html        | 15 ---------------
 3 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 templates/variants/avray/combo/page_template_sidebar.html

diff --git a/static/avray/_custom.scss b/static/avray/_custom.scss
index a36c5b0..131c141 100644
--- a/static/avray/_custom.scss
+++ b/static/avray/_custom.scss
@@ -283,7 +283,7 @@ nav {
 
 			#sidebar {
 				.cell {
-					margin-right: 0;
+					margin-left: 0;
 				}
 				.cell.titre-menu {
 					border-bottom: none;
diff --git a/static/avray/_vars.scss b/static/avray/_vars.scss
index b4c7f40..52d5185 100644
--- a/static/avray/_vars.scss
+++ b/static/avray/_vars.scss
@@ -1,6 +1,7 @@
 $primary-color: #004171;
 
 $width: 1200px;
+$sidebar-position: right;
 
 $font-color: black;
 $font-family: Raleway, Arial, sans-serif;
diff --git a/templates/variants/avray/combo/page_template_sidebar.html b/templates/variants/avray/combo/page_template_sidebar.html
deleted file mode 100644
index 4ccbcae..0000000
--- a/templates/variants/avray/combo/page_template_sidebar.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "combo/page_template_sidebar.html" %}
-{% load combo i18n %}
-
-{% block combo-content %}
-<div id="columns-wrapper">
-<div id="columns">
-{% trans "Content" as name %}
-{% placeholder "content" name=name %}
-</div>
-</div>
-<div id="sidebar">
-{% trans "Sidebar" as name %}
-{% placeholder "sidebar" name=name %}
-</div>
-{% endblock %}