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

app/assets/stylesheets/galleries.css.scss

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

app/views/galleries/index.html.erb

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

app/views/galleries/show.html.erb

@@ -34,7 +34,7 @@
 <% @gallery.fotos.each do |f| %>
 
 <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 %>