Skip to content

Commit

Permalink
Logo and style changes
Browse files Browse the repository at this point in the history
  • Loading branch information
cearto committed Feb 4, 2015
1 parent 3c77c89 commit c274c9c
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 12 deletions.
Binary file added app/assets/images/logo-DE.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/logo2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 10 additions & 1 deletion app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@
*= require_self
*/
a {
color: #6CC06D;
text-decoration: none;
}

#logo{
width: inherit;
height: 100%;
}

.tag-list > span{
margin-bottom: 5px;
Expand Down Expand Up @@ -139,7 +148,7 @@ img{

.thumbnail{
padding: 0px;
min-height: 360px;
min-height: 250px;
}
.thumbnail img{
width: 100%;
Expand Down
22 changes: 12 additions & 10 deletions app/views/layouts/_deheader.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,18 @@
<div class="jumbotron">
<div class="container">
<div class="row">
<div class="col-md-8">
<h1 class="header-font">TheDesignExchange</h1>
<p class="subtitle">where designers and researchers share methods and best practices</p>
</br>
<p>Search</p>
<form id="search" role="search">
<input type="text" class="form-search" placeholder="Search">
<button type="submit" class="btn btn-default" onclick="window.location.href = '<%= search_design_methods_path %>/'+ $('form input.form-search').val();">Submit</button>
</form>
</div>
<div class="col-md-8">
<h1 class="header-font">
<%= image_tag "logo2.png"%>
</h1>
<p class="subtitle">where designers and researchers share methods and best practices</p>
</br>
<p>Search</p>
<form id="search" role="search">
<input type="text" class="form-search" placeholder="Search">
<button type="submit" class="btn btn-default" onclick="window.location.href = '<%= search_design_methods_path %>/'+ $('form input.form-search').val();">Submit</button>
</form>
</div>

<% if !user_signed_in? %>
<div class="col-md-4"><p>Sign In</p>
Expand Down
4 changes: 3 additions & 1 deletion app/views/layouts/_headernav.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="<%= root_path %>"><b>TheDesignExchange</b></a>
<a class="navbar-brand" href="<%= root_path %>">
<%= image_tag "logo-DE.png", :width => "100", :id => "logo" %>
</a>
</div>
<form id="search" class="navbar-form navbar-left" role="search">
<div class="form-group">
Expand Down
Binary file added public/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c274c9c

Please sign in to comment.