Merge branch 'master' of https://github.com/hhba/mapa76

hhba · Nov 13, 2013 · de7f098 · de7f098
2 parents eaf7635 + a67a2fb
commit de7f098
Show file tree

Hide file tree

Showing 58 changed files with 12,977 additions and 53 deletions.
diff --git a/aphrodite/app/assets/javascripts/home.js b/aphrodite/app/assets/javascripts/home.js
@@ -0,0 +1,42 @@
+$(document).ready(function(){
+  if($('#content-caroufredsel').length) {
+    $('#content-caroufredsel').carouFredSel({
+        items       : 1,
+        author        : false,
+        height        : 377,
+        width       : 567,
+        pagination      : "#content-caroufredsel-pager",
+        mousewheel      : true,
+        auto        : true,
+        circular      : true,
+        infinite      : true,
+
+        scroll: {
+          items     : 1,
+          duration    : 1000,
+          pauseOnHover  : true
+        }
+      });
+  }
+
+  if($('#prefooter-caroufredsel').length) {
+    $('#prefooter-caroufredsel').carouFredSel({
+      items       : 6,
+      author        : false,
+      height        : 63,
+      width       : 845,
+      circular      : true,
+      prev        : '#prev2',
+      next        : '#next2',
+      mousewheel      : true,
+      auto        : false,
+      infinite      : true,
+
+      scroll: {
+        items     : 1,
+        duration    : 1000,
+        pauseOnHover  : true
+      }
+    });
+  }
+});
diff --git a/aphrodite/app/assets/javascripts/pretty.js b/aphrodite/app/assets/javascripts/pretty.js
@@ -0,0 +1,5 @@
+//= require jquery
+//= require jquery.placeholder
+//= require jquery.carouFredSel-6.2.1
+
+//= require home
diff --git a/aphrodite/app/assets/stylesheets/application.css.scss b/aphrodite/app/assets/stylesheets/application.css.scss
@@ -10,7 +10,6 @@
  *
  *= require_self
  *
- *= require_tree .
  */
 
 // First import journal variables

diff --git a/aphrodite/app/assets/stylesheets/pretty.css.scss b/aphrodite/app/assets/stylesheets/pretty.css.scss
@@ -0,0 +1,5 @@
+/*
+*= require_self
+*/
+
+@import "pretty/global"