diff options
| author | Chris Moylan <chris@chrismoylan.com> | 2011-06-23 21:55:22 -0500 |
|---|---|---|
| committer | Chris Moylan <chris@chrismoylan.com> | 2011-06-23 21:55:22 -0500 |
| commit | b6ae3aa61627be10cf6c0c85e8d04a10f994e7b7 (patch) | |
| tree | ba3f09bbf0cfd8994d34310da52795c6598b14cb /mediagoblin/static | |
| parent | dcebe4b032453b31db93e0796c84de7dc8bdb005 (diff) | |
| parent | c397b962de5de83aa1726f563fbb70d6927fc91b (diff) | |
| download | mediagoblin-b6ae3aa61627be10cf6c0c85e8d04a10f994e7b7.tar.lz mediagoblin-b6ae3aa61627be10cf6c0c85e8d04a10f994e7b7.tar.xz mediagoblin-b6ae3aa61627be10cf6c0c85e8d04a10f994e7b7.zip | |
Merge branch 'master' into test_submission_views_365
Diffstat (limited to 'mediagoblin/static')
| -rw-r--r-- | mediagoblin/static/css/base.css | 21 | ||||
| l--------- | mediagoblin/static/css/contrib/960_12_col.css | 1 |
2 files changed, 7 insertions, 15 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 1d04fc73..9c9bcea3 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -59,12 +59,6 @@ a.mediagoblin_logo:hover { background-position:0px -28px; } -.mediagoblin_container { - width: 960px; - margin-left: auto; - margin-right: auto; -} - .mediagoblin_header_right { float:right; } @@ -105,22 +99,19 @@ a.mediagoblin_logo:hover { /* forms */ .form_box { - width:300px; - margin-left:auto; - margin-right:auto; background-color:#393939; background-image:url("../images/background_lines.png"); background-repeat:repeat-x; - padding:1px 83px 30px 83px; font-size:18px; -} - -.submit_box { - width:600px; + padding-bottom:30px; + padding-top:1px; + margin-left:auto; + margin-right:auto; + display:block; + float:none; } .edit_box { - width:600px; background-image:url("../images/background_edit.png"); } diff --git a/mediagoblin/static/css/contrib/960_12_col.css b/mediagoblin/static/css/contrib/960_12_col.css new file mode 120000 index 00000000..15c360e4 --- /dev/null +++ b/mediagoblin/static/css/contrib/960_12_col.css @@ -0,0 +1 @@ +../../../contrib/960_12_col.css
\ No newline at end of file |