From: Johan GIRAUD <johangiraud1@gmail.com>
Date: Tue, 3 Feb 2015 15:41:45 +0000 (+0100)
Subject: Merge branch 'master' of ateliers.heureux-cyclage.org:lhc/web/clavettes
X-Git-Tag: 0.1.0~113
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=ea1b965875ee64156a42e3b27c933f5e8479fd86;hp=-c;p=lhc%2Fweb%2Fclavettes.git

Merge branch 'master' of ateliers.heureux-cyclage.org:lhc/web/clavettes
---

ea1b965875ee64156a42e3b27c933f5e8479fd86
diff --combined css/habillage.css
index 0136a1f,dafc3ff..28b4cb1
--- a/css/habillage.css
+++ b/css/habillage.css
@@@ -37,7 -37,7 +37,7 @@@ menu, nav, output, ruby, summary, mark
    background: none; }
  
  html {
 -  line-height: 1; }
 +  line-height: 1.1; }
  
  ol, ul {
    list-style: none; }
@@@ -147,9 -147,6 +147,6 @@@ p 
  #news {
    overflow: hidden; }
  
- #news img {
-   height: 350px; }
- 
  .article {
    background-color: #ffaa7f;
    margin: 0 10px 15px 10px; }
@@@ -160,9 -157,6 +157,9 @@@
    height: 300px;
    margin: 0 10px 15px 10px; }
  
 +.leaflet-control-attribution leaflet-control {
 +  z-index: 999; }
 +
  .agenda {
    background-color: #3ee88d;
    height: 500px;
@@@ -187,10 -181,26 +184,10 @@@
    font-size: 0.8em; }
  
  /*RESPONSIVE*/
 -.col-2,
 -.col-4,
 -.col-6,
 -.col-8,
 -.col-10,
 -.col-12 {
 +.col-1, .col-m-1, .col-l-1, .col-2, .col-m-2, .col-l-2, .col-3, .col-m-3, .col-l-3, .col-4, .col-m-4, .col-l-4, .col-5, .col-m-5, .col-l-5, .col-6, .col-m-6, .col-l-6, .col-7, .col-m-7, .col-l-7, .col-8, .col-m-8, .col-l-8, .col-9, .col-m-9, .col-l-9, .col-10, .col-m-10, .col-l-10, .col-11, .col-m-11, .col-l-11, .col-12, .col-m-12, .col-l-12 {
    float: left;
    position: relative; }
  
 -.row:before, .row:after {
 -  content: "";
 -  display: table; }
 -
 -.row:after {
 -  clear: both; }
 -
 -.row {
 -  margin: 0 -10px;
 -  zoom: 1; }
 -
  .col-1 {
    width: 8.33333%; }
  
@@@ -213,7 -223,7 +210,7 @@@
    width: 58.33333%; }
  
  .col-8 {
 -  width: 66.66666%; }
 +  width: 66.66667%; }
  
  .col-9 {
    width: 75%; }
@@@ -250,7 -260,7 +247,7 @@@
      width: 58.33333%; }
  
    .col-m-8 {
 -    width: 66.66666%; }
 +    width: 66.66667%; }
  
    .col-m-9 {
      width: 75%; }
@@@ -264,6 -274,12 +261,6 @@@
    .col-m-12 {
      width: 100%; } }
  @media only screen and (min-width: 1200px) {
 -  #wrap {
 -    width: 1200px; }
 -
 -  .wrap {
 -    width: auto; }
 -
    .col-l-1 {
      width: 8.33333%; }
  
@@@ -286,7 -302,7 +283,7 @@@
      width: 58.33333%; }
  
    .col-l-8 {
 -    width: 66.66666%; }
 +    width: 66.66667%; }
  
    .col-l-9 {
      width: 75%; }
@@@ -298,24 -314,7 +295,24 @@@
      width: 91.66667%; }
  
    .col-l-12 {
 -    width: 100%; } }
 +    width: 100%; }
 +
 +  #wrap {
 +    width: 1200px; }
 +
 +  .wrap {
 +    width: auto; } }
 +.row:before, .row:after {
 +  content: "";
 +  display: table; }
 +
 +.row:after {
 +  clear: both; }
 +
 +.row {
 +  margin: 0 -10px;
 +  zoom: 1; }
 +
  /*FOOTER*/
  footer {
    clear: both;
diff --combined css/habillage.scss
index 5ca5f60,62c776e..3261254
--- a/css/habillage.scss
+++ b/css/habillage.scss
@@@ -39,7 -39,7 +39,7 @@@ menu, nav, output, ruby, summary, mark
  }
  
  html {
 -  line-height: 1;
 +  line-height: 1.1;
  }
  
  ol, ul {
@@@ -180,10 -180,6 +180,6 @@@ p
  	overflow: hidden;
  }
  
