brighter_planet_layout-ruby19 0.2.48 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/Rakefile CHANGED
@@ -14,6 +14,7 @@ require 'rake'
14
14
  # gem.add_dependency 'ultraviolet', '>=0.10.2'
15
15
  # gem.add_dependency 'simple-rss', '>=1.2.3'
16
16
  # gem.files.reject! { |fn| fn.downcase =~ /\.ai$/ }
17
+ # gem.files.reject! { |fn| fn.downcase =~ /\.psd$/ }
17
18
  # end
18
19
  # Jeweler::GemcutterTasks.new
19
20
  # rescue LoadError
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.48
1
+ 0.3.0
@@ -22,7 +22,7 @@ module BrighterPlanetHelper
22
22
  end
23
23
 
24
24
  def brighter_planet_layout_cdn_url(path)
25
- if ::Rails.env.production?
25
+ if ::Rails.env.production? and not ::ENV['DISABLE_BRIGHTER_PLANET_LAYOUT_CDN'] == 'true'
26
26
  [ request.protocol, ::BrighterPlanetLayout::CDN, "/#{::BrighterPlanetLayout::VERSION}", path ].join
27
27
  else
28
28
  path
@@ -24,8 +24,9 @@
24
24
  <% if blog_post %>
25
25
  <div id="blog" class="<%= blog_post.author.downcase.dasherize %>">
26
26
  <p>
27
+ <span><%= blog_post.author %> posted</span>
27
28
  <%= link_to blog_post.title, blog_post.link %>
28
- <span>by <%= blog_post.author %> <%= time_ago_in_words blog_post.updated %> ago on <%= link_to 'Safety in Numbers', 'http://numbers.brighterplanet.com' %>, our blog</span>
29
+ <span><%= time_ago_in_words blog_post.updated %> ago on <%= link_to 'Safety in Numbers', 'http://numbers.brighterplanet.com' %>, our blog</span>
29
30
  </p>
30
31
  </div>
31
32
  <% else %>
@@ -15,27 +15,16 @@
15
15
  </div>
16
16
  <div id="map">
17
17
  <div id="slogan">
18
- <h1>Brighter Planet</h1>
19
- <p class="slogan">Carbon is everywhere</p>
20
- <p class="description">Enterprise-grade cloud technology for carbon intelligence.</p>
21
- <p class="description"><%= link_to_homesite 'About us', 'about' %></p>
22
- <p class="terms"><%= link_to_homesite 'Terms', 'terms' %></p>
23
- </div>
24
- <div id="middleware">
25
- <div class="main">
26
- <h3>Carbon Middleware</h3>
27
- <p>Real-time, scalable web services to enhance your business applications. <%= link_to_homesite 'Learn more', 'middleware' %></p>
28
- </div>
29
- <ul class="links">
30
- <li><%= link_to_homesite 'Information for executives', 'tour' %> Industry solutions and case studies</li>
31
- <li><%= link_to 'Information for developers', 'http://brighterplanet.github.com' %> Documentation, code samples, and libraries</li>
32
- </ul>
18
+ <h1>Brighter Planet™</h1>
19
+ <p class="slogan">Bringing carbon to life</p>
20
+ <p class="description">Easy, flexible on-demand carbon calculations in the cloud.</p>
21
+ <p class="description"><%= link_to_homesite 'About us', 'about' %> &middot; <%= link_to_homesite 'Terms', 'terms' %></p>
22
+ <p class="description">&copy;2010 Brighter Planet</p>
33
23
  </div>
34
24
  <div id="applications">
35
25
  <h3>Live applications</h3>
36
26
  <ul>
37
- <li class="cards"><%= link_to 'Visa credit and debit cards', 'http://giving.bankofamerica.com/brighterplanet?cm_mmc=DEP-Affinity-_-brighterplanet-PAR-_-DA05LT005Y_partnersite_BrighterPlanet_ABE_Productlink-_-MyExpression' %> with rewards powered by Carbon Middleware</li>
38
- <li class="profiler"><%= link_to_homesite 'Carbon footprint profiles', 'users/me/footprint' %> powered by Carbon Middleware technology</li>
27
+ <li class="cards"><%= link_to 'Visa® credit and debit cards', 'http://giving.bankofamerica.com/brighterplanet?cm_mmc=DEP-Affinity-_-brighterplanet-PAR-_-DA05LT005Y_partnersite_BrighterPlanet_ABE_Productlink-_-MyExpression' %> from Bank of America® with rewards powered by Brighter Planet</li>
39
28
  </ul>
