Projet

Général

Profil

0001-templates-introduce-.column-instead-left-right-48515.patch

Thomas Jund, 13 novembre 2020 11:56

Télécharger (4,14 ko)

Voir les différences: 

Subject: [PATCH] templates: introduce .column instead #left & #right (#48515)


 static/includes/_cells.scss                      | 16 ++++++++--------
 static/includes/_layout.scss                     |  8 ++------
 templates/authentic2/accounts.html               |  4 ++--
 templates/combo/page_template_2cols.html         |  4 ++--
 templates/combo/page_template_2cols_sidebar.html |  4 ++--
 5 files changed, 16 insertions(+), 20 deletions(-)
static/includes/_cells.scss
34 34 

  		




  35
  35
  
    
// Columns gutters

  		




  36
  36
  
    
@media screen and ($min-desktop-viewport) {

  		




  37
  
  
    
	div#left div.a2-block, div#right div.a2-block,

  		




  
  37
  
    
	.column div.a2-block,

  		




  38
  38
  
    
	.gru-content div.cell,

  		




  39
  39
  
    
	.block {

  		




  40
  40
  
    
		margin-left: #{$columns-gutter / 2};

  		




  41
  41
  
    
		margin-right: #{$columns-gutter / 2};

  		




  42
  42
  
    
	}

  		




  43
  43
  
    
	.gru-content #columns > .cell,

  		




  44
  
  
    
	div#left .block,

  		




  45
  
  
    
	div#left div.a2-block,

  		




  46
  
  
    
	.gru-content #left .cell { margin-left: 0; }

  		




  
  44
  
    
	.column:first-child .block,

  		




  
  45
  
    
	.column:first-child div.a2-block,

  		




  
  46
  
    
	.gru-content .column:first-child .cell { margin-left: 0; }

  		




  47
  47
  
    
	.gru-content #columns > .cell,

  		




  48
  
  
    
	div#right .block,

  		




  49
  
  
    
	div#right div.a2-block,

  		




  50
  
  
    
	.gru-content #right .cell { margin-right: 0; }

  		




  
  48
  
    
	.column:last-child .block,

  		




  
  49
  
    
	.column:last-child div.a2-block,

  		




  
  50
  
    
	.gru-content .column:last-child .cell { margin-right: 0; }

  		




  51
  51
  
    
}

  		




  52
  52
  
    

  		




  53
  53
  
    

  		




  ......




  83
  83
  
    
	border-radius: $cell-border-radius;

  		




  84
  84
  
    
}

  		




  85
  85
  
    

  		




  86
  
  
    
div#left div.a2-block, div#right div.a2-block,

  		




  
  86
  
    
.column div.a2-block,

  		




  87
  87
  
    
.gru-content div.cell,

  		




  88
  88
  
    
.block {

  		




  89
  89
  
    
	margin-top: 0;

  		












  

    
      static/includes/_layout.scss
    
  





  83
  83
  
    
	min-height: 300px;

  		




  84
  84
  
    
}

  		




  85
  85
  
    

  		




  86
  
  
    
#right {

  		




  87
  
  
    
	float: right;

  		




  88
  
  
    
	width: 50%;

  		




  89
  
  
    
}

  		




  90
  
  
    
#left {

  		




  
  86
  
    
.column {

  		




  91
  87
  
    
	float: left;

  		




  92
  88
  
    
	width: 50%;

  		




  93
  89
  
    
}

  		




  ......




  125
  121
  
    
		padding: 0 0.7em;

  		




  126
  122
  
    
		max-width: 100%;

  		




  127
  123
  
    
	}

  		




  128
  
  
    
	#right, #left {

  		




  
  124
  
    
	.column {

  		




  129
  125
  
    
		float: none;

  		




  130
  126
  
    
		width: auto;

  		




  131
  127
  
    
	}

  		












  

    
      templates/authentic2/accounts.html
    
  





  5
  5
  
    
{% block extra-body-class %}{{ block.super }} account-page{% endblock %}

  		




  6
  6
  
    

  		




  7
  7
  
    
{% block content %}

  		




  8
  
  
    
<div id="left" class="profile">

  		




  
  8
  
    
<div class="column profile">

  		




  9
  9
  
    
  {% block profile-pre %}{% endblock %}

  		




  10
  10
  
    
  <div class="block" id="a2-profile">

  		




  11
  11
  
    
    {% block profile-top %}{% endblock %}

  		




  ......




  43
  43
  
    
  </div>

  		




  44
  44
  
    
  {% block profile-post %}{% endblock %}

  		




  45
  45
  
    
</div>

  		




  46
  
  
    
<div id="right" class="account-management">

  		




  
  46
  
    
<div class="column account-management">

  		




  47
  47
  
    
  {% block account-management-pre %}{% endblock %}

  		




  48
  48
  
    
  <div class="block" id="account-management">

  		




  49
  49
  
    
    {% block account-management-top %}{% endblock %}

  		












  

    
      templates/combo/page_template_2cols.html
    
  





  2
  2
  
    
{% load combo i18n %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block columns %}

  		




  5
  
  
    
<div id="left">

  		




  
  5
  
    
<div id="left" class="column">

  		




  6
  6
  
    
{% trans "Left column" as name %}

  		




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

  		




  8
  8
  
    
</div>

  		




  9
  
  
    
<div id="right">

  		




  
  9
  
    
<div id="right" class="column">

  		




  10
  10
  
    
{% trans "Right column" as name %}

  		




  11
  11
  
    
{% placeholder "right" name=name %}

  		




  12
  12
  
    
</div>

  		












  

    
      templates/combo/page_template_2cols_sidebar.html
    
  





  2
  2
  
    
{% load combo i18n %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block columns %}

  		




  5
  
  
    
<div id="left">

  		




  
  5
  
    
<div id="left" class="column">

  		




  6
  6
  
    
{% trans "Left column" as name %}

  		




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

  		




  8
  8
  
    
</div>

  		




  9
  
  
    
<div id="right">

  		




  
  9
  
    
<div id="right" class="column">

  		




  10
  10
  
    
{% trans "Right column" as name %}

  		




  11
  11
  
    
{% placeholder "right" name=name %}

  		




  12
  12
  
    
</div>

  		




  13
  
  
    
-