villeneuve-dascq: introduce .column instead #left & #right (#48515 )

signal-publik: introduce .column instead #left & #right (#48515 )
groupe-up: introduce .column instead #left & #right (#48515 )
2020-11-13 16:24:04 +01:00 · 2020-11-13 16:24:04 +01:00 · 2020-11-13 16:24:04 +01:00 · 2020-11-13 16:24:04 +01:00 · 2020-11-13 16:24:04 +01:00 · 2020-11-13 16:24:04 +01:00
19 changed files with 48 additions and 50 deletions
--- a/static/alpes-maritimes-2018/_custom.scss
+++ b/static/alpes-maritimes-2018/_custom.scss
@ -699,12 +699,15 @@ div#footer {
 	}
 }

-#left, #right {
+.column {
 	width: 48%;
 	@media screen and ($max-mobile-viewport) {
 		width: auto;
 	}
 }
+.column:last-child {
+	float: right;
+}

 div.gru-content div.cell {
 	padding-top: 2ex;
@ -753,7 +756,7 @@ h2 + h2 {
 			}
 		}
 	}
-	div#left, div#right {
+	.column {
 		width: 40%;
 		margin-left: 4em;
 		@media screen and ($max-mobile-viewport) {
@ -761,7 +764,7 @@ h2 + h2 {
 			margin: 0;
 		}
 	}
-	div#left h2:first-child {
+	div.column:first-child h2:first-child {
 		@include trapesoid($border-color: $secondary-color, $background-color: $ternary-color);
 	}
 	div.block, div.a2-block {
--- a/static/amiens-metropole/_layout.scss
+++ b/static/amiens-metropole/_layout.scss
@ -60,7 +60,7 @@ body.has-picture, .page-index #content {
 	#main-content {
 		width: 100%;

-		#sidebar, #left, #right {
+		#sidebar, .column {
 			padding: 1em;
 		}
 	}
--- a/static/arpajon/_custom.scss
+++ b/static/arpajon/_custom.scss
@ -141,7 +141,7 @@ div#rub_service > h2:first-child,
 	}
 }

-div#left div.a2-block, div#right div.a2-block,
+.column div.a2-block,
 .gru-content div.cell,
 div.block {
 	padding: 0;
--- a/static/grenoble-metropole-2019/_custom.scss
+++ b/static/grenoble-metropole-2019/_custom.scss
@ -71,11 +71,11 @@ $categories: administration, dechets, eau-potable, eaux-usees, economie, logemen
 }

 div#columns > div {
-	&#left, &#right {
+	&.column {
 		width: 100%;
 		float: none;
 	}
-	&#right {
+	&.column:last-child {
 		clear: both;
 	}
 }
@ -1339,7 +1339,7 @@ div#profile {
 	}
 }

-div#left.profile, div#right.account-management {
+div.column.profile, div.column.account-management {
 	width: 100%;
 	float: none;
 }
--- a/static/groupe-up/_custom.scss
+++ b/static/groupe-up/_custom.scss
@ -243,7 +243,7 @@ nav {
 			}
 		}
 	}
-	
+
 	div#apa-domicile {
 		@include leftsidebg(lighten($base-color, 30%));
 		h3 {
@ -470,7 +470,7 @@ div#sidebar + div#columns-wrapper > div.a2-block {
 	padding: 2rem;
 }

-div#left.profile {
+div.column.profile {
 	margin-top: 0;
 	margin-left: 2rem;
 	width: 60%;
@ -483,7 +483,7 @@ div#left.profile {
 	}
 }

-div#right.account-management {
+div.column.account-management {
 	width: 30%;
 }

@ -647,11 +647,11 @@ div#rub_service > h2:first-child,
 	#sidebar {
 		padding-top: 1.5rem;
 	}
-	#left {
+	.column:first-child {
 		width: 46%;
 		padding: 0;
 	}
-	#right {
+	.column:last-child {
 		div.cell h2 {
 			background: rgba(127, 190, 206, 0.7);
 			color: white;
--- a/static/includes/_cells.scss
+++ b/static/includes/_cells.scss
@ -35,20 +35,20 @@ $cell-image-padding: 0.5rem !default;

 // Columns gutters
@media screen and ($min-desktop-viewport) {
-	div#left div.a2-block, div#right div.a2-block,
+	.column div.a2-block,
 	.gru-content div.cell,
 	.block {
 		margin-left: #{$columns-gutter / 2};
 		margin-right: #{$columns-gutter / 2};
 	}
 	.gru-content #columns > .cell,
-	div#left .block,
-	div#left div.a2-block,
-	.gru-content #left .cell { margin-left: 0; }
+	.column:first-child .block,
+	.column:first-child div.a2-block,
+	.gru-content .column:first-child .cell { margin-left: 0; }
 	.gru-content #columns > .cell,
-	div#right .block,
-	div#right div.a2-block,
-	.gru-content #right .cell { margin-right: 0; }
+	.column:last-child .block,
+	.column:last-child div.a2-block,
+	.gru-content .column:last-child .cell { margin-right: 0; }
 }


@ -84,7 +84,7 @@ div.a2-block,
 	border-radius: $cell-border-radius;
 }

-div#left div.a2-block, div#right div.a2-block,
+.column div.a2-block,
 .gru-content div.cell,
 .block {
 	margin-top: 0;
--- a/static/includes/_layout.scss
+++ b/static/includes/_layout.scss
@ -83,11 +83,7 @@ div#main-content {
 	min-height: 300px;
 }

-#right {
-	float: right;
-	width: 50%;
-}
-#left {
+.column {
 	float: left;
 	width: 50%;
 }
