brighter_planet_layout 0.3.0 → 0.3.1

data/Rakefile

@@ -10,7 +10,9 @@ begin
     gem.email = "andy@rossmeissl.net"
     gem.homepage = "http://github.com/brighterplanet/brighter_planet_layout"
     gem.authors = ["Andy Rossmeissl", "Seamus Abshere"]
-    gem.add_dependency 'ultraviolet', '>=0.10.2'
+    # doesn't work in ruby 1.9; use spox-ultraviolet
+    # each app is going to have to require this separately
+    # gem.add_dependency 'ultraviolet', '>=0.10.2'
     gem.add_dependency 'simple-rss', '>=1.2.3'
     gem.files.reject! { |fn| fn.downcase =~ /\.ai$/ }
     gem.files.reject! { |fn| fn.downcase =~ /\.psd$/ }

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/app/views/layouts/_footer.html.erb

@@ -19,7 +19,7 @@
       <p class="slogan">Bringing carbon to life</p>
       <p class="description">Easy, flexible on-demand carbon calculations in the cloud.</p>
       <p class="description"><%= link_to_homesite 'About us', 'about' %> &middot; <%= link_to_homesite 'Terms', 'terms' %></p>
-      <p class="description">&copy;2010 Brighter Planet</p>
+      <p class="description">&copy;2011 Brighter Planet</p>
     </div>
     <div id="applications">
       <h3>Live applications</h3>

data/app/views/layouts/_header.html.erb

@@ -1,10 +1,11 @@
 <div id="header">
   <h1><span>Brighter Planet</span></h1>
   <ul>
-    <li><%= link_to_homesite 'Home' %></li>
+    <li class="home"><%= link_to_homesite 'Home' %></li>
     <li><%= link_to_homesite 'About', 'about' %></li>
     <li><%= link_to_homesite 'Services', 'services' %></li>
     <li><%= link_to_homesite 'Research', 'research' %></li>
+    <li><%= link_to_homesite 'Demos', 'demos' %></li>
   </ul>
   <p><%= link_to 'Developer site', 'http://brighterplanet.github.com' %> &middot; <%= link_to 'Blog', 'http://numbers.brighterplanet.com/' %></p>
 </div>

data/app/views/layouts/brighter_planet.html.erb

@@ -29,7 +29,7 @@
   <%= render_or_nothing :partial => 'layouts/head' %>
   <%= yield :head %>
 </head>
-<body<%= " class=\"#{ @bodyclass }\"".html_safe if @bodyclass %>>
+<body<%= " class=\"#{ @bodyclass }\"".html_safe if @bodyclass %><%= " id=\"#{ @bodyid }\"".html_safe if @bodyid %>>
 
 <%= render :partial => 'layouts/google_analytics' %>
 

data/brighter_planet_layout.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{brighter_planet_layout}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Rossmeissl", "Seamus Abshere"]
-  s.date = %q{2011-01-04}
+  s.date = %q{2011-01-10}
   s.description = %q{Layouts, partials, stylesheets, and images}
   s.email = %q{andy@rossmeissl.net}
   s.extra_rdoc_files = [
@@ -105,14 +105,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ultraviolet>, [">= 0.10.2"])
       s.add_runtime_dependency(%q<simple-rss>, [">= 1.2.3"])
     else
-      s.add_dependency(%q<ultraviolet>, [">= 0.10.2"])
       s.add_dependency(%q<simple-rss>, [">= 1.2.3"])
     end
   else
-    s.add_dependency(%q<ultraviolet>, [">= 0.10.2"])
     s.add_dependency(%q<simple-rss>, [">= 1.2.3"])
   end
 end

data/lib/brighter_planet_layout.rb

@@ -109,10 +109,10 @@ module BrighterPlanetLayout
   def self.update_s3
     # ENV['AWS_ACCESS_KEY_ID'] = 
     # ENV['AWS_SECRET_ACCESS_KEY'] = 
-    # ENV['AWS_ACCESS_KEY_ID'] = 
-    # ENV['AWS_SECRET_ACCESS_KEY'] = 
+    # ENV['SSL_CERT_DIR'] = 
+    # ENV['S3SYNC_DIR'] = 
     ::ENV['S3SYNC_NATIVE_CHARSET'] = 'UTF-8'
-    cmd = "ruby #{ENV['S3SYNC_DIR']}/s3sync.rb --exclude=\"\\.ai\" -v -r --ssl --public-read #{public_path}/ #{S3_BUCKET}:#{VERSION}/"
+    cmd = "ruby #{ENV['S3SYNC_DIR']}/s3sync.rb --exclude=\"\\.ai\" --exclude=\"\\.psd\" -v -r --ssl --public-read #{public_path}/ #{S3_BUCKET}:#{VERSION}/"
     `#{cmd}`
   end
   

data/public/stylesheets/brighter_planet.css

@@ -73,14 +73,6 @@ a img {
 }
 
 #header h1 {
-  height: 34px;
-  float: left;
-  width: 129px;
-  margin: 13px;
-  background: url(images/logo.png) no-repeat;
-}
-
-#header h1 span {
   display: none;
 }
 
@@ -96,6 +88,10 @@ a img {
   width: 120px;
 }
 
+#header ul li.home {
+  width: 164px;
+}
+
 #header ul li a {
   border-left: 1px solid #555;
   display: block;
@@ -109,6 +105,12 @@ a img {
   padding: 23.5px 0;
 }
 
+#header ul li.home a {
+  background: url(images/logo.png) no-repeat 13px 50%;
+  text-indent: -150px;
+  text-align: left;
+}
+
 #header li:last-child {
   border-right: 1px solid #555;
 }
@@ -118,7 +120,7 @@ a img {
 }
 
 #header ul li a:hover {
-  background: rgba(0,0,0,0.1);
+  background-color: rgba(0,0,0,0.1);
 }
 
 #header p {
@@ -148,15 +150,9 @@ a img {
   max-width: none;
 }
 
-#header h1 {
-  display: none;
-}
-
 #header ul {
-  background: url(images/logo.png) no-repeat 10px 50%;
   margin: 0 auto;
-  width: 825px;
-  padding: 0 0 0 165px;
+  width: 994px;
 }
 
 #header ul li {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brighter_planet_layout
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -16,29 +16,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 -06:00
+date: 2011-01-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ultraviolet
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 10
-        - 2
-        version: 0.10.2
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: simple-rss
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -50,7 +34,7 @@ dependencies:
         - 3
         version: 1.2.3
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 description: Layouts, partials, stylesheets, and images
 email: andy@rossmeissl.net
 executables: []