From ec096f8131c175651faa5155fc916ae97a5f13b3 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Tue, 24 Apr 2012 18:55:23 -0700
Subject: [PATCH] remove some opacity stuff; fix isotope pagination [ci skip]

---
 .../javascripts/app/views/canvas_view.js      |  4 +-
 .../stylesheets/new_styles/_canvas.scss       | 11 ++--
 .../new_styles/_isotope_transitions.scss      | 59 +++++++++++++++----
 .../stylesheets/new_styles/_profile.scss      |  5 +-
 4 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/app/assets/javascripts/app/views/canvas_view.js b/app/assets/javascripts/app/views/canvas_view.js
index 8cecff5b2..333da8f96 100644
--- a/app/assets/javascripts/app/views/canvas_view.js
+++ b/app/assets/javascripts/app/views/canvas_view.js
@@ -25,8 +25,8 @@ app.views.Canvas = app.views.Base.extend(_.extend({}, app.views.infiniteScrollMi
   mason : function() {
     this.$el.isotope({
       itemSelector : '.canvas-frame',
-      visibleStyle : {},
-      hiddenStyle : {},
+      visibleStyle : {scale : 1},
+      hiddenStyle : {scale : 0.001},
       masonry : {
         columnWidth : 292.5
       }
diff --git a/app/assets/stylesheets/new_styles/_canvas.scss b/app/assets/stylesheets/new_styles/_canvas.scss
index 4b19c6850..59ab93d1f 100644
--- a/app/assets/stylesheets/new_styles/_canvas.scss
+++ b/app/assets/stylesheets/new_styles/_canvas.scss
@@ -111,10 +111,9 @@ body {
 
   .info {
     @include transition(bottom);
-    @include opacity(0.8);
     @include box-shadow(0,-1px,3px,rgba(0,0,0,0.3));
 
-    background-color : rgba(255,255,255,0.8);
+    background-color : #fff;
 
     position : absolute;
     bottom : -30px;
@@ -140,8 +139,6 @@ body {
   }
 
   .text-content {
-    @include opacity(0.65);
-
     position : relative;
     z-index : 10;
     color : #000;
@@ -191,6 +188,10 @@ body {
     }
   }
 
+  &.sticky-note .text-content {
+    color : #555;
+  }
+
   &.cyan .background-color   { background-color : rgba($cyan, 0.2); }
   &.green .background-color  { background-color : rgba($green, 0.2); }
   &.yellow .background-color { background-color : rgba($yellow, 0.2); }
@@ -204,7 +205,7 @@ body {
   &.blog-text {
     .text-content {
       padding : 10px;
-      @include opacity(0.9);
+      color : #222;
 
       p {
         text-shadow : 0 1px 0 #ccc;
diff --git a/app/assets/stylesheets/new_styles/_isotope_transitions.scss b/app/assets/stylesheets/new_styles/_isotope_transitions.scss
index b96f3e573..fca0ef8b6 100644
--- a/app/assets/stylesheets/new_styles/_isotope_transitions.scss
+++ b/app/assets/stylesheets/new_styles/_isotope_transitions.scss
@@ -1,25 +1,64 @@
+/* Start: Recommended Isotope styles */
+
+/**** Isotope Filtering ****/
+
+.isotope-item {
+  z-index: 2;
+}
+
+.isotope-hidden.isotope-item {
+  pointer-events: none;
+  z-index: 1;
+}
+
+/**** Isotope CSS3 transitions ****/
+
 .isotope,
 .isotope .isotope-item {
-/* change duration value to whatever you like */
   -webkit-transition-duration: 0.4s;
-  -moz-transition-duration:    0.4s;
-  -ms-transition-duration:     0.4s;
-  -o-transition-duration:      0.4s;
-  transition-duration:         0.4s;
+  -moz-transition-duration: 0.4s;
+  -ms-transition-duration: 0.4s;
+  -o-transition-duration: 0.4s;
+  transition-duration: 0.4s;
 }
 
 .isotope {
   -webkit-transition-property: height, width;
-  -moz-transition-property:    height, width;
-  -ms-transition-property:     height, width;
-  -o-transition-property:      height, width;
-  transition-property:         height, width;
+  -moz-transition-property: height, width;
+  -ms-transition-property: height, width;
+  -o-transition-property: height, width;
+  transition-property: height, width;
 }
 
 .isotope .isotope-item {
   -webkit-transition-property: -webkit-transform, opacity;
   -moz-transition-property:    -moz-transform, opacity;
   -ms-transition-property:     -ms-transform, opacity;
-  -o-transition-property:      top, left, opacity;
+  -o-transition-property:         top, left, opacity;
   transition-property:         transform, opacity;
 }
+
+/**** disabling Isotope CSS3 transitions ****/
+
+.isotope.no-transition,
+.isotope.no-transition .isotope-item,
+.isotope .isotope-item.no-transition {
+  -webkit-transition-duration: 0s;
+  -moz-transition-duration: 0s;
+  -ms-transition-duration: 0s;
+  -o-transition-duration: 0s;
+  transition-duration: 0s;
+}
+
+/* End: Recommended Isotope styles */
+
+
+
+/* disable CSS transitions for containers with infinite scrolling*/
+.isotope.infinite-scrolling {
+  -webkit-transition: none;
+  -moz-transition: none;
+  -ms-transition: none;
+  -o-transition: none;
+  transition: none;
+}
diff --git a/app/assets/stylesheets/new_styles/_profile.scss b/app/assets/stylesheets/new_styles/_profile.scss
index f1f5d6af4..8eba2a120 100644
--- a/app/assets/stylesheets/new_styles/_profile.scss
+++ b/app/assets/stylesheets/new_styles/_profile.scss
@@ -19,8 +19,7 @@
 }
 
 .canvas-frame .fav {
-  @include transition(opacity);
-  @include opacity(0);
+  display : none;
 
   background-image : image_url('buttons/star_not_faved.png');
   background-size : 30px 30px;
@@ -44,7 +43,7 @@
   }
 
   .canvas-frame .fav {
-    @include opacity(1)
+    display : block;
   }
 
   .canvas-frame {