From 20cb92ba92fdc2bdc97f281695089657b051949b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Mon, 12 Mar 2018 09:25:31 +0100 Subject: [PATCH 2/2] general: provide support for a sidebar (#22440) --- gadjo/static/css/gadjo.scss | 20 +++++++++++++++++++- gadjo/templates/gadjo/root.html | 3 +++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/gadjo/static/css/gadjo.scss b/gadjo/static/css/gadjo.scss index c6bb474..b5bf4d2 100644 --- a/gadjo/static/css/gadjo.scss +++ b/gadjo/static/css/gadjo.scss @@ -285,14 +285,20 @@ div.errornotice { /* main content */ +#main { + display: -ms-flexbox; + display: flex; +} + div#main-content { + -ms-flex: 0 1 auto; + flex: 0 1 auto; width: 100%; margin-left: 0; padding: 1em 6px 0 16px; border: 1px solid #ccc; border-width: 0 1px 1px 0; background: white; - float: left; position: relative; overflow-x: auto; overflow-y: hidden; @@ -302,6 +308,18 @@ div#main-content { } } +#sidebar { + -ms-flex: 0 1 auto; + flex: 0 1 auto; + margin-left: 1rem; + margin-right: 1rem; + width: 30rem; + max-width: 30rem; + color: #666; + position: relative; +} + + div#main-content h2 { font-weight: normal; } diff --git a/gadjo/templates/gadjo/root.html b/gadjo/templates/gadjo/root.html index bcf694c..f00f97b 100644 --- a/gadjo/templates/gadjo/root.html +++ b/gadjo/templates/gadjo/root.html @@ -101,6 +101,9 @@ {% block after-main-content %} {% endblock %} + {% block sidebar %} + {% endblock %} + -- 2.17.0