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

Merge branch 'master' of github.com:fetsite/fetsite

Browse Source
This commit is contained in:
Andreas Stephanides
2013-08-27 22:06:10 +02:00
parent 00403de881 918a3c9360
commit 82422a9d3b
3 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
app/assets/stylesheets/galleries.css.scss
View File

@@ -2,35 +2,35 @@
// They will automatically be included in application.css. // They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/ // You can use Sass (SCSS) here: http://sass-lang.com/
.modal.fade { //.modal.fade {
top: -25%; // top: -25%;
transition: opacity 0.3s linear 0s, top 0.3s ease-out 0s; // transition: opacity 0.3s linear 0s, top 0.3s ease-out 0s;
} //}
.modal-gallery { //.modal-gallery {
max-height: none; // max-height: none;
outline: medium none; // outline: medium none;
width: auto; // width: auto;
} //}
.modal { //.modal {
color: #333333; // color: #333333;
} //}
.hide { //.hide {
display: none; // display: none;
} //}
.modal { //.modal {
background-clip: padding-box; //background-clip: padding-box;
background-color: #FFFFFF; // background-color: #FFFFFF;
border: 1px solid rgba(0, 0, 0, 0.3); // border: 1px solid rgba(0, 0, 0, 0.3);
border-radius: 6px 6px 6px 6px; //border-radius: 6px 6px 6px 6px;
box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); // box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
left: 50%; // left: 50%;
margin-left: -280px; // margin-left: -280px;
outline: medium none; // outline: medium none;
position: fixed; // position: fixed;
top: 10%;; // top: 10%;;
z-index: 1050; // z-index: 1050;
} //}
.fade { //.fade {
opacity: 0; // opacity: 0;
transition: opacity 0.15s linear 0s; // transition: opacity 0.15s linear 0s;
} //}

3
app/views/galleries/index.html.erb
View File

@@ -1,6 +1,4 @@
<h1>Listing galleries</h1> <h1>Listing galleries</h1>
<%= %> <%= %>
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
@@ -25,5 +23,4 @@
</div </div
<br /> <br />
<%= link_to 'New Gallery', new_gallery_path %> <%= link_to 'New Gallery', new_gallery_path %>

2
app/views/galleries/show.html.erb
View File

@@ -34,7 +34,7 @@
<% @gallery.fotos.each do |f| %> <% @gallery.fotos.each do |f| %>
<a href="<%= f.datei.resized.url%>" title="<%=f.title%>" data-gallery="gallery"> <a href="<%= f.datei.resized.url%>" title="<%=f.title%>" data-gallery="gallery">
<%=image_tag(f.datei.big_thumb.url,{:class=>"img-polaroid"}) %></a> <%=image_tag(f.datei.thumb.url,{:class=>"img-polaroid"}) %></a>
<% end %> <% end %>