Merge remote-tracking branch 'refs/remotes/origin/533-new-dropdown'

Conflicts:
	mediagoblin/templates/mediagoblin/base.html
	mediagoblin/templates/mediagoblin/root.html

mediagoblin/static/css/base.css

@@ -113,10 +113,12 @@ input, textarea {
 
 header {
   width: 100%;
+  max-width: 940px;
+  margin-left: auto;
+  margin-right: auto;
   padding: 0;
   margin-bottom: 42px;
-  background-color: #303030;
-  border-bottom: 1px solid #252525;
+  border-bottom: 1px solid #333;
 }
 
 .header_right {
@@ -125,19 +127,18 @@ header {
   float: right;
 }
 
-.header_right ul {
-	display: none;
-	position: absolute;
-	top: 42px;
-	right: 0px;
-	background: #252525;
-	padding: 20px;
+.header_dropdown {
+  margin-bottom: 20px;
 }
 
-.header_right li {
+.header_dropdown li {
   list-style: none;
 }
 
+.dropdown_title {
+  font-size: 20px;
+}
+
 a.logo {
   color: #fff;
   font-weight: bold;
@@ -145,7 +146,7 @@ a.logo {
 
 .logo img {
   vertical-align: middle;
-  margin: 6px 8px;
+  margin: 6px 8px 6px 0;
 }
 
 .mediagoblin_content {

mediagoblin/static/js/header_dropdown.js

@@ -0,0 +1,27 @@
+/**
+ * GNU MediaGoblin -- federated, autonomous media hosting
+ * Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+$(document).ready(function(){
+  $(".header_dropdown").hide();
+  $(".header_dropdown_up").hide();
+  $(".header_dropdown_down,.header_dropdown_up").click(function() {
+    $(".header_dropdown_down").toggle();
+    $(".header_dropdown_up").toggle();
+    $(".header_dropdown").slideToggle();
+  });
+});