Projet

Général

Profil

0002-general-provide-support-for-a-sidebar-22440.patch

Frédéric Péters, 06 avril 2018 11:30

Télécharger (1,56 ko)

Voir les différences:

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(-)
gadjo/static/css/gadjo.scss
285 285

  
286 286
/* main content */
287 287

  
288
#main {
289
	display: -ms-flexbox;
290
	display: flex;
291
}
292

  
288 293
div#main-content {
294
	-ms-flex: 0 1 auto;
295
	flex: 0 1 auto;
289 296
	width: 100%;
290 297
	margin-left: 0;
291 298
	padding: 1em 6px 0 16px;
292 299
	border: 1px solid #ccc;
293 300
	border-width: 0 1px 1px 0;
294 301
	background: white;
295
	float: left;
296 302
	position: relative;
297 303
	overflow-x: auto;
298 304
	overflow-y: hidden;
......
302 308
	}
303 309
}
304 310

  
311
#sidebar {
312
	-ms-flex: 0 1 auto;
313
	flex: 0 1 auto;
314
	margin-left: 1rem;
315
	margin-right: 1rem;
316
	width: 30rem;
317
	max-width: 30rem;
318
	color: #666;
319
	position: relative;
320
}
321

  
322

  
305 323
div#main-content h2 {
306 324
	font-weight: normal;
307 325
}
gadjo/templates/gadjo/root.html
101 101
    {% block after-main-content %}
102 102
    {% endblock %}
103 103

  
104
    {% block sidebar %}
105
    {% endblock %}
106

  
104 107
  </div> <!-- #main -->
105 108

  
106 109

  
107
-