- #news img{
- 	height:350px;
- }
- 
  .article{
  	background-color:#ffaa7f;
  	margin:0 10px 15px 10px;
@@@ -201,9 -197,6 +197,9 @@@
  	height: 300px;
  	margin:0 10px 15px 10px;
  }
 +.leaflet-control-attribution leaflet-control{
 +	z-index: 999;
 +}
  
  .agenda{
  	background-color: #3ee88d;
@@@ -234,61 -227,204 +230,61 @@@
  
  /*RESPONSIVE*/
  
 -.col-2,
 -.col-4,
 -.col-6,
 -.col-8,
 -.col-10,
 -.col-12{
 -	float:left;
 -	position:relative;
 -	
 -	
 -}
 -
 -.row:before, .row:after{
 -	content: "";
 -	display:table;
 -}
 -
 -.row:after{
 -	clear:both;
 -}
 -
 -
 -.row{
 -	margin: 0 -10px;
 -	zoom: 1;
 -}
 -
 -
 -
 -.col-1{
 -	width:8.33333%;
 -}
 -
 -.col-2{
 -	width:16.66667%;
 -}
 -
 -.col-3{
 -	width:25%;
 -}
 -
 -
 -.col-4{
 -	width:33.33333%;
 -}
 -
 -.col-5{
 -	width:41.66667%;
 -}
 -
 -.col-6{
 -	width:50%;
 -}
 -
 -.col-7{
 -	width:58.33333%;
 -}
  
 -.col-8{
 -	width:66.66666%;
 -}
 +$columns: 12!default;
 +$medium:650px;
 +$large:1200px;
  
 -.col-9{
 -	width:75%;
 -}
 -
 -.col-10{
 -	width:83.33333%;
 -}
 -
 -.col-11{
 -	width:91.66667%;
 -}
 -
 -.col-12{
 -	width:100%;
 -}
 -
 -
 -
 -
 -@media only screen and (min-width:650px) {
 -
 -.col-m-1{
 -	width:8.33333%;
 -}
 -
 -.col-m-2{
 -	width:16.66667%;
 -}
 -
 -.col-m-3{
 -	width:25%;
 -}
 -
 -
 -.col-m-4{
 -	width:33.33333%;
 -}
 -
 -.col-m-5{
 -	width:41.66667%;
 -}
 -
 -.col-m-6{
 -	width:50%;
 -}
 -
 -.col-m-7{
 -	width:58.33333%;
 -}
 -
 -.col-m-8{
 -	width:66.66666%;
 -}
 -
 -.col-m-9{
 -	width:75%;
 -}
 -
 -.col-m-10{
 -	width:83.33333%;
 -}
 -
 -.col-m-11{
 -	width:91.66667%;
 +%col{
 +	float:left;
 +	position: relative;
  }
  
 -.col-m-12{
 -	width:100%;
 +@for $i from 1 through $columns{
 +	.col-#{$i}{
 +	@extend %col;
 +	width:$i / $columns * 100%;}
 +	.col-m-#{$i}, .col-l-#{$i}{@extend %col;} 
  }
  
 +@media only screen and (min-width: $medium){
 +	@for $i from 1 through $columns{
 +	.col-m-#{$i}{
 +	width:$i / $columns * 100%;}
 +	}
 +	
  }
 -
 -
 -
 -
 -
 -
 -@media only screen and (min-width:1200px) {
 -
 -#wrap{
 +@media only screen and (min-width: $large){
 +	@for $i from 1 through $columns{
 +	.col-l-#{$i}{
 +	width:$i / $columns * 100%;}
 +	}
 +	#wrap{
  	width:1200px;
  }
  
  .wrap{
  	width: auto;
  }
 -
 -.col-l-1{
 -	width:8.33333%;
 -}
 -
 -.col-l-2{
 -	width:16.66667%;
 -}
 -
 -.col-l-3{
 -	width:25%;
  }
  
  
 -.col-l-4{
 -	width:33.33333%;
 -}
 -
 -.col-l-5{
 -	width:41.66667%;
 -}
 -
 -.col-l-6{
 -	width:50%;
 -}
 -
 -.col-l-7{
 -	width:58.33333%;
 -}
  
 -.col-l-8{
 -	width:66.66666%;
 +.row:before, .row:after{
 +	content: "";
 +	display:table;
  }
  
 -.col-l-9{
 -	width:75%;
 +.row:after{
 +	clear:both;
  }
  
 -.col-l-10{
 -	width:83.33333%;
 -}
  
 -.col-l-11{
 -	width:91.66667%;
 +.row{
 +	margin: 0 -10px;
 +	zoom: 1;
  }
  
 -.col-l-12{
 -	width:100%;
 -}
 -}
  
  /*FOOTER*/