Merge branch 'master' of gitlab.oit.duke.edu:colab/appstore

ea753f78 · jz143 · 61ffc3df · 1492dddf · ea753f78 · ea753f78
Commit ea753f78 authored Nov 24, 2015 by jz143
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

Gemfile.lock Gemfile.lock +0 -3

application.scss app/assets/stylesheets/application.scss +5 -0

application.html.erb app/views/layouts/application.html.erb +1 -1

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -231,6 +231,3 @@ DEPENDENCIES
  turbolinks
  uglifier (>= 1.3.0)
  web-console (~> 2.0)
-
-BUNDLED WITH
-   1.10.6
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -35,6 +35,11 @@ body {
    margin-bottom: 0;
    line-height: 40px;
  }
+  .brand{
+	  img{
+		  margin-left: -7px;
+	  }
+  }
 }

 h1 {

--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -28,7 +28,7 @@
    </ul>
    <div class="brand">
      <%= link_to root_path do %>
-	  	  <%= image_tag 'appstore-logo.png', :size => "428x124" %>
+	  	  <%= image_tag 'appstore-logo.png', :size => "428x124", :class => 'img-responsive' %>
      <% end %>
    </div>
  </div>