Skip to content
Browse files

update logo on splash page

  • Loading branch information...
1 parent 6acd955 commit 180d6f1ace488c63ab356363074fd70df7595a09 @kevinwmerritt committed Feb 26, 2012
View
1 Gemfile
@@ -16,6 +16,7 @@ gem 'rails_admin_map_field', :git => 'git://github.com/jasonl/rails_admin_map_fi
# Presentation
gem 'jquery-rails'
+gem 'modernizr', '~> 2.5.3'
gem 'bootstrap-sass', '~> 2.0.1'
gem 'simple_form', '~> 2.0.0'
View
3 Gemfile.lock
@@ -165,6 +165,8 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
+ modernizr (2.5.3)
+ sprockets (~> 2.0)
multi_json (1.0.4)
multipart-post (1.1.5)
net-scp (1.0.4)
@@ -297,6 +299,7 @@ DEPENDENCIES
jquery-rails
koala
launchy (>= 0.4.0)
+ modernizr (~> 2.5.3)
omniauth (~> 1.0.0)
omniauth-facebook
paper_trail (~> 2.6.0)
View
BIN app/assets/images/latte.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 app/assets/javascripts/home.js.coffee → app/assets/javascripts/main.js.coffee
File renamed without changes.
View
4 app/assets/stylesheets/application.css.scss
@@ -14,6 +14,10 @@
*= require_tree .
*/
+$navbarBackground: #524137;
+//$navbarBackground: #524137;
+$navbarBackgroundHighlight: #7D6355;
+//$navbarBackgroundHighlight: #7D6355;
@import "bootstrap";
html, body {
View
15 app/assets/stylesheets/home.css.scss → app/assets/stylesheets/main.css.scss
@@ -13,20 +13,23 @@ body.splash {
#venue {
margin-top: 5%;
}
+
+ .brand {
+ padding: 6px 20px;
- #logo_img {
- margin-right: 4px;
- float: left;
+ img {
+ height: 24px;
+ width: 24px;
+ margin-right: 8px;
+ }
}
#logo {
display: block;
font-family: Vollkorn, serif;
font-weight: 400;
- letter-spacing: 0em;
- line-height: 1em;
color: #ff5555;
- font-size: 30px;
+ font-size: 24px;
text-shadow:0px 0px 0 rgb(210,40,40), 1px 0px 0 rgb(165,5,5),2px 0px 1px rgba(0,0,0,0.45),2px 0px 1px rgba(0,0,0,0.5),0px 0px 1px rgba(0,0,0,.2);
}
View
2 app/controllers/home_controller.rb → app/controllers/main_controller.rb
@@ -1,4 +1,4 @@
-class HomeController < ApplicationController
+class MainController < ApplicationController
def index
@venuephotos = VenuePhoto.order('created_at DESC')
end
View
15 app/views/layouts/noheader.html.erb
@@ -10,12 +10,12 @@
<!-- Use the .htaccess and remove these lines to avoid edge case issues.
More info: h5bp.com/i/378 -->
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
<meta name="description" content="">
<!-- Mobile viewport optimized: h5bp.com/viewport -->
- <meta name="viewport" content="width=device-width">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
<%= yield :head %>
@@ -25,6 +25,7 @@
<!-- All JavaScript at the bottom, except this Modernizr build. Modernizr enables HTML5 elements & feature detects;
for optimal performance, create your own custom Modernizr build: www.modernizr.com/download/ -->
+ <%= javascript_include_tag 'modernizr' %>
<%= yield :head_js %>
@@ -35,19 +36,9 @@
<!-- Prompt IE 6 users to install Chrome Frame. Remove this if you support IE 6.
chromium.org/developers/how-tos/chrome-frame-getting-started -->
<!--[if lt IE 7]><p class=chromeframe>Your browser is <em>ancient!</em> <a href="http://browsehappy.com/">Upgrade to a different browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to experience this site.</p><![endif]-->
- <div class="container">
- <header id="title" >
- </header>
-
- <%= render 'shared/messages' %>
<%= yield %>
- <footer class="footer">
- </footer>
-
- </div>
-
<!-- JavaScript at the bottom for fast page loading -->
<!-- scripts concatenated and minified via build script -->
View
0 app/views/home/index.html.erb → app/views/main/index.html.erb
File renamed without changes.
View
33 app/views/home/splash.html.erb → app/views/main/splash.html.erb
@@ -1,7 +1,33 @@
<% content_for :head do %>
<title>Splash page</title>
<% end %>
- <section>
+ <div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="brand" href="/"><%= image_tag "latte.png", :id => 'logoimg' %><span id="logo" class="pull-right">roastly</span></a>
+ <div class="nav-collapse">
+ <ul class="nav">
+ </ul>
+ <ul class="nav pull-right">
+ <li class="">
+ <form class="navbar-search pull-left">
+ <input type="text" class="search-query" placeholder="Search">
+ </form>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="container">
+
+ <header id="title" >
+ </header>
+
+ <%= render 'shared/messages' %>
+
+ <section id="splashpage">
<div class="row" id="venue">
<div class="span-one-third">
<img src="http://distilleryimage0.instagram.com/df39b1e8452911e1a87612313804ec91_6.jpg">
@@ -31,3 +57,8 @@
</div>
</div>
</section>
+
+ <footer class="footer">
+ </footer>
+
+ </div>
View
1 app/views/shared/_head.html.erb
@@ -25,6 +25,7 @@
<!-- All JavaScript at the bottom, except this Modernizr build. Modernizr enables HTML5 elements & feature detects;
for optimal performance, create your own custom Modernizr build: www.modernizr.com/download/ -->
+ <%= javascript_include_tag 'modernizr' %>
<%= yield :head_js %>
View
2 config/environments/production.rb
@@ -46,7 +46,7 @@
# config.action_controller.asset_host = "http://assets.example.com"
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
- config.assets.precompile += %w( rails_admin/rails_admin.js rails_admin/rails_admin.css )
+ config.assets.precompile += %w( modernizer.js rails_admin/rails_admin.js rails_admin/rails_admin.css )
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
View
5 config/routes.rb
@@ -1,9 +1,9 @@
CoffeeApp::Application.routes.draw do
mount RailsAdmin::Engine => '/admin', :as => 'rails_admin'
- root :to => 'home#index'
+ root :to => 'main#index'
- match '/splash' => 'home#splash'
+ match '/splash' => 'main#splash'
# Configure devise for omniauth
devise_for :users, :path => 'account', :controllers => { :omniauth_callbacks => 'users/omniauth_callbacks' }, :skip => [:sessions]
@@ -29,7 +29,6 @@
resources :venues do
resources :venue_photos
end
- resources :venue_photos
# The priority is based upon order of creation:
# first created -> highest priority.

0 comments on commit 180d6f1

Please sign in to comment.
Something went wrong with that request. Please try again.