Merge branch 'development'

unepwcmc · May 4, 2012 · d0cfce2 · d0cfce2
2 parents 564609c + c629fc3
commit d0cfce2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -141,8 +141,9 @@ body {
 
   h2 {
     font-size: 16px;
-    color: #CCC;
+    color: #888;
     line-height: 20px;
+    margin-bottom:2px;
   }
 
   .control-row {

diff --git a/app/views/layers/index.html.erb b/app/views/layers/index.html.erb
@@ -25,6 +25,8 @@
     </div>
 
     <div class='control-row'>
+      <%= image_tag 'layer_legend.png'%>
+      <br/>
       <div class="btn-group layer-switcher " data-toggle="buttons-radio">
         <button class="use-satellite btn show-tooltip btn-info active" title="Use satellite base layer">Satellite</button>
         <button class="use-hybrid btn show-tooltip" title="Use hybrid base layer">Hybrid</button>