diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-01-17 11:47:29 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-01-17 11:47:29 -0600 |
| commit | d1d535602cce3d93c5ee32f034d361ef99610cc1 (patch) | |
| tree | 655c83c873d6d788820747ec159340a66e2f0b09 /mediagoblin/static/css | |
| parent | 30af7ce6ad322938d814a80a296846c63fdd2b25 (diff) | |
| parent | 10d241976447ab87dfebfebf9679a796400f6445 (diff) | |
| download | mediagoblin-d1d535602cce3d93c5ee32f034d361ef99610cc1.tar.lz mediagoblin-d1d535602cce3d93c5ee32f034d361ef99610cc1.tar.xz mediagoblin-d1d535602cce3d93c5ee32f034d361ef99610cc1.zip | |
Merge remote-tracking branch 'refs/remotes/origin/533-new-dropdown'
Conflicts:
mediagoblin/templates/mediagoblin/base.html
mediagoblin/templates/mediagoblin/root.html
Diffstat (limited to 'mediagoblin/static/css')
| -rw-r--r-- | mediagoblin/static/css/base.css | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 81a90615..04b4ee28 100644 --- a/mediagoblin/static/css/base.css +++ b/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 { |