@ -125,7 +121,7 @@ div#main-content {
 		padding: 0 0.7em;
 		max-width: 100%;
 	}
-	#right, #left {
+	.column {
 		float: none;
 		width: auto;
 	}
--- a/static/lille/_custom.scss
+++ b/static/lille/_custom.scss
@ -369,7 +369,7 @@ div.gru-nav .gru-nav-button {
 			min-height: auto;
 		}
 	}
-	#left, #middle, #right {
+	.column {
 		float: left;
 		width: 33%;
 		@media screen and ($max-mobile-viewport) {
--- a/static/montpellier/_custom.scss
+++ b/static/montpellier/_custom.scss
@ -611,7 +611,7 @@ div#login-actions .actions form {
 	body.narrow-page div.right form button {
 		display: none;
 	}
-	div#left, div#right {
+	.column {
 		width: auto;
 		float: none;
 	}
--- a/static/roannais-icitoyen/_custom.scss
+++ b/static/roannais-icitoyen/_custom.scss
@ -376,7 +376,7 @@ div.gru-nav {
 	}
 }
 div#services > ul > li,
-div#left div.a2-block, div#right div.a2-block,
+.column div.a2-block,
 .gru-content div.cell,
 .block {
 	margin-bottom: 0.5em;
--- a/static/saint-chamond/_custom.scss
+++ b/static/saint-chamond/_custom.scss
@ -77,14 +77,14 @@ nav ul {
 	}
 }

-#left {
+.column:first-child {
 	width: calc(100% - 250px);
 	@media screen and (max-width: $nav-mobile-limit) {
 		width: auto;
 	}
 }

-#right {
+.column:last-child {
 	width: 250px;
 	@media screen and (max-width: $nav-mobile-limit) {
 		clear: both;
--- a/static/seine-et-marne-apa/_custom.scss
+++ b/static/seine-et-marne-apa/_custom.scss
@ -528,7 +528,7 @@ div#sidebar + div#columns-wrapper > div.a2-block {
 	padding: 2rem;
 }

-div#left.profile {
+.column.profile {
 	margin-top: 0;
 	margin-left: 2rem;
 	width: 60%;
@ -541,7 +541,7 @@ div#left.profile {
 	}
 }

-div#right.account-management {
+.column.account-management {
 	width: 30%;
 }

@ -715,11 +715,11 @@ div#rub_service > h2:first-child,
 	#sidebar {
 		padding-top: 1.5rem;
 	}
-	#left {
+	.column:first-child {
 		width: 46%;
 		padding: 0;
 	}
