andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Merge /home/andis/fetsite

Browse Source
This commit is contained in:
Andreas Stephanides
2015-09-14 16:01:15 +02:00
parent e341384493 5542777216
commit cfdbeeaf46
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/home/infoscreen.html.erb
View File

@@ -16,13 +16,13 @@
<div class="step contentbox" id="step-<%=i%>" data-x="<%= i *2000 %>" data-y="<%= Random.rand(0..5)*200 %>" data-rotate="<%= Random.rand(0..18)*10 %>" style="width:1000px; height:500px; padding: 50px; display:block" data-duration="10000"><% @toolbar_elements=[];@questions=[] %> <div class="step contentbox" id="step-<%=i%>" data-x="<%= i *2000 %>" data-y="<%= Random.rand(0..5)*200 %>" data-rotate="<%= Random.rand(0..18)*10 %>" style="width:1000px; height:500px; padding: 50px; display:block" data-duration="10000"><% @toolbar_elements=[];@questions=[] %>
<div class="media" style="width: 660px; height:340px; transform: scale(1.5) translate(120px,50px)" > <div class="media" style="width: 660px; height:340px; transform: scale(1.5) translate(120px,50px)" >
<div class="pull-left" href="#"> <div class="pull-left" href="#" style="max-width:200px;">
<% unless n.picture_robust.big_thumb.to_s.empty? %> <% unless n.picture_robust.big_thumb.to_s.empty? %>
<p> <p>
<br><%= link_to image_tag(n.picture_robust.big_thumb),n.picture_robust.try(:url) %> <br><%= link_to image_tag(n.picture_robust.big_thumb),n.picture_robust.try(:url) %>
</p> </p>
<% end %> <% end %>
<h1> <h3>
<% if n.has_calentries? %> <% if n.has_calentries? %>
<div href="#"> <div href="#">
<%= fa_icon("calendar 2x") %> <%= fa_icon("calendar 2x") %>
@@ -35,7 +35,7 @@
</div> </div>
<% end %> <% end %>
</h1> </h3>
</div> </div>
<div class="media-body"> <div class="media-body">