diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-22 22:21:08 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-22 22:21:08 -0500 |
| commit | d94b84b43761cf46e0ed07e42e87ef554b92235e (patch) | |
| tree | 17207bbfd1c2eda6c4f20af7ce9131775b933f98 /mediagoblin/static/css | |
| parent | 64201d12c3d6af7ae4ae7331a969f619edfa7e9d (diff) | |
| parent | f7bcfafff0388d50c75c72ca8da63235e9715d93 (diff) | |
| download | mediagoblin-d94b84b43761cf46e0ed07e42e87ef554b92235e.tar.lz mediagoblin-d94b84b43761cf46e0ed07e42e87ef554b92235e.tar.xz mediagoblin-d94b84b43761cf46e0ed07e42e87ef554b92235e.zip | |
Merge remote branch 'remotes/schendje/960-grid-system'
Diffstat (limited to 'mediagoblin/static/css')
| -rw-r--r-- | mediagoblin/static/css/base.css | 16 | ||||
| l--------- | mediagoblin/static/css/contrib/960_12_col.css | 1 |
2 files changed, 2 insertions, 15 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 1d04fc73..db35a121 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,14 @@ 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; } .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 |