[opw-web] Convert site from OPW website to Outreachy website

[Owen Taylor <otaylor src gnome org>]

commit 903c28b11e13950a921592ce1f01f0dbd771fb21
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Mon Mar 2 14:27:20 2015 -0500

    Convert site from OPW website to Outreachy website
    
    Substitute logo, and make minimal style changes to look good with the
    new logo. Change stray bits of "Outreach Program for Women" text.
    Update README and DOAP files.

 README.md                               |    4 ++--
 lang/en-gb.php                          |    4 ++--
 opw-web.doap                            |   15 +++++++--------
 skins/easterngreen/css/bootstrap.css    |    1 -
 skins/easterngreen/css/main.css         |   22 +++++++++++++---------
 skins/easterngreen/html/tpl_header.html |    5 ++---
 6 files changed, 26 insertions(+), 25 deletions(-)
---
diff --git a/README.md b/README.md
index 818f643..d987715 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-GNOME Outreach Program for Women website
-========================================
+Outreachy website
+=================
 
 
 ## License
diff --git a/lang/en-gb.php b/lang/en-gb.php
index 7053c05..2277f7b 100644
--- a/lang/en-gb.php
+++ b/lang/en-gb.php
@@ -12,8 +12,8 @@ $lang_data = array(
     'html_direction'        => 'ltr',
 
     /* Site */
-    'site_title'            => "Outreach Program For Women - Free and Open Source Software internships for 
women (cis and trans) and genderqueer",
-    'site_desc'             => "The Outreach Program for Women (OPW) helps women (cis and trans) and 
genderqueer get involved in free and open source software. We provide a supportive community for beginning to 
contribute any time throughout the year and offer focused internship opportunities twice a year with a number 
of free software organizations.",
+    'site_title'            => "Outreachy - Free and Open Source Software internships for women (cis and 
trans), trans men, and genderqueer people",
+    'site_desc'             => "Outreachy helps women (cis and trans), trans men, and genderqueer people get 
involved in free and open source software. We provide a supportive community for beginning to contribute any 
time throughout the year and offer focused internship opportunities twice a year with a number of free 
software organizations.",
 
     'csrf_not_logged_in'    => 'Please hit back, log in, and try again.',
     'csrf_mismatch'         => 'Please hit back, reload the page, and try again.',
diff --git a/opw-web.doap b/opw-web.doap
index 9912caa..c973219 100644
--- a/opw-web.doap
+++ b/opw-web.doap
@@ -5,21 +5,20 @@
          xmlns="http://usefulinc.com/ns/doap#";>
 
   <name xml:lang="en">opw-web</name>
-  <shortdesc xml:lang="en">Outreach Program for Women website</shortdesc>
+  <shortdesc xml:lang="en">Outreachy website</shortdesc>
   <category rdf:resource="http://api.gnome.org/doap-extensions#infrastructure"; />
-  <description>The following repository hosts the Outreach Program for Women's website.
+  <description>The following repository hosts Outreachy's website.
     Access to the repository is restricted to the GNOME Sysadmin and Websites team.
   </description>
-  <homepage rdf:resource="https://opw.gnome.org/"; />
-  <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/opw-list"; />
+  <homepage rdf:resource="https://outreachy.gnome.org/"; />
+  <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/outreachy-list"; />
   <bug-database 
rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=website&amp;component=opw.gnome.org"; />
 
   <maintainer>
     <foaf:Person>
-      <foaf:name>Behnam Esfahbod</foaf:name>
-      <foaf:mbox rdf:resource="mailto:behnam gnome org" />
-      <foaf:openid rdf:resource="http://behnam.es/"; />
-      <gnome:userid>behnam</gnome:userid>
+      <foaf:name>Owen Taylor</foaf:name>
+      <foaf:mbox rdf:resource="mailto:otaylor fishsoup net" />
+      <gnome:userid>otaylor</gnome:userid>
     </foaf:Person>
   </maintainer>
 </Project>