40
29
  </div>
41
30
  <%= render :partial => 'layouts/elsewhere' %>
@@ -2,11 +2,11 @@
2
2
  <h1><span>Brighter Planet</span></h1>
3
3
  <ul>
4
4
  <li><%= link_to_homesite 'Home' %></li>
5
- <li><%= link_to_homesite 'About us', 'about' %></li>
6
- <li><%= link_to_homesite 'Tour', 'tour' %></li>
7
- <li><%= link_to 'Developers', 'http://brighterplanet.github.com' %></li>
8
- <li><%= link_to 'Blog', 'http://numbers.brighterplanet.com/' %></li>
5
+ <li><%= link_to_homesite 'About', 'about' %></li>
6
+ <li><%= link_to_homesite 'Services', 'services' %></li>
7
+ <li><%= link_to_homesite 'Research', 'research' %></li>
9
8
  </ul>
9
+ <p><%= link_to 'Developer site', 'http://brighterplanet.github.com' %> &middot; <%= link_to 'Blog', 'http://numbers.brighterplanet.com/' %></p>
10
10
  </div>
11
11
 
12
12
  <div id="title">
@@ -2,11 +2,11 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = %q{brighter_planet_layout-ruby19}
5
- s.version = "0.2.48"
5
+ s.version = "0.3.0"
6
6
 
7
7
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
8
8
  s.authors = ["Andy Rossmeissl", "Seamus Abshere"]
9
- s.date = %q{2010-12-10}
9
+ s.date = %q{2011-01-04}
10
10
  s.description = %q{Layouts, partials, stylesheets, and images}
11
11
  s.email = %q{andy@rossmeissl.net}
12
12
  s.extra_rdoc_files = [
@@ -73,6 +73,7 @@ Gem::Specification.new do |s|
73
73
  "public/stylesheets/images/cards.png",
74
74
  "public/stylesheets/images/derek.jpg",
75
75
  "public/stylesheets/images/gears.png",
76
+ "public/stylesheets/images/glow.png",
76
77
  "public/stylesheets/images/ian.jpg",
77
78
  "public/stylesheets/images/logo.png",
78
79
  "public/stylesheets/images/matt.jpg",
@@ -109,10 +109,10 @@ module BrighterPlanetLayout
109
109
  def self.update_s3
110
110
  # ENV['AWS_ACCESS_KEY_ID'] =
111
111
  # ENV['AWS_SECRET_ACCESS_KEY'] =
112
- # ENV['AWS_ACCESS_KEY_ID'] =
113
- # ENV['AWS_SECRET_ACCESS_KEY'] =
112
+ # ENV['SSL_CERT_DIR'] =
113
+ # ENV['S3SYNC_DIR'] =
114
114
  ::ENV['S3SYNC_NATIVE_CHARSET'] = 'UTF-8'
115
- cmd = "ruby #{ENV['S3SYNC_DIR']}/s3sync.rb --exclude=\"\\.ai\" -v -r --ssl --public-read #{public_path}/ #{S3_BUCKET}:#{VERSION}/"
115
+ cmd = "ruby #{ENV['S3SYNC_DIR']}/s3sync.rb --exclude=\"\\.ai\" --exclude=\"\\.psd\" -v -r --ssl --public-read #{public_path}/ #{S3_BUCKET}:#{VERSION}/"
116
116
  `#{cmd}`
117
117
  end
118
118
 
@@ -1,7 +1,16 @@
1
+ /* Fixed-width hints */
2
+ #header, #footer { max-width: 990px; }
3
+ #title { max-width: 975px; }
4
+ #content { max-width: 960px; }
5
+ #header, #title, #content, #footer {
6
+ margin: 0 auto;
7
+ }
8
+ /* end fixed-width hints */
9
+
1
10
  body {
2
11
  margin: 0;
3
12
  font-size: 13px;
4
- background: #111;
13
+ background: #ccc url(images/glow.png) repeat-y 50% 0;
5
14
  }
6
15
 
