# HG changeset patch
# User Chris Ridgway <ckridgway@gmail.com>
# Date 1322271060 21600
# Node ID a6f150d0ab9d5b3fd3c88f46a7bee71bcd84968e
# Parent  548b9e61bd64521a42f71b0718c38d6b91664cb7# Parent  ee3ab2585dc00d74e0e20ccd41d330ad80f6d978
Merged with r78.

diff -r 548b9e61bd64 -r a6f150d0ab9d bns_website/static/css/base.css
--- a/bns_website/static/css/base.css	Fri Nov 25 16:54:59 2011 -0600
+++ b/bns_website/static/css/base.css	Fri Nov 25 19:31:00 2011 -0600
@@ -23,7 +23,15 @@
    background-color: #e2f1f8;
 }
 .footer {
-   background-color: #1f8392;
+   background-color: #00aab4;
+   background-image: -khtml-gradient(linear, left top, left bottom, from(#00aab4), to(#1f6c80));
+   background-image: -moz-linear-gradient(top, #00aab4, #1f6c80);
+   background-image: -ms-linear-gradient(top, #00aab4, #1f6c80);
+   background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #00aab4), color-stop(100%, #1f6c80));
+   background-image: -webkit-linear-gradient(top, #00aab4, #1f6c80);
+   background-image: -o-linear-gradient(top, #00aab4, #1f6c80);
+   background-image: linear-gradient(top, #00aab4, #1f6c80);
+   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00aab4', endColorstr='#1f6c80', GradientType=0);
 }
 .footer a {
    color: #e4d4a1;
@@ -37,25 +45,25 @@
 }
 
 .topbar-inner, .topbar .fill {
-  background-color: #00aab4;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#1f6c80), to(#00aab4));
-  background-image: -moz-linear-gradient(top, #1f6c80, #00aab4);
-  background-image: -ms-linear-gradient(top, #1f6c80, #00aab4);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #1f6c80), color-stop(100%, #00aab4));
-  background-image: -webkit-linear-gradient(top, #1f6c80, #00aab4);
-  background-image: -o-linear-gradient(top, #1f6c80, #00aab4);
-  background-image: linear-gradient(top, #1f6c80, #00aab4);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1f6c80', endColorstr='#00aab4', GradientType=0);
+   background-color: #00aab4;
+   background-image: -khtml-gradient(linear, left top, left bottom, from(#1f6c80), to(#00aab4));
+   background-image: -moz-linear-gradient(top, #1f6c80, #00aab4);
+   background-image: -ms-linear-gradient(top, #1f6c80, #00aab4);
+   background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #1f6c80), color-stop(100%, #00aab4));
+   background-image: -webkit-linear-gradient(top, #1f6c80, #00aab4);
+   background-image: -o-linear-gradient(top, #1f6c80, #00aab4);
+   background-image: linear-gradient(top, #1f6c80, #00aab4);
+   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1f6c80', endColorstr='#00aab4', GradientType=0);
 }
 
 .topbar h3 a:hover, .topbar .brand:hover, .topbar ul .active > a {
-  background-color: #00aab4;
-  background-color: rgba(0, 170, 180, 0.05);
+   background-color: #00aab4;
+   background-color: rgba(0, 170, 180, 0.05);
 }
 
 .topbar div > ul .active > a, .nav .active > a {
-  background-color: #00aab4;
-  background-color: rgba(0, 170, 180, 0.05);
+   background-color: #00aab4;
+   background-color: rgba(0, 170, 180, 0.05);
 }
 
 /*