Projet

Général

Profil

0001-avray-remove-custom-page_template-sidebar-template-4.patch

Thomas Jund, 27 novembre 2020 15:24

Télécharger (1,88 ko)

Voir les différences: 

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
static/avray/_custom.scss
283 283 

  		




  284
  284
  
    
			#sidebar {

  		




  285
  285
  
    
				.cell {

  		




  286
  
  
    
					margin-right: 0;

  		




  
  286
  
    
					margin-left: 0;

  		




  287
  287
  
    
				}

  		




  288
  288
  
    
				.cell.titre-menu {

  		




  289
  289
  
    
					border-bottom: none;

  		












  

    
      static/avray/_vars.scss
    
  





  1
  1
  
    
$primary-color: #004171;

  		




  2
  2
  
    

  		




  3
  3
  
    
$width: 1200px;

  		




  
  4
  
    
$sidebar-position: right;

  		




  4
  5
  
    

  		




  5
  6
  
    
$font-color: black;

  		




  6
  7
  
    
$font-family: Raleway, Arial, sans-serif;

  		












  

    
      templates/variants/avray/combo/page_template_sidebar.html
    
  





  1
  
  
    
{% extends "combo/page_template_sidebar.html" %}

  		




  2
  
  
    
{% load combo i18n %}

  		




  3
  
  
    

  		




  4
  
  
    
{% block combo-content %}

  		




  5
  
  
    
<div id="columns-wrapper">

  		




  6
  
  
    
<div id="columns">

  		




  7
  
  
    
{% trans "Content" as name %}

  		




  8
  
  
    
{% placeholder "content" name=name %}

  		




  9
  
  
    
</div>

  		




  10
  
  
    
</div>

  		




  11
  
  
    
<div id="sidebar">

  		




  12
  
  
    
{% trans "Sidebar" as name %}

  		




  13
  
  
    
{% placeholder "sidebar" name=name %}

  		




  14
  
  
    
</div>

  		




  15
  
  
    
{% endblock %}

  		




  16
  
  
    
-