7
16
  body, input, select, button {
@@ -41,6 +50,7 @@ a img {
41
50
  }
42
51
 
43
52
  #header {
53
+ position: relative;
44
54
  background-image:
45
55
  -webkit-gradient(
46
56
  linear,
@@ -67,7 +77,7 @@ a img {
67
77
  float: left;
68
78
  width: 129px;
69
79
  margin: 13px;
70
- background: url(images/logo.png) no-repeat
80
+ background: url(images/logo.png) no-repeat;
71
81
  }
72
82
 
73
83
  #header h1 span {
@@ -111,6 +121,58 @@ a img {
111
121
  background: rgba(0,0,0,0.1);
112
122
  }
113
123
 
124
+ #header p {
125
+ position: absolute;
126
+ right: 15px;
127
+ top: 0;
128
+ width: 200px;
129
+ line-height: 58px;
130
+ color: #aaa;
131
+ text-align: right;
132
+ }
133
+
134
+ #header p a {
135
+ color: inherit;
136
+ font-size: 12px;
137
+ text-shadow: -1px -1px 0 black;
138
+ }
139
+
140
+ #header p a:hover {
141
+ color: silver;
142
+ }
143
+
144
+
145
+ /* full-width #header fixes */
146
+
147
+ #header {
148
+ max-width: none;
149
+ }
150
+
151
+ #header h1 {
152
+ display: none;
153
+ }
154
+
155
+ #header ul {
156
+ background: url(images/logo.png) no-repeat 10px 50%;
157
+ margin: 0 auto;
158
+ width: 825px;
159
+ padding: 0 0 0 165px;
160
+ }
161
+
162
+ #header ul li {
163
+ position: relative;
164
+ z-index: 10;
165
+ }
166
+
167
+ #header p {
168
+ left: 50%;
169
+ right: auto;
170
+ width: 485px;
171
+ padding: 0 10px 0 0;
172
+ }
173
+
174
+ /* end full-width #header fixed */
175
+
114
176
  #nav {
115
177
  background-image:
116
178
  -webkit-gradient(
@@ -185,7 +247,7 @@ a img {
185
247
  background-color: #5FBBFF;
186
248
  background-repeat: no-repeat;
187
249
  background-position: 20px 20%;
188
- padding: 20px 0 0 165px;
250
+ padding: 20px 0 0 15px;
189
251
  height: 70px;
190
252
  border-bottom: 1px solid #0070C4;
191
253
  -moz-box-shadow: inset 0 10px 10px rgba(0,0,0,0.1);
@@ -196,6 +258,7 @@ a img {
196
258
  #title h1, #title h2 {
197
259
  font-size: 18px;
198
260
  text-shadow: 1px 1px 0px rgba(255,255,255,0.5);
261
+ margin: 0 0 0 150px;
199
262
  }
200
263
 
201
264
  #title h1 a {
@@ -220,6 +283,7 @@ a img {
220
283
 
221
284
  #content {
222
285
  padding: 15px 15px 50px;
286
+ position: relative;
223
287
  }
224
288
 
225
289
  #content>p {
@@ -437,6 +501,10 @@ p.flash.error:before {
437
501
  color: #F16262;
438
502
  }
439
503
 
504
+ #footer {
505
+ background: #111;
506
+ }
507
+
440
508
  #footer #shortcuts {
441
509
  background-image:
442
510
  -webkit-gradient(
@@ -454,6 +522,7 @@ p.flash.error:before {
454
522
  );
455
523
  overflow: auto;
456
524
  font-size: 11px;
525
+ min-height: 15px;
457
526
  }
458
527
 
459
528
  #footer #shortcuts h3 {
@@ -464,16 +533,19 @@ p.flash.error:before {
464
533
  text-shadow: -1px -1px 0px black;
465
534
  padding: 1px 0 0;
466
535
  font-size: 12px;
536
+ display: none;
467
537
  }
468
538
 
469
539
  #footer #shortcuts h3:after {
470
540
  content: " →";
541
+ display: none;
471
542
  }
472
543
 
473
544
  #footer #shortcuts ul {
474
545
  list-style: none;
475
546
  overflow: auto;
476
547
  margin: 0 0 0 165px;
548
+ display: none;
477
549
  }
478
550
 
479
551
  #footer #shortcuts ul li {
