From 76e37f0e75eb4c62e781a9a000cbbcb03bbcde13 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Thu, 8 Nov 2012 16:06:35 -0800 Subject: [PATCH] split styles into base.css and layout.css --- .../static/css/{edbob.css => base.css} | 83 ------------------- edbob/pyramid/static/css/layout.css | 74 +++++++++++++++++ edbob/pyramid/templates/base.mako | 3 +- 3 files changed, 76 insertions(+), 84 deletions(-) rename edbob/pyramid/static/css/{edbob.css => base.css} (52%) create mode 100644 edbob/pyramid/static/css/layout.css diff --git a/edbob/pyramid/static/css/edbob.css b/edbob/pyramid/static/css/base.css similarity index 52% rename from edbob/pyramid/static/css/edbob.css rename to edbob/pyramid/static/css/base.css index a53ab9e..b3b3408 100644 --- a/edbob/pyramid/static/css/edbob.css +++ b/edbob/pyramid/static/css/base.css @@ -96,86 +96,3 @@ ul.error { ul.error li { list-style-type: none; } - -/* td.right { */ -/* float: none; */ -/* } */ - -/* table.wrapper td.right { */ -/* vertical-align: bottom; */ -/* } */ - - -/****************************** - * Main Layout - ******************************/ - -html, body, #container { - height: 100%; -} - -body > #container { - height: auto; - min-height: 100%; -} - -#container { - margin: 0 auto; - width: 1000px; -} - -#header { - border-bottom: 1px solid #000000; - overflow: auto; -} - -#body { - padding-top: 15px; - padding-bottom: 5em; -} - -#footer { - margin-top: -4em; - text-align: center; -} - - -/****************************** - * Header - ******************************/ - -#header h1 { - margin: 0px 5px 10px 5px; -} - -#login { - margin: 8px 20px auto auto; -} - -#login a.username { - font-weight: bold; -} - -#user-menu { - float: left; -} - -#home-link { - font-weight: bold; -} - -#header-links { - float: right; - text-align: right; -} - -#main-menu { - border-top: 1px solid black; - clear: both; - font-weight: bold; -} - -#main-menu li { - display: inline; - margin-right: 15px; -} diff --git a/edbob/pyramid/static/css/layout.css b/edbob/pyramid/static/css/layout.css new file mode 100644 index 0000000..c6092ba --- /dev/null +++ b/edbob/pyramid/static/css/layout.css @@ -0,0 +1,74 @@ + +/****************************** + * Main Layout + ******************************/ + +html, body, #container { + height: 100%; +} + +body > #container { + height: auto; + min-height: 100%; +} + +#container { + margin: 0 auto; + width: 1000px; +} + +#header { + border-bottom: 1px solid #000000; + overflow: auto; +} + +#body { + padding-top: 15px; + padding-bottom: 5em; +} + +#footer { + margin-top: -4em; + text-align: center; +} + + +/****************************** + * Header + ******************************/ + +#header h1 { + margin: 0px 5px 10px 5px; +} + +#login { + margin: 8px 20px auto auto; +} + +#login a.username { + font-weight: bold; +} + +#user-menu { + float: left; +} + +#home-link { + font-weight: bold; +} + +#header-links { + float: right; + text-align: right; +} + +#main-menu { + border-top: 1px solid black; + clear: both; + font-weight: bold; +} + +#main-menu li { + display: inline; + margin-right: 15px; +} diff --git a/edbob/pyramid/templates/base.mako b/edbob/pyramid/templates/base.mako index b026322..dab999b 100644 --- a/edbob/pyramid/templates/base.mako +++ b/edbob/pyramid/templates/base.mako @@ -18,7 +18,8 @@ ${h.javascript_link(request.static_url('edbob.pyramid:static/js/jquery.autocomplete.js'))} ${h.javascript_link(request.static_url('edbob.pyramid:static/js/edbob.js'))} - ${h.stylesheet_link(request.static_url('edbob.pyramid:static/css/edbob.css'))} + ${h.stylesheet_link(request.static_url('edbob.pyramid:static/css/base.css'))} + ${h.stylesheet_link(request.static_url('edbob.pyramid:static/css/layout.css'))} ${h.stylesheet_link(request.static_url('edbob.pyramid:static/css/grids.css'))} ${h.stylesheet_link(request.static_url('edbob.pyramid:static/css/filters.css'))} ${h.stylesheet_link(request.static_url('edbob.pyramid:static/css/forms.css'))}