diff --git a/wiki/static/crans/css/common.css b/wiki/static/crans/css/common.css index 8078668d..54d3c2bd 100644 --- a/wiki/static/crans/css/common.css +++ b/wiki/static/crans/css/common.css @@ -42,11 +42,7 @@ html { line-height: 1.1em; } -body { - margin: 0; -} - -#page, #preview { +#content, #preview { padding-left:3.5em; } diff --git a/wiki/static/crans/css/crans.css b/wiki/static/crans/css/crans.css index cc1923b1..98d739a2 100644 --- a/wiki/static/crans/css/crans.css +++ b/wiki/static/crans/css/crans.css @@ -33,11 +33,25 @@ toute autre regle css !!! @import url('/wiki/common/EventCalendar/EventCalendar.css'); /**/ -body +body, html{ + padding:0; + margin:0; +} + + +div#content { background:white; - padding-top:40px; - padding-right:170px; + position:relative; + margin:40px 170px 0 0; + padding:0 15px 0 4.5em; + background-image: url("../img/fond.png"); + background-repeat: no-repeat; + background-position: center center; + background-attachment: fixed; + min-height:500px; + overflow:auto; + } /**/ @@ -47,9 +61,9 @@ div#titleBarre { position: fixed; /* positionnement */ left: 0; top: 0; - padding:0;//5px 0 0 15px; + padding:0; margin:0; - height: 40px;//35px ; + height: 40px; width:100%; border-bottom: thin solid #f9821d;//orange; background: url(../img/BarreOrange.png) repeat-x; @@ -65,12 +79,16 @@ div#titleBarre * { h1#title { + /* pour ie */ + position:absolute; + top:0; + /* fin pour ie */ margin: 0; display:block; width:100%; height:25px; padding:5px 10px 10px 10px; - background: url(../img/BarreLogo.png) no-repeat right bottom; + background: url(../img/BarreLogo.png) no-repeat right top; } h1#title a { @@ -107,6 +125,7 @@ div#column-one { /* couleurs */ background:#eeeeee; border-left:thin solid #bbbbbb; + border-bottom:thin solid #bbbbbb; } div#column-one li a { @@ -165,15 +184,6 @@ div.portlet:after { margin: 0 4px; } -div#content{ - background-image: url("../img/fond.png"); - background-repeat: no-repeat; - background-position: center center; - background-attachment: fixed; - padding-left: 15px; - padding-right: 10px; - min-height:450px; -} /**/ @@ -242,18 +252,31 @@ textarea { /* Collection de hacks à la con pour IE */ @media screen { - * html { - overflow-y: hidden; +/* * html { + overflow: hidden; } - * html body { +/**/ +/* * html body { overflow-y: auto; height: 100%; - padding: 44px 160px 0 1em; + //padding: 44px 160px 0 1em; font-size: 100%; } +/**/ +/* * html body { + overflow: hidden; + height: 100%; + } + * html body #page { + overflow: auto; + height: 100%; + } + +/**/ * html div#column-one { position: absolute; } +/**/ * html h1#title { position: absolute; @@ -266,3 +289,4 @@ textarea { } } +/**/ \ No newline at end of file