@@ -516,8 +588,8 @@ p.flash.error:before {
516
588
  }
517
589
 
518
590
  #footer #map #slogan {
519
- margin: 25px 10px 0 13px;
520
- width: 147px;
591
+ margin: 25px 15px 0 13px;
592
+ width: 142px;
521
593
  float: left;
522
594
  }
523
595
 
@@ -541,21 +613,11 @@ p.flash.error:before {
541
613
  color: silver;
542
614
  }
543
615
 
544
- #footer #map #slogan p.terms a {
545
- font-size: 11px;
546
- color: gray;
547
- }
548
-
549
- #footer #map #middleware, #footer #map #applications {
550
- margin: 25px 30px 0 0;
616
+ #footer #map #applications {
551
617
  float: left;
552
618
  width: 225px;
553
619
  }
554
620
 
555
- #footer #map #middleware {
556
- font-size: 11px;
557
- }
558
-
559
621
  #footer #map h3 {
560
622
  color: silver;
561
623
  text-transform: uppercase;
@@ -563,55 +625,6 @@ p.flash.error:before {
563
625
  font-size: 11px;
564
626
  }
565
627
 
566
- #footer #map #middleware p {
567
- color: gray;
568
- }
569
-
570
- #footer #map #middleware p a {
571
- color: #999;
572
- }
573
-
574
- #footer #map #middleware ul.links {
575
- list-style: none;
576
- border-top: 1px solid #222;
577
- padding: 10px 0 0;
578
- }
579
-
580
- #footer #map #middleware ul.links li {
581
- margin: 0 0 7px;
582
- color: #444;
583
- }
584
-
585
- #footer #map #middleware ul.links li:before {
586
- content: "▶";
587
- display: block;
588
- float: left;
589
- width: 1em;
590
- background: #555;
591
- color: #222;
592
- padding: 0 0 1px 2px;
593
- line-height: 14px;
594
- margin: 0 5px 0 0;
595
- -moz-border-radius: 3px;
596
- -webkit-border-radius: 3px;
597
- border-radius: 3px;
598
- text-shadow: none;
599
- font-size: 13px;
600
- -moz-box-shadow: black 1px 1px 0;
601
- }
602
-
603
- #footer #map #middleware ul.links li a {
604
- color: gray;
605
- display: block;
606
- }
607
-
608
- #footer #map #middleware .main {
609
- padding: 0 0 10px 80px;
610
- background: url(images/gears.png) no-repeat;
611
- min-height: 47px;
612
- border-bottom: 1px solid black;
613
- }
614
-
615
628
  #footer #map #applications {
616
629
  margin: 25px 20px 0 0;
617
630
  }
@@ -652,19 +665,13 @@ p.flash.error:before {
652
665
  background: url(images/cards.png) no-repeat 50% 4px;
653
666
  }
654
667
 
655
- #footer #map #applications ul li.profiler {
656
- font-size: 11px;
657
- padding-left: 50px;
658
- background: url(images/meter.png) no-repeat 10px 60%;
659
- }
660
-
661
668
  #footer #map #applications ul li a {
662
669
  color: silver;
663
670
  }
664
671
 
665
672
  #footer #map #elsewhere {
666
673
  float: left;
667
- width: 300px;
674
+ width: 545px;
668
675
  margin: 25px 0 0;
669
676
  color: silver;
670
677
  }
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: brighter_planet_layout-ruby19
3
3
  version: !ruby/object:Gem::Version
4
- hash: 119
4
+ hash: 19
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
- - 2
9
- - 48
10
- version: 0.2.48
8
+ - 3
9
+ - 0
10
+ version: 0.3.0
11
11
  platform: ruby
12
12
  authors:
13
13
  - Andy Rossmeissl
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2010-12-10 00:00:00 -08:00
19
+ date: 2011-01-04 00:00:00 -06:00
20
20
  default_executable:
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
@@ -120,6 +120,7 @@ files:
120
120
  - public/stylesheets/images/cards.png
121
121
  - public/stylesheets/images/derek.jpg
122
122
  - public/stylesheets/images/gears.png
123
+ - public/stylesheets/images/glow.png
123
124
  - public/stylesheets/images/ian.jpg
124
125
  - public/stylesheets/images/logo.png
125
126
  - public/stylesheets/images/matt.jpg