diff --git a/skins/easterngreen/css/bootstrap.css b/skins/easterngreen/css/bootstrap.css
index d6fac1b..dc61f97 100644
--- a/skins/easterngreen/css/bootstrap.css
+++ b/skins/easterngreen/css/bootstrap.css
@@ -6143,7 +6143,6 @@ a.badge:focus {
   font-weight: 200;
   line-height: 30px;
   color: inherit;
-  background-color: #eeeeee;
   -webkit-border-radius: 6px;
      -moz-border-radius: 6px;
           border-radius: 6px;
diff --git a/skins/easterngreen/css/main.css b/skins/easterngreen/css/main.css
index 34ba1b2..a54834e 100644
--- a/skins/easterngreen/css/main.css
+++ b/skins/easterngreen/css/main.css
@@ -38,7 +38,7 @@ a {
 
 a, .logo:hover {
     text-decoration: none;
-    color: #20b2aa;
+    color: #347a87;
 }
 
 .logo:hover {
@@ -47,7 +47,7 @@ a, .logo:hover {
 
 a:hover {
     text-decoration: underline;
-    color: #20a2aa;
+    color: #347a87;
     background-color: none;
 }
 
@@ -56,7 +56,7 @@ h1 {
 }
 
 h2 {
-    color: #20b2aa;
+    color: #347a87;
     font-weight: bold;
     font-size: 1.5em;
     padding: 30px 0 10px 0;
@@ -101,7 +101,7 @@ h3 {
 
 .nav {
     margin: 0 auto;
-    padding: 30px 10px 10px 0px;
+    padding: 22px 10px 10px 0px;
     color: white;
 }
 
@@ -123,19 +123,23 @@ h3 {
 .navbar .navbar-static-top,
 .navbar .navbar-inner,
 .navbar .container {
-    background-color: #20b2aa;
+    background-color: #d1d8cd;
     background-image: none;
 }
 
 .navbar .nav > li > a {
-    color: white;
+    color: black;
     text-shadow: 0 0 0;
 }
 
 .navbar .nav > li > a:hover {
     text-decoration: underline;
     color: white;
-    background-color: #20b2aa;
+    background-color: #59cfe6;
+}
+
+.navbar .nav > li > a {
+    border-radius: 5px;
 }
 
 .navbar .btn-navbar {
@@ -165,7 +169,7 @@ h3 {
     font-size: 1.5em;
     text-shadow: 0 0 0;
     display: inline-block;
-    padding: 30px 30px 20px 30px;
+    padding: 19px 30px 15px 30px;
 }
 
 .visibility-note {
@@ -177,7 +181,7 @@ h3 {
 
 .learn-more {
     float: right;
-    color: #20b2aa;
+    color: #347a87;
     padding-top: 20px;
 }
 
diff --git a/skins/easterngreen/html/tpl_header.html b/skins/easterngreen/html/tpl_header.html
index 673065b..4bd9ed0 100644
--- a/skins/easterngreen/html/tpl_header.html
+++ b/skins/easterngreen/html/tpl_header.html
@@ -21,7 +21,7 @@ ocalization variable
     <meta name="description" content="[[site_desc]]" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <link rel="shortcut icon" href="[[skin_path]]/css/img/opw-logo.png" />
+    <link rel="shortcut icon" href="[[skin_path]]/css/img/outreachy-favicon.png"  />
     <link rel="stylesheet" type="text/css" media="screen, projection" href="[[skin_path]]/css/reset.css" />
     <link rel="stylesheet" type="text/css" media="screen, projection" href="[[skin_path]]/css/bootstrap.css" 
/>
     <link rel="stylesheet" type="text/css" media="screen, projection" href="[[skin_path]]/css/gnome.css" />
@@ -50,8 +50,7 @@ ocalization variable
                 </a>
 
                 <a class="brand" href="[[nav_home]]">
-                    <img src="[[skin_path]]/css/img/opw-logo.png" width="24" height="24" class="icon" alt="" 
/>
-                    {{site_name}}
+                    <img src="[[skin_path]]/css/img/outreachy-logo.png" width="218" height="44" class="icon" 
alt="" />
                 </a>
 
                 <div class="nav-collapse">