Author: chatellier Date: 2011-01-23 21:23:20 +0000 (Sun, 23 Jan 2011) New Revision: 546 Log: Fix css and layout. Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp trunk/coser-web/src/main/webapp/styles/coser.css Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-01-23 21:22:32 UTC (rev 545) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-01-23 21:23:20 UTC (rev 546) @@ -48,8 +48,8 @@ <div id="middle" class="clearfix"> - <div class="page"> - <span class="clt"></span> + <div class="page pagemain"> + <!--<span class="clt"></span>--> <div class="content"> <div class="degrade"> <div class="top_content"> @@ -67,7 +67,7 @@ </div> </div> - <span class="clb"> </span> + <!--<span class="clb"> </span>--> </div> <div class="col_droite"> <img src="<s:url value='/images/carte_accueil.png'/>" alt="carte des zones de campage en europe" title="carte des zones de campage en europe"/> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-01-23 21:22:32 UTC (rev 545) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-01-23 21:23:20 UTC (rev 546) @@ -59,7 +59,7 @@ </div> <div class="page"> - <span class="clt"></span> + <!--<span class="clt"></span>--> <div class="content"> <div class="clearfix"> @@ -68,7 +68,7 @@ </div> </div> - <span class="clb2"> </span> + <!--<span class="clb2"> </span>--> </div> <div class="part_bottom"> <div class="col_droite"> Modified: trunk/coser-web/src/main/webapp/styles/coser.css =================================================================== --- trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-23 21:22:32 UTC (rev 545) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-23 21:23:20 UTC (rev 546) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 Ifremer, Codelutin + * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -389,11 +389,16 @@ } #middle .page { - width: 626px; margin: 23px 22px 10px 60px; float: left; + border-radius: 10px; + text-align: justify; } +#middle .pagemain { + width: 626px; +} + #middle .page span.clt { background: url(../images/haut_page.png) no-repeat; width: 626px; @@ -402,7 +407,9 @@ } #middle .page .content { - background: url(../images/warper_page.png) repeat-y; + /*background: url(../images/warper_page.png) repeat-y;*/ + background-color: white; + border-radius: 10px; font-size: 140%; color: #2e2e2e; line-height: 1.4em; @@ -423,7 +430,7 @@ } #middle .page .degrade { - background: url(../images/degrade.png) repeat-x 0 bottom; + /*background: url(../images/degrade.png) repeat-x 0 bottom;*/ margin: 0 5px; padding: 5px 20px; }