resolve merge conflict

apesic · Sep 10, 2014 · 2af92cf · 2af92cf
2 parents af6fd94 + a529b6b
commit 2af92cf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/app/assets/stylesheets/horizontal.css b/app/assets/stylesheets/horizontal.css
@@ -142,7 +142,9 @@ h1, h2, h3, h4, h5, h6, li, p {
 }
 
 .col-1 h3 {
-  margin: 20px 0;
+  font-size: 14px;
+  margin: 10px 0;
+  text-align: center;
 }
 
 

diff --git a/app/helpers/stories_helper.rb b/app/helpers/stories_helper.rb
@@ -6,4 +6,15 @@ def story_controls
       render :partial => 'stories/story_nav'
     end
   end
+
+  def shorten_title(title)
+    if title.length > 10
+      new_title = title[0..9]
+      new_title += "..."
+      return new_title
+    else
+      return title
+    end
+  end
+
 end
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
@@ -21,7 +21,7 @@
           <%= link_to story do %>
             <div class="grouping">
               <div class="col-1">
-                <i class="fa fa-file fa-4x"></i><h3><%= story.name %></h3>
+                <i class="fa fa-file fa-3x"></i><h3><%= shorten_title(story.name) %></h3>
               </div>
             </div>
           <% end %>

diff --git a/lib/export.rb b/lib/export.rb
@@ -80,5 +80,4 @@ def prepare_story_title_for_export(name)
     name.squish.downcase.tr(" ","_").gsub(/[^\w\.]/, '')[0..19]
   end
 
-
 end
Original file line number	Diff line number	Diff line change
Expand Up		@@ -80,5 +80,4 @@ def prepare_story_title_for_export(name)
		name.squish.downcase.tr(" ","_").gsub(/[^\w\.]/, '')[0..19]
		end


		end