From 311afa7dc9197617794e32327fa488cd782b9d50 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Tue, 24 Apr 2012 13:56:18 -0700
Subject: [PATCH] i guess my captions commit got lost somewhere [ci skip]

---
 .../javascripts/app/views/small_frame.js      |  2 +-
 .../stylesheets/new_styles/_canvas.scss       | 25 ++++++++++++++++---
 .../stylesheets/new_styles/_typography.scss   |  4 +++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/app/views/small_frame.js b/app/assets/javascripts/app/views/small_frame.js
index 33f4b9711..ed2f4a19d 100644
--- a/app/assets/javascripts/app/views/small_frame.js
+++ b/app/assets/javascripts/app/views/small_frame.js
@@ -37,7 +37,7 @@ app.views.SmallFrame = app.views.Base.extend({
       textClass = "blog-text x2 width"
     } else if(text.length > 140) {
       textClass = randomColor
-    } else if(text.length > 50) {
+    } else if(text.length > 40) {
       textClass = randomColor
     } else {
       textClass =  "big-text " + randomColor
diff --git a/app/assets/stylesheets/new_styles/_canvas.scss b/app/assets/stylesheets/new_styles/_canvas.scss
index d39722516..e9481bf7a 100644
--- a/app/assets/stylesheets/new_styles/_canvas.scss
+++ b/app/assets/stylesheets/new_styles/_canvas.scss
@@ -109,8 +109,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.4);
+    background-color : rgba(255,255,255,0.8);
 
     position : absolute;
     bottom : -30px;
@@ -118,6 +119,8 @@ body {
     text-align : center;
     width : 100%;
 
+    z-index : 30;
+
     padding : 5px;
     padding-right : 8px;
     i {
@@ -212,6 +215,22 @@ body {
     }
   }
 
+  &.day:not(.sticky-note),
+  &.night:not(.sticky-note),
+  &.multi-photo:not(.sticky-note) {
+    .text-content {
+      @include opacity(1);
+      padding : 10px 20px;
+      font-size : 14px;
+      line-height : 18px;
+      color : #444;
+
+      p:last-child {
+        margin-bottom: 0;
+      }
+    }
+  }
+
   &.big-text {
     .text-content {
       p {
@@ -254,15 +273,13 @@ body {
       }
     }
 
-
-
     .text-content {
       position: absolute;
       left: 0;
       width: 100%;
       top: 40%;
       @include centered-frame();
-      font-size: 3em;
+      font-size: 2em;
       color: white;
       @include opacity(1);
       text-shadow : none;
diff --git a/app/assets/stylesheets/new_styles/_typography.scss b/app/assets/stylesheets/new_styles/_typography.scss
index b473845fb..2d3ec159e 100644
--- a/app/assets/stylesheets/new_styles/_typography.scss
+++ b/app/assets/stylesheets/new_styles/_typography.scss
@@ -6,4 +6,8 @@
 
 body, p, h1, h2, h3, h4, h5, h6, textarea, input, * {
   font-family : Roboto, Helvetica, sans;
+}
+
+a {
+  font-family : inherit;
 }
\ No newline at end of file