References #20 - Implemented better clipping via a CSS property, so t…

…ext doesn't vertically overflow any longer. However, if the content is less than 100 characters, I still won't give you the option to go to the overlay.
jefflunt · Jun 4, 2012 · d051f93 · d051f93
1 parent d3a812f
commit d051f93
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 8 deletions.
diff --git a/app/assets/stylesheets/main.sass b/app/assets/stylesheets/main.sass
@@ -110,11 +110,26 @@ a
   margin-top: 5px
   margin-right: 5px
 .thought
+  overflow: hidden
   border: none
   margin-top: -10px
   font-size: $size-medium
   word-wrap: break-word
   padding: 5px 5px 23px 5px
+  height: 83px
+.thought-bottom-section-standard
+  background-color: #000
+  border-bottom-left-radius: 5px
+  border-bottom-right-radius: 5px
+  height: 24px
+  bottom: 0px
+.thought-bottom-section-overlay
+  @extend .thought-bottom-section-standard
+  border-radius: 0px
+  position: absolute
+  width: 100%
+  height: 37px
+  bottom: 0px
 .thought-controls
   position: absolute
   bottom: 3px

diff --git a/app/views/thoughts/_bottom_section_overlay.haml b/app/views/thoughts/_bottom_section_overlay.haml
@@ -1,2 +1,3 @@
-=render :partial => "thoughts/votes_overlay", :locals => {thought: thought}
-=render :partial => "thoughts/controls_overlay", :locals => {thought: thought}
+.thought-bottom-section-overlay
+  =render :partial => "thoughts/votes_overlay", :locals => {thought: thought}
+  =render :partial => "thoughts/controls_overlay", :locals => {thought: thought}
diff --git a/app/views/thoughts/_bottom_section_standard.haml b/app/views/thoughts/_bottom_section_standard.haml
@@ -1,2 +1,3 @@
-=render :partial => "thoughts/votes_standard", :locals => {thought: thought}
-=render :partial => "thoughts/controls_standard", :locals => {thought: thought}
+.thought-bottom-section-standard
+  =render :partial => "thoughts/votes_standard", :locals => {thought: thought}
+  =render :partial => "thoughts/controls_standard", :locals => {thought: thought}
diff --git a/app/views/thoughts/_thought_box.haml b/app/views/thoughts/_thought_box.haml
@@ -1,5 +1,5 @@
 -is_new_thought ||= nil
 .thought-box{class: custom_styles(thought, is_new_thought), id: "thought-box-#{thought.id}"}
   .thought
-    =simple_format(auto_link(truncate(thought.text, length: 99, :omission => ' ...')))
+    =simple_format(auto_link(thought.text))
   =render :partial => "thoughts/bottom_section_standard", :locals => {thought: thought}
diff --git a/public/assets/application-42efb240b4740cbe772faeab8c9561cc.js.gz b/public/assets/application-42efb240b4740cbe772faeab8c9561cc.js.gz
diff --git a/...tion-f908da3a7d7f6c2d927014e543b364c1.css → ...tion-eb8a37afd06b7a5142e455637662ccc4.css b/...tion-f908da3a7d7f6c2d927014e543b364c1.css → ...tion-eb8a37afd06b7a5142e455637662ccc4.css
diff --git a/public/assets/application-eb8a37afd06b7a5142e455637662ccc4.css.gz b/public/assets/application-eb8a37afd06b7a5142e455637662ccc4.css.gz
diff --git a/public/assets/application-f908da3a7d7f6c2d927014e543b364c1.css.gz b/public/assets/application-f908da3a7d7f6c2d927014e543b364c1.css.gz
diff --git a/public/assets/application.css b/public/assets/application.css
diff --git a/public/assets/application.css.gz b/public/assets/application.css.gz
diff --git a/public/assets/application.js.gz b/public/assets/application.js.gz
diff --git a/public/assets/manifest.yml b/public/assets/manifest.yml
@@ -4,4 +4,4 @@ brain-light.jpg: brain-light-561b24be085e75f3378e031c64251277.jpg
 spinner.gif: spinner-6aa1008d858cbed1cd320422f59a4789.gif
 application.js: application-42efb240b4740cbe772faeab8c9561cc.js
 PTM55FT.ttf: PTM55FT-7515d9db13e596569dc717ef3606ce98.ttf
-application.css: application-f908da3a7d7f6c2d927014e543b364c1.css
+application.css: application-eb8a37afd06b7a5142e455637662ccc4.css