Commit b03ea417

mo k <mo@mokhan.ca>
2012-06-04 12:35:14
fix header issue for mobile devices. need to test on ipad.
master
1 parent ef1e2ae
Changed files (3)
app
assets
stylesheets
custom.css.scss
views
shared
_creation_image_gallery.html.erb
_header.html.erb
app/assets/stylesheets/custom.css.scss
@@ -1,4 +1,5 @@
 @import "bootstrap";
+@import "bootstrap-responsive";
 .fright{float:right;}
 .hidden{display:none;}
app/views/shared/_creation_image_gallery.html.erb
@@ -5,7 +5,7 @@
       <div class="caption">
         <h5><a href="<%= url_for creation %>"><%= short_name(creation, 20) %></a></h5>
         <h6><a href="<%= url_for profile_path(creation.user) %>"><%= creation.user.name %></a></h6>
-        <a href="<%= url_for creation %>"><img src="<%= creation.image.thumb.url %>" alt="<%= creation.name %>" /></a>
+        <a href="<%= url_for creation %>"><img src="<%= creation.image.thumb.url %>" alt="<%= creation.name %>" width="260" /></a>
         <p>
         <% if creation.favorites.count > 0 %>
           <a href="<%= url_for creation_favorites_path(:creation_id => creation.id) %>"><%= creation.favorites.count %><i class="icon-heart"></i></a>
app/views/shared/_header.html.erb
@@ -6,7 +6,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </a>
-      <a class="brand" style="color:hotpink;" href="/">CakeSide</a>
+      <a class="brand" style="color:hotpink;" href="/">Cake<em>Side</em></a>
       <div class="nav-collapse">
         <ul class="nav">
           <li><a href="/">Home</a></li>
@@ -27,14 +27,14 @@
           </ul>
           </li>
         </ul>
+        <%= form_tag(search_index_path, :method => "get", :name => "search", :class => "navbar-search pull-left") do %>
+          <input name="q" type="text" class="search-query" placeholder="Search" />
+          <%# <input type="submit" value="search" />%>
+        <% end %>
       </div><!--/ .nav-collapse -->
-      <%= form_tag(search_index_path, :method => "get", :name => "search", :class => "navbar-search pull-left") do %>
-        <input name="q" type="text" class="search-query" placeholder="Search" />
-        <%# <input type="submit" value="search" />%>
-      <% end %>
       <ul class="nav pull-right">
-        <li><%= link_to "Add Creation", new_creation_path, :style => "color:#48ce62;" %></li>
-        <li class="divider-vertical"></li>
+        <li class="hidden-phone"><%= link_to "Add Creation", new_creation_path, :style => "color:#48ce62;" %></li>
+        <li class="divider-vertical hidden-phone"></li>
         <% if user_signed_in? %>
           <li class="dropdown">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">