Merge pull request #26 from ndbroadbent/css_fixes

CSS fixes
kandanapp · Jun 4, 2012 · 2d6391d · 2d6391d
2 parents e84c1c2 + 5a135a1
commit 2d6391d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 20 deletions.
diff --git a/app/assets/javascripts/backbone/plugins/image_embed.js.coffee b/app/assets/javascripts/backbone/plugins/image_embed.js.coffee
@@ -5,7 +5,7 @@ class Kandan.Plugins.ImageEmbed
     template: _.template '''
       <div class="image-preview">
         <a target="_blank" href="<%= imageUrl %>">
-          <img class="image-embed" src="<%= imageUrl %>" height="200" width="200" />
+          <img class="image-embed" src="<%= imageUrl %>" />
         </a>
         <div class="name"><%= subtitle %></div>
       </div>

diff --git a/app/assets/stylesheets/_activity.sass b/app/assets/stylesheets/_activity.sass
@@ -35,26 +35,34 @@
           font-weight: bold
           margin-top: 5px
 
-.posted_at
-  float: right
-  text-align: right
-  font-size: 11px
-  position: absolute
-  right: 0px
-  +border-radius(4px)
-  padding: 4px
-  background: #F3F8F9
-  color: #BDC6CA
+  .posted_at
+    float: right
+    text-align: right
+    font-size: 11px
+    position: absolute
+    right: 0px
+    +border-radius(4px)
+    padding: 4px
+    background: #F3F8F9
+    color: #BDC6CA
 
 
-.avatar
-  margin-right: 10px
-  display: block
-  float: left
-  width: 5%
-  width: 30px
-  height: 30px
 
+  .avatar
+    margin-right: 10px
+    display: block
+    float: left
+    width: 5%
+    width: 30px
+    height: 30px
+
+
+  &.current_user
+    background-color: #F5F5F5
+    .posted_at
+      background: #E6EAEB
+      color: #A9B1B6
 
-.current_user
-  background-color: #F0F0F0
+img.image-embed
+  max-width: 300px
+  max-height: 300px