followup bootstrap fixes, again, publiclab#380

stacytonui · Mar 9, 2016 · 9d514d7 · 9d514d7
1 parent d7ec954
commit 9d514d7
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 4 deletions.
diff --git a/app/assets/stylesheets/style.css b/app/assets/stylesheets/style.css
@@ -156,6 +156,7 @@ body { padding-top: 70px; }
 
 .footer {
   clear:both;
+  margin-top: 40px;
   padding: 20px;
   border-top: 1px solid #E5E5E5;
   background-color: #f8f8f8;

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -12,6 +12,11 @@
     <meta name="author" content="Public Lab contributors" />
     <link href="https://publiclab.org/feed.rss" rel="alternate" type="application/rss+xml" title="Public Lab research" />
 
+    <link rel="apple-touch-icon" href="/images/pl-255.png">
+    <link rel="apple-touch-icon-precomposed" href="/images/pl-255.png">
+    <link rel="apple-touch-icon-precomposed apple-touch-icon" href="/images/pl-255.png">
+    <link rel="shortcut icon" href="/images/pl-255.png" />
+
     <%= stylesheet_link_tag "application", :media => "all" %>
     <link href="/lib/fontawesome/css/font-awesome.min.css" media="all" rel="stylesheet" type="text/css" />
     <% if @node && @node.has_tag('style:fancy') %>

diff --git a/app/views/notes/_comment.html.erb b/app/views/notes/_comment.html.erb
@@ -8,6 +8,8 @@
       <% if comment.author %>
         <% if comment.author.user && comment.author.user.photo_file_name %>
           <img style="width:32px;margin-right:6px;" class="img-circle" src="<%= comment.author.user.photo_path(:thumb) %>" /> 
+        <% else %>
+          <div style="vertical-align:middle;display:inline-block;height:32px;width:32px;margin-right:6px;background:#ccc;" class="img-circle"></div> 
         <% end %>
         <a href="/profile/<%= comment.author.name %>"><%= comment.author.name %></a>
       <% end %>

diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
@@ -6,7 +6,7 @@
 
   <% if @node.main_image %>
     <a class="main-image" style="max-height:600px;max-width:100%;width:800px;" href="<%= @node.main_image.path(:original) %>">
-      <img class="img-rounded" src="<%= @node.main_image.path(:large) %>" />
+      <img style="max-height:600px;max-width:100%;" class="img-rounded" src="<%= @node.main_image.path(:large) %>" />
     </a>
     <!--<div class="expand"><a onClick="$('.main-image').toggleClass('compressed');"><i class="fa fa-angle-down"></i></a></div>-->
   <% end %>

diff --git a/app/views/users/profile.html.erb b/app/views/users/profile.html.erb
@@ -88,9 +88,9 @@
   <ul class="nav nav-tabs">
     <span style="float:right;"><small>Joined <%= time_ago_in_words(@user.created_at) %> ago</small></span>
     <li class="active"><a href="#research" data-toggle="tab">Research</a></li>
-    <li><a href="#comments" id="comments-tab" data-toggle="tab"><i class="fa fa-comment"></i><span class="hidden-sm"> Comments</span></a></li>
-    <li><a href="/profile/<%= @user.username %>/likes"><i class="fa fa-star"></i><span class="hidden-sm"> Liked</span> (<%= @user.like_count %>)</a></li>
-    <li><a href="#maps" data-toggle="tab"><i class="fa fa-map-marker"></i> MapKnitter maps</a></a>
+    <li><a href="#comments" id="comments-tab" data-toggle="tab"><i class="fa fa-comment"></i><span class="hidden-sm hidden-xs"> Comments</span></a></li>
+    <li><a href="/profile/<%= @user.username %>/likes"><i class="fa fa-star"></i><span class="hidden-sm hidden-xs"> Liked</span> (<%= @user.like_count %>)</a></li>
+    <li><a href="#maps" data-toggle="tab"><i class="fa fa-map-marker"></i><span class="hidden-sm hidden-xs"> MapKnitter maps</span></a></a>
   </ul>
 
   <br />

diff --git a/public/images/pl-255.png b/public/images/pl-255.png
diff --git a/public/images/pl.png b/public/images/pl.png