nicolas/pic_vert_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

suite

Browse Source
This commit is contained in:
Nicolas Bally 2018-03-21 17:27:23 +01:00
parent e7a10f0131
commit ee3d2bdbf6
6 changed files with 78 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/plume_print.css.scss
View File

@ -3,6 +3,8 @@ $marron:#9A9289;
$vert:#7BAE53;
$beige:#F1F0EE;
@import "qi_css/grid";
body{
font-weight:bold;

92
app/assets/stylesheets/public.scss
View File

@ -7,6 +7,8 @@
@import "public/plume";
@import "qi_css/grid";
.observer-et-photographier-la-faune-sans-deranger{
.couv{
@ -59,7 +61,7 @@ a{
&:hover{
color:#68b9ff;
text-decoration:none;
}
}
@ -144,94 +146,6 @@ a{
.row{
margin:auto;
//max-width:1100px;
display:block;
&:after{
content: "";
display: table;
clear: both;
}
.columns{
display:block;
box-sizing: border-box;
float:left;
display:inline-block;
padding:0 5px;
&:first-child{
padding-left:0px;
}
&:last-child{
padding-right:0px;
}
&.span_12{
width:100%;
}
&.span_11{
width:100/12*11;
}
&.span_10{
width:percentage(1/12*10);
}
&.span_9{
width:percentage(1/12*9);
}
&.span_8{
width:percentage(1/12*8);
}
&.span_7{
width:percentage(1/12*7);
}
&.span_6{
width:percentage(1/12*6);
}
&.span_5{
width:percentage(1/12*5);
}
&.span_4{
width:percentage(1/12*4);
}
&.span_3{
width:percentage(1/12*3);
}
&.span_2{
width:percentage(1/12*2);
}
&.span_1{
width:percentage(1/12*1);
}
}
}
.main{
width:100%;
max-width:1020px;

88
app/assets/stylesheets/public/plume.css.scss
View File

@ -145,48 +145,60 @@ $vert:#7BAE53;
}
}
.article{
a{
.article{
width:50%;
float:left;
&.article_large{
float:none;
width:auto;
margin-top:60px;
margin-bottom:100px;
.image{
width:47%;
margin-left:1%;
float:left;
}
.description{
margin-left:50%;
padding-left:20px;
}
width:50%;
float:left;
text-decoration:none !important;
&.article_large{
float:none;
width:auto;
margin-top:60px;
margin-bottom:100px;
.image{
width:47%;
margin-left:1%;
float:left;
}
.description{
margin-left:50%;
padding-left:20px;
}
}
.inner{
margin:0 20px;
}
}
.inner{
margin:0 20px;
}
.image{
height:300px;
}
.image{
height:300px;
}
.desc{
text-decoration:none !important;
color:black !important;
}
.plume_cat{
text-transform:uppercase;
color:$vert;
font-size:30px;
margin-top:15px;
font-weight:bold;
}
h2{
font-size:20px;
margin:10px 0;
font-weight:bold;
}
.plume_cat{
text-transform:uppercase;
color:$vert;
font-size:30px;
margin-top:15px;
font-weight:bold;
}
h2{
font-size:20px;
margin:10px 0;
font-weight:bold;
*{
text-decoration:none !important;
&:hover{
text-decoration:none !important;
}
}
}
}
}

2
app/views/public/plumes/_top.html.haml
View File

@ -1,5 +1,5 @@
#plume_header
=image_tag "/plume-logo.png", :class => "plume_logo"
=link_to image_tag("/plume-logo.png", :class => "plume_logo"), public_plume_path(@plume)
=image_tag "/plume-logo-mobile.png", :class => "plume_logo_mobile"
.baseline
Bulletin indépendant des lobbies, d’un électorat, consacré à l’intérêt général et super intéressant !

2
app/views/public/plumes/print.html.haml
View File

@ -87,5 +87,5 @@
.render_block
=render plume_article.block
%div{:style => "width:100px;height:100px;background:red;position:fixed;top:0;right:0;"}
%div{:style => "width:100px;height:100px;background:red;position:absolute;top:0;right:0;"}

40
app/views/public/plumes/show.html.haml
View File

@ -17,17 +17,18 @@
-@plume.plume_articles.where(:id => id).each do |article|
.article
.inner
.image.with_ratio.fill_img{:style => "background-image:url('"+(article.image_file.file.large.medium.url if article.image_file).to_s+"');", :data => {:ratio => 0.6}}
=link_to public_plume_article_path(article) do
.article
.inner
.image.with_ratio.fill_img{:style => "background-image:url('"+(article.image_file.file.large.medium.url if article.image_file).to_s+"');", :data => {:ratio => 0.6}}
.description
-if article.plume_cat
.plume_cat= article.plume_cat.title
%h2=article.title
.desc
=article.description
.description
-if article.plume_cat
.plume_cat= article.plume_cat.title
%h2=article.title
.desc
=article.description
.clear
-id = []
@ -36,18 +37,19 @@
-id << cat.plume_articles.first.id if cat.plume_articles.first
-@plume.plume_articles.where(:id => id).each do |article|
.article.article_large
.inner
.image.with_ratio.fill_img{:style => "background-image:url('"+(article.image_file.file.large.medium.url if article.image_file).to_s+"');", :data => {:ratio => 0.6}}
=link_to public_plume_article_path(article) do
.article_large.article
.inner
.image.with_ratio.fill_img{:style => "background-image:url('"+(article.image_file.file.large.medium.url if article.image_file).to_s+"');", :data => {:ratio => 0.6}}
.description
-if article.plume_cat
.plume_cat= article.plume_cat.title
%h2=article.title
.desc
=article.description
.clear
.description
-if article.plume_cat
.plume_cat= article.plume_cat.title
%h2=article.title
.desc
=article.description
.clear
.clear