assorted remaining bootstrap 3 fixes, close publiclab#380

app/assets/stylesheets/style.css

@@ -149,20 +149,13 @@ body { padding-top: 70px; }
 
 .footer {
   clear:both;
-  margin: 20px -20px 0;
   padding: 20px;
   border-top: 1px solid #E5E5E5;
   background-color: #f8f8f8;
 }
 
-@media (min-width: 768px) {
-  .footer { margin:20px 0 0 0; }
-}
-
-@media (max-with: 786px) {
-  .footer {
-    margin: 20px -20px 20px;
-  }
+.footer ul {
+  margin-bottom: 30px;
 }
 
 .caption {

app/views/home/subscriptions.html.erb

@@ -6,7 +6,7 @@
 
   <p>
     <% if current_user.following("everything") %>
-      <a rel="tooltip" title="Click to unfollow" class="btn btn-default active" href="/unsubscribe/tag/everything"><i class="fa fa-eye-open"></i> Following <b>all research notes</b></a>
+      <a rel="tooltip" title="Click to unfollow" class="btn btn-default active" href="/unsubscribe/tag/everything"><i class="fa fa-eye"></i> Following <b>all research notes</b></a>
     <% else %>
       <a href="/subscribe/tag/everything" class="btn btn-default"><i class="fa fa-tag"></i> Subscribe to <b>all</b> notes</a>
     <% end %>

app/views/like/_like.html.erb

@@ -1,6 +1,6 @@
 <div class="btn-toolbar pull-right" style="margin-left:10px;margin-top:0;">
   <ul class="btn-group">
-    <li class="btn btn-default btn-sm" data-html="true" rel="popover" data-content="<%= "No tags" if tagnames.nil? || tagnames.length == 0 %><% if tagnames %><% tagnames.each do |tagname| %><p style='margin-bottom:3px;'><a href='/subscribe/tag/<%= tagname %>' class='btn btn-default btn-mini'><%= tagname %></a></p><% end %><% end %><hr /><a class='btn btn-sm'><i class='fa fa-user'></i> <%= node.author.name %></a>" title="Follow by tag or author" data-placement="left"><i class="fa fa-eye-open"></i><span class="hidden-sm"> Follow</span></li>
+    <li class="btn btn-default btn-sm" data-html="true" rel="popover" data-content="<%= "No tags" if tagnames.nil? || tagnames.length == 0 %><% if tagnames %><% tagnames.each do |tagname| %><p style='margin-bottom:3px;'><a href='/subscribe/tag/<%= tagname %>' class='btn btn-default btn-mini'><%= tagname %></a></p><% end %><% end %><hr /><a class='btn btn-sm'><i class='fa fa-user'></i> <%= node.author.name %></a>" title="Follow by tag or author" data-placement="left"><i class="fa fa-eye"></i><span class="hidden-sm"> Follow</span></li>
     <li rel="tooltip" title="Helpful? Follow it!" class="btn btn-default btn-sm" node-id="<%= node.id %>" id="like-button-<%= node.id %>"><span id="like-star-<%= node.id %>" class="fa fa-star<% if current_user && !node.liked_by(current_user.uid) %>-o<% end %>"></span><span class="hidden-sm"> Like <span id="like-count-<%= node.id %>"/>(<%= node.likers.length %>)</span></li>
     <li class="btn btn-default btn-sm" rel="popover" data-placement="left" data-html="true" data-title="Tools" data-content="
 <p><b>Users who liked this</b></p>

app/views/tag/blog.html.erb

@@ -16,9 +16,9 @@
     <% if current_user %>
       <a class="btn btn-sm" href="/feed/tag/<%= params[:id] %>.rss"><i class="fa fa-rss"></i> RSS</a>
       <% if current_user.following(params[:id]) %>
-      <a rel="tooltip" title="Click to unfollow" class="btn btn-sm active" href="/unsubscribe/tag/<%= params[:id] %>"><i class="fa fa-eye-open"></i> Following <b><%= params[:id] %></b></a>
+      <a rel="tooltip" title="Click to unfollow" class="btn btn-sm active" href="/unsubscribe/tag/<%= params[:id] %>"><i class="fa fa-eye"></i> Following <b><%= params[:id] %></b></a>
       <% else %>
-      <a class="btn btn-sm" href="/subscribe/tag/<%= params[:id] %>"><i class="fa fa-eye-open"></i> Follow <b><%= params[:id] %></b></a>
+      <a class="btn btn-sm" href="/subscribe/tag/<%= params[:id] %>"><i class="fa fa-eye"></i> Follow <b><%= params[:id] %></b></a>
       <% end %>
     <% end %>
   </div>

app/views/tag/contributors-index.html.erb

@@ -46,9 +46,9 @@
       <div class="btn-group">
         <a class="btn btn-sm" href="/feed/tag/<%= tag.name %>.rss"><i class="fa fa-rss"></i> RSS</a>
         <% if current_user.following(tag.name) %>
-        <a rel="tooltip" title="Click to unfollow" class="btn btn-sm active" href="/unsubscribe/tag/<%= tag.name %>"><i class="fa fa-eye-open"></i> Following <b><%= tag.name %></b></a>
+        <a rel="tooltip" title="Click to unfollow" class="btn btn-sm active" href="/unsubscribe/tag/<%= tag.name %>"><i class="fa fa-eye"></i> Following <b><%= tag.name %></b></a>
         <% else %>
-        <a class="btn btn-sm" href="/subscribe/tag/<%= tag.name %>"><i class="fa fa-eye-open"></i> Follow <b><%= tag.name %></b></a>
+        <a class="btn btn-sm" href="/subscribe/tag/<%= tag.name %>"><i class="fa fa-eye"></i> Follow <b><%= tag.name %></b></a>
         <% end %>
       </div>
       <!-- AJAXify -->

app/views/tag/contributors.html.erb

@@ -45,9 +45,9 @@
     <div class="btn-group">
       <a class="btn btn-sm" href="/feed/tag/<%= params[:id] %>.rss"><i class="fa fa-rss"></i> RSS</a>
       <% if current_user.following(params[:id]) %>
-      <a rel="tooltip" title="Click to unfollow" class="btn btn-sm active" href="/unsubscribe/tag/<%= params[:id] %>"><i class="fa fa-eye-open"></i> Following <b><%= params[:id] %></b></a>
+      <a rel="tooltip" title="Click to unfollow" class="btn btn-sm active" href="/unsubscribe/tag/<%= params[:id] %>"><i class="fa fa-eye"></i> Following <b><%= params[:id] %></b></a>
       <% else %>
-      <a class="btn btn-sm" href="/subscribe/tag/<%= params[:id] %>"><i class="fa fa-eye-open"></i> Follow <b><%= params[:id] %></b></a>
+      <a class="btn btn-sm" href="/subscribe/tag/<%= params[:id] %>"><i class="fa fa-eye"></i> Follow <b><%= params[:id] %></b></a>
       <% end %>
     </div>
     <!-- AJAXify -->

app/views/tag/show.html.erb

@@ -46,9 +46,9 @@
     <a class="btn btn-sm" href="/feed/tag/<%= params[:id] %>.rss"><i class="fa fa-rss"></i> RSS</a>
     <% unless @wildcard %>
       <% if current_user.following(params[:id]) %>
-      <a rel="tooltip" title="Click to unfollow" class="btn btn-sm active" href="/unsubscribe/tag/<%= params[:id] %>"><i class="fa fa-eye-open"></i> Following <b><%= params[:id] %></b></a>
+      <a rel="tooltip" title="Click to unfollow" class="btn btn-sm active" href="/unsubscribe/tag/<%= params[:id] %>"><i class="fa fa-eye"></i> Following <b><%= params[:id] %></b></a>
       <% else %>
-      <a class="btn btn-sm" href="/subscribe/tag/<%= params[:id] %>"><i class="fa fa-eye-open"></i> Follow <b><%= params[:id] %></b></a>
+      <a class="btn btn-sm" href="/subscribe/tag/<%= params[:id] %>"><i class="fa fa-eye"></i> Follow <b><%= params[:id] %></b></a>
       <% end %>
       <a class="btn btn-sm" rel="popover" data-placement="bottom" data-html="true" data-title="Users following this tag" data-content="<% DrupalTag.followers(params[:id]).each do |user| %><i class='fa fa-star-o'></i> <a href='/profile/<%= user.username %>'><%= user.username %></a><br /><% end %><% if DrupalTag.follower_count(params[:id]) == 0 %><i>None</i><% end %>"><%= DrupalTag.follower_count(params[:id]) %> <i class="fa fa-user"></i> <span class="caret"></span></a>
     <% end %>

app/views/users/profile.html.erb

@@ -1,5 +1,10 @@
 <div class="col-md-3">
- <% if @user.user && @user.user.photo_file_name %><img class="img-rounded" id="profile-photo" style="width:100%;margin-bottom:10px;" src="<%= @user.user.photo_path(:thumb) %>" /><% end %>
+  <% if @user.user && @user.user.photo_file_name %>
+    <img class="hidden-xs hidden-sm img-rounded" id="profile-photo" style="width:100%;margin-bottom:10px;" src="<%= @user.user.photo_path(:thumb) %>" />
+    <div style="text-align:center;" class="visible-sm visible-xs">
+      <img class="img-circle" id="profile-photo" style="width:50%;margin-bottom:20px;" src="<%= @user.user.photo_path(:thumb) %>" />
+    </div>
+  <% end %>
 
   <!--<a href="#" class="btn btn-default btn-block"><i class="fa fa-envelope"></i> Send message</a>-->
   <a href="#" class="btn btn-default btn-block disabled"><i class="fa fa-eye"></i> Follow <%= @user.name %></a>
@@ -36,19 +41,21 @@
 
   <hr />
 
-  <% if @wikis && @wikis.length > 0 %>
-  <h4>Wiki pages recently contributed to</h4>
-  <ul class="nav bullet">
-    <% @wikis.each do |wiki| %>
-      <% unless (!@node.nil? && wiki.nid == @node.nid) %>
-        <li><a href="<%= wiki.path %>"><i class="fa fa-<%= wiki.icon %>"></i> <%= wiki.latest.title %></a> <small style="color:#888;">updated <%= time_ago_in_words(wiki.updated_at) %> ago by <a href="/profile/<%= wiki.latest.author.name %>"><%= wiki.latest.author.name %></a></small></li>
+  <div class="hidden-xs">
+    <% if @wikis && @wikis.length > 0 %>
+    <h4>Wiki pages recently contributed to</h4>
+    <ul class="nav bullet">
+      <% @wikis.each do |wiki| %>
+        <% unless (!@node.nil? && wiki.nid == @node.nid) %>
+          <li><a href="<%= wiki.path %>"><i class="fa fa-<%= wiki.icon %>"></i> <%= wiki.latest.title %></a> <small style="color:#888;">updated <%= time_ago_in_words(wiki.updated_at) %> ago by <a href="/profile/<%= wiki.latest.author.name %>"><%= wiki.latest.author.name %></a></small></li>
+        <% end %>
       <% end %>
+      <% if params[:controller] == "search" %>
+        <li><a href="/tag/<%= params[:id] %>">More...</a></li>
+      <% end %>
+    </ul>
     <% end %>
-    <% if params[:controller] == "search" %>
-      <li><a href="/tag/<%= params[:id] %>">More...</a></li>
-    <% end %>
-  </ul>
-  <% end %>
+  </div>
 
 
 </div>

app/views/wiki/show.html.erb

@@ -44,7 +44,7 @@
         <li><a href="<%= @node.edit_path %>?t=<%= Time.now.to_i %>"><i class="fa fa-pencil"></i><span class="hidden-xs hidden-sm"> Edit</span></a></li>
         <% if current_user && current_user.role == "admin" %><li><%= link_to "/wiki/delete/"+@node.id.to_s, :confirm => "Are you absolutely sure you want to delete '"+@node.path+"'? All revisions will be lost, and you cannot undo this action. If this is a spam page, be sure that it did not overwrite valid content before deleting the entire page." do %><i class="fa fa-trash"></i><span class="hidden-xs hidden-sm"> Delete</span><% end %></li><% end %>
         <li><a href="//pad.publiclab.org/p/<%= @node.slug[0,50] %>"><i class="fa fa-comments-o"></i><span class="hidden-xs hidden-sm"> Talk</span></a></li>
-        <li><a href="/wiki/revisions/<%= @node.slug %>"><i class="fa fa-list"></i><span class="hidden-xs hidden-sm hidden-md"> Revisions</span><span class="hidden-xs"> (<%= @node.revisions.length %>)</span></a></li>
+        <li><a href="/wiki/revisions/<%= @node.slug %>"><span class="hidden-xs"><%= @node.revisions.length %> </span><i class="fa fa-list"></i></a></li>
       </ul>
     </div>
   </div>