[smolder-commits] SF.net SVN: smolder: [705] trunk
Brought to you by:
michael_peters
From: <mic...@us...> - 2007-12-21 04:39:22
|
Revision: 705 http://smolder.svn.sourceforge.net/smolder/?rev=705&view=rev Author: michael_peters Date: 2007-12-20 20:39:21 -0800 (Thu, 20 Dec 2007) Log Message: ----------- combining layout.css and style.css into 1 file to avoid downloading so many files Modified Paths: -------------- trunk/htdocs/style/style.css trunk/templates/wrapper.tmpl Removed Paths: ------------- trunk/htdocs/style/layout.css Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: svk:merge - 6cb60ec2-19fc-4f48-ba02-516b4c84136d:/local/smolder:23500 ef85ff6a-427b-4ddd-bce6-61dc0fed61e7:/local/smolder/trunk:17982 + 6cb60ec2-19fc-4f48-ba02-516b4c84136d:/local/smolder:23500 ef85ff6a-427b-4ddd-bce6-61dc0fed61e7:/local/smolder/trunk:17983 Deleted: trunk/htdocs/style/layout.css =================================================================== --- trunk/htdocs/style/layout.css 2007-12-21 04:39:11 UTC (rev 704) +++ trunk/htdocs/style/layout.css 2007-12-21 04:39:21 UTC (rev 705) @@ -1,129 +0,0 @@ -body { - text-align: center; -} - -#container { - text-align: left; -} - -#header_container { - margin: 0 auto; - width: 750px; - height: 100px; - background-color: #EEEEEE; - margin-bottom: 20px; - border-width: 1px; - border-color: #666666; - border-style: solid; - padding: 3px; - -moz-border-radius: 10px; -} - -#header { - width: 100%; - height: 100%; - border-width: 0px; - border-bottom-width: 1px; - border-right-width: 1px; - border-color: #CCCCCC; - border-style: solid; - -moz-border-radius: 10px; - position: relative; - background-image: url(/images/grid.png); -} - -#main_container { - margin: 0 auto; - width: 750px; - min-height: 550px; - background-color: #EEEEEE; - border-width: 1px; - border-color: #666666; - border-style: solid; - padding: 3px; - -moz-border-radius: 10px; -} - -#main { - border-width: 0px; - min-height: 550px; - border-bottom-width: 1px; - border-right-width: 1px; - border-color: #CCCCCC; - border-style: solid; - -moz-border-radius: 10px; - background-image: url(/images/smolder_large_bg.png); - background-repeat: no-repeat; - background-position: top right; - margin: 0px; - padding: 0px; -} - -#top_nav { - margin: 0 auto; - width: 750px; - height: 15px; - position: relative; - top: -10px; - font-weight: bold; -} - -#message_container { - width: 350px; - position: fixed; - right: 180px; - top: 60px; - z-index: 1000; -} - -#message_container div.info, #message_container div.warning { - border: 1px dotted #e1b856; - border-bottom: 2px solid #777777; - border-right: 2px solid #777777; - padding: 10px; - padding-left: 30px; - margin-bottom: 10px; - font-size: 11pt; -} - -#message_container div.info { - background: #ffffff url('/images/info.png') no-repeat left; -} - -#message_container div.warning { - background: #ffffff url('/images/warning.png') no-repeat left; -} - -#content { - padding: 3px; -} - -#logo { - background-image: url(/images/smolder_small_no_text.png); - background-repeat: no-repeat; - width: 100px; - height: 100px; -} - -#version { - font-weight: bold; - position: absolute; - right: 20px; - top: 140px; - color: #555555; -} - -#title { - background-image: url(/images/smolder_text.png); - background-repeat: no-repeat; - width: 298px; - height: 86px; - position: absolute; - right: 0px; - top: 84px; -} - -#ajax_error_container { - display:none; -} - Modified: trunk/htdocs/style/style.css =================================================================== --- trunk/htdocs/style/style.css 2007-12-21 04:39:11 UTC (rev 704) +++ trunk/htdocs/style/style.css 2007-12-21 04:39:21 UTC (rev 705) @@ -1,3 +1,132 @@ +body { + text-align: center; +} + +#container { + text-align: left; +} + +#header_container { + margin: 0 auto; + width: 750px; + height: 100px; + background-color: #EEEEEE; + margin-bottom: 20px; + border-width: 1px; + border-color: #666666; + border-style: solid; + padding: 3px; + -moz-border-radius: 10px; +} + +#header { + width: 100%; + height: 100%; + border-width: 0px; + border-bottom-width: 1px; + border-right-width: 1px; + border-color: #CCCCCC; + border-style: solid; + -moz-border-radius: 10px; + position: relative; + background-image: url(/images/grid.png); +} + +#main_container { + margin: 0 auto; + width: 750px; + min-height: 550px; + background-color: #EEEEEE; + border-width: 1px; + border-color: #666666; + border-style: solid; + padding: 3px; + -moz-border-radius: 10px; +} + +#main { + border-width: 0px; + min-height: 550px; + border-bottom-width: 1px; + border-right-width: 1px; + border-color: #CCCCCC; + border-style: solid; + -moz-border-radius: 10px; + background-image: url(/images/smolder_large_bg.png); + background-repeat: no-repeat; + background-position: top right; + margin: 0px; + padding: 0px; +} + +#top_nav { + margin: 0 auto; + width: 750px; + height: 15px; + position: relative; + top: -10px; + font-weight: bold; +} + +#message_container { + width: 350px; + position: fixed; + right: 180px; + top: 60px; + z-index: 1000; +} + +#message_container div.info, #message_container div.warning { + border: 1px dotted #e1b856; + border-bottom: 2px solid #777777; + border-right: 2px solid #777777; + padding: 10px; + padding-left: 30px; + margin-bottom: 10px; + font-size: 11pt; +} + +#message_container div.info { + background: #ffffff url('/images/info.png') no-repeat left; +} + +#message_container div.warning { + background: #ffffff url('/images/warning.png') no-repeat left; +} + +#content { + padding: 3px; +} + +#logo { + background-image: url(/images/smolder_small_no_text.png); + background-repeat: no-repeat; + width: 100px; + height: 100px; +} + +#version { + font-weight: bold; + position: absolute; + right: 20px; + top: 140px; + color: #555555; +} + +#title { + background-image: url(/images/smolder_text.png); + background-repeat: no-repeat; + width: 298px; + height: 86px; + position: absolute; + right: 0px; + top: 84px; +} + +#ajax_error_container { + display:none; +} + html { font: 11pt helvetica,arial,sans-serif; } Modified: trunk/templates/wrapper.tmpl =================================================================== --- trunk/templates/wrapper.tmpl 2007-12-21 04:39:11 UTC (rev 704) +++ trunk/templates/wrapper.tmpl 2007-12-21 04:39:21 UTC (rev 705) @@ -5,7 +5,6 @@ <head> <title>Smolder [% IF page_title %]([% page_title %])[% END %]</title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <link rel="stylesheet" type="text/css" href="[% c.static_url('/style/layout.css') %]" /> <link rel="stylesheet" type="text/css" href="[% c.static_url('/style/style.css') %]" /> <link rel="shortcut icon" type="image/x-icon" href="[% c.static_url('/favicon.ico') %]" /> <script type="text/javascript" src="[% c.static_url('/js/prototype.js') %]"></script> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |