From fd6a858f832f25eed4fdaf7647feedf4d6afb186 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Thu, 24 May 2012 11:04:12 -0700
Subject: [PATCH] don't do big styling on frames with the has-media class [ci
 skip]

---
 app/assets/stylesheets/new_styles/_canvas.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/new_styles/_canvas.scss b/app/assets/stylesheets/new_styles/_canvas.scss
index 9e904098a..18f095bea 100644
--- a/app/assets/stylesheets/new_styles/_canvas.scss
+++ b/app/assets/stylesheets/new_styles/_canvas.scss
@@ -271,7 +271,7 @@ color: white;
     }
   }
 
-  &.editable,
+  &.editable:not(.has-media),
   &.big-text {
     .text-content {
       display : table;
@@ -290,7 +290,7 @@ color: white;
     }
   }
 
-  &.editable p {
+  &.editable:not(.has-media) p {
     min-width : 225px;
     min-height : 225px;
   }