-	#right {
+	.column:last-child {
 		div.cell h2 {
 			background: rgba(127, 190, 206, 0.7);
 			color: white;
--- a/static/signal-publik/_custom.scss
+++ b/static/signal-publik/_custom.scss
@ -848,8 +848,7 @@ div#title-section {

 div.a2-block,
 .gru-content div.cell,
-div#left div.block,
-div#right div.block {
+.column div.block {
 	background: transparent;
 	h2 ~ * {
 		background: white;
--- a/static/villeneuve-dascq/_custom.scss
+++ b/static/villeneuve-dascq/_custom.scss
@ -198,7 +198,7 @@ div.meetings_table {
 }
 // vertical space
 div#services > ul > li,
-div#left div.a2-block, div#right div.a2-block,
+.column div.a2-block,
 .gru-content div.cell,
 .block {
 	margin-bottom: $columns-gutter / 2;
--- a/templates/authentic2/accounts.html
+++ b/templates/authentic2/accounts.html
@ -5,7 +5,7 @@
 {% block extra-body-class %}{{ block.super }} account-page{% endblock %}

 {% block content %}
-<div id="left" class="profile">
+<div class="column profile">
  {% block profile-pre %}{% endblock %}
  <div class="block" id="a2-profile">
    {% block profile-top %}{% endblock %}
@ -43,7 +43,7 @@
  </div>
  {% block profile-post %}{% endblock %}
 </div>
-<div id="right" class="account-management">
+<div class="column account-management">
  {% block account-management-pre %}{% endblock %}
  <div class="block" id="account-management">
    {% block account-management-top %}{% endblock %}
--- a/templates/combo/page_template_2cols.html
+++ b/templates/combo/page_template_2cols.html
@ -2,11 +2,11 @@
 {% load combo i18n %}

 {% block columns %}
-<div id="left">
+<div id="left" class="column">
 {% trans "Left column" as name %}
 {% placeholder "content" name=name %}
 </div>
-<div id="right">
+<div id="right" class="column">
 {% trans "Right column" as name %}
 {% placeholder "right" name=name %}
 </div>
--- a/templates/combo/page_template_2cols_sidebar.html
+++ b/templates/combo/page_template_2cols_sidebar.html
@ -2,11 +2,11 @@
 {% load combo i18n %}

 {% block columns %}
-<div id="left">
+<div id="left" class="column">
 {% trans "Left column" as name %}
 {% placeholder "content" name=name %}
 </div>
-<div id="right">
+<div id="right" class="column">
 {% trans "Right column" as name %}
 {% placeholder "right" name=name %}
 </div>
--- a/templates/variants/hautes-alpes-2018/combo/page_template_commune.html
+++ b/templates/variants/hautes-alpes-2018/combo/page_template_commune.html
@ -5,11 +5,11 @@
 {% endblock %}

 {% block columns %}
-<div id="left">
+<div id="left" class="column">
 	{% trans "Left column" as name %}
 	{% placeholder "content" name=name %}
 </div>
-<div id="right">
+<div id="right" class="column">
 	{% trans "Right column" as name %}
 	{% placeholder "right" name=name %}
 </div>
--- a/templates/variants/lille/combo/page_template_homepage.html
+++ b/templates/variants/lille/combo/page_template_homepage.html
@ -8,15 +8,15 @@
 {% endblock %}

 {% block columns %}
-<div id="left">
+<div class="column">
 {% trans "Left column" as name %}
 {% placeholder "content" name=name %}
 </div>
-<div id="middle">
+<div class="column">
 {% trans "Middle column" as name %}
 {% placeholder "middle" name=name %}
 </div>
-<div id="right">
+<div class="column">
 {% trans "Right column" as name %}
 {% placeholder "right" name=name %}
 </div>
Author	SHA1	Message	Date
Thomas Jund	d57d03a23b	villeneuve-dascq: introduce .column instead #left & #right (#48515 ) gitea-wip/publik-base-theme/pipeline/head There was a failure building this commit Details gitea/publik-base-theme/pipeline/head Something is wrong with the build of this commit Details	2020-11-13 16:24:04 +01:00
Thomas Jund	af6b097992	signal-publik: introduce .column instead #left & #right (#48515 )	2020-11-13 16:24:04 +01:00
Thomas Jund	7c4eb1d9ed	groupe-up: introduce .column instead #left & #right (#48515 )	2020-11-13 16:24:04 +01:00
Thomas Jund	b5f2a90672	seine-et-marne-apa: introduce .column instead #left & #right (#48515 )	2020-11-13 16:24:04 +01:00
Thomas Jund	267befefd0	saint-chamond: introduce .column instead #left & #right (#48515 )	2020-11-13 16:24:04 +01:00
Thomas Jund	65a2aa1ba4	roannais-icitoyen: introduce .column instead #left & #right (#48515 )	2020-11-13 16:24:04 +01:00
Thomas Jund	3e5126b859	montpellier: introduce .column instead #left & #right (#48515 )	2020-11-13 16:24:04 +01:00
Thomas Jund	4c7c18b2a4	lille: introduce .column instead #left & #right (#48515 )	2020-11-13 16:24:04 +01:00
Thomas Jund	5a6f23d7d9	groupe-up: introduce .column instead #left & #right (#48515 )	2020-11-13 16:24:04 +01:00
Thomas Jund	ee44951bcb	grenoble-metropole-2019: introduce .column instead #left & #right (#48515 )	2020-11-13 16:24:04 +01:00
Thomas Jund	cf430c6f0f	arpajon: introduce .column instead #left & #right (#48515 )	2020-11-13 16:24:04 +01:00
Thomas Jund	36c1eeea4e	amiens-metropole: introduce .column instead #left & #right (#48515 )	2020-11-13 16:24:04 +01:00
Thomas Jund	ed18d69d0f	alpes-maritimes-2018: introduce .column instead #left & #right (#48515 )	2020-11-13 16:24:04 +01:00
Thomas Jund	481a43f1ec	hautes-alpes-2018: introduce .column instead #left & #right (#48515 )	2020-11-13 16:24:04 +01:00
Thomas Jund	072447a15b	templates: introduce .column instead #left & #right (#48515 )	2020-11-13 16:24:04 +01:00