Update of /cvsroot/plone/CMFPlone/skins/plone_styles In directory sc8-pr-cvs1:/tmp/cvs-serv2965/skins/plone_styles Modified Files: Tag: limi_elvix_cleanup_redux plone.css.dtml ploneColumns.css.dtml ploneNS4.css.dtml stylesheet_properties.props Log Message: Style fixes - Improved css-layout. The prevous version turned out to be a bit broken. Better now. Tested in IE6, Moz, Opera and NS4,- Still a glitch in Opera with forms and floating. Slight deault font-size-increase Index: plone.css.dtml =================================================================== RCS file: /cvsroot/plone/CMFPlone/skins/plone_styles/plone.css.dtml,v retrieving revision 1.12.6.1 retrieving revision 1.12.6.2 diff -C2 -d -r1.12.6.1 -r1.12.6.2 *** plone.css.dtml 21 May 2003 14:02:27 -0000 1.12.6.1 --- plone.css.dtml 27 May 2003 21:01:34 -0000 1.12.6.2 *************** *** 265,276 **** - - - - - - - - /* ** Structural Elements --- 265,268 ---- *************** *** 547,551 **** div.row { - clear: both; min-height: 4em; margin: 0em 0em 1em 0em; --- 539,542 ---- Index: ploneColumns.css.dtml =================================================================== RCS file: /cvsroot/plone/CMFPlone/skins/plone_styles/ploneColumns.css.dtml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** ploneColumns.css.dtml 21 May 2003 20:24:14 -0000 1.1.2.1 --- ploneColumns.css.dtml 27 May 2003 21:01:35 -0000 1.1.2.2 *************** *** 1,55 **** - .columns, - .columns .left, - .columns .right, - .columns .main - { - margin : 0px; - padding : 0px; - } - /* - make sure that .leftcolumn's width is equal to .centercolumn's margin-left - -11px margin-top enables columns to lign up in NN4 rather than dropping down unacceptably - */ - .columns .left - { - float : left; - left : 0px; - width : 17%; - padding-right : 2px; - margin-top : -11px; ! } ! /* reset post NN4 */ ! .columns .left ! { ! /*/*/ ! margin-top : 0px; ! /* */ ! } ! /* ! make sure that .rightcolumn's width is equal to .centercolumn's margin-right ! */ ! .columns .right ! { ! position : static; ! float : right; ! width : 17%; ! } ! /* NN4 values */ ! .columns .main ! { ! margin-right : 0px; ! margin-left : -25px; ! } ! /* Other browsers */ ! /*/*/ ! .columns .main ! { ! margin-right : 17%; ! margin-left : 17%; ! } ! /* */ --- 1,30 ---- + .columns{ + } ! .columns .left{ ! float : left; ! width : 17%; ! background-color : #cccc99; ! } ! .columns .right{ ! width : 17%; ! float : right; ! background-color : #99cc99; ! } ! ! .columns .main{ ! float : none; ! width : 65%; ! } ! ! .columns .innermain{ ! float : none; ! padding : 0 25px; ! } ! ! .columns .innermain a:link{ ! } \ No newline at end of file Index: ploneNS4.css.dtml =================================================================== RCS file: /cvsroot/plone/CMFPlone/skins/plone_styles/ploneNS4.css.dtml,v retrieving revision 1.5.8.1 retrieving revision 1.5.8.2 diff -C2 -d -r1.5.8.1 -r1.5.8.2 *** ploneNS4.css.dtml 21 May 2003 14:02:28 -0000 1.5.8.1 --- ploneNS4.css.dtml 27 May 2003 21:01:35 -0000 1.5.8.2 *************** *** 126,131 **** --- 126,264 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /* don't touch these */ + + + + .columns, + .columns .left, + .columns .right, + .columns .main + { + margin : 0px; + padding : 0px; + } + + + /* + make sure that .leftcolumn's width is equal to .centercolumn's margin-left + -11px margin-top enables columns to lign up in NN4 rather than dropping down unacceptably + */ + .columns .left + { + float : left; + left : 0px; + width : 17%; + padding-right : 2px; + margin-top : -11px; + + } + /* reset post NN4 */ + .columns .left + { + /*/*/ + margin-top : 0px; + /* */ + } + + /* + make sure that .rightcolumn's width is equal to .centercolumn's margin-right + */ + .columns .right + { + position : static; + float : right; + width : 17%; + } + + /* NN4 values */ + .columns .main + { + margin-right : 0px; + margin-left : -25px; + } + /* Other browsers */ + /*/*/ + .columns .main + { + margin-right : 17%; + margin-left : 17%; + } + /* */ + + + + + + + + + + + + + + + + + + + /* </dtml-with> */ + + + + + + + + + + + Index: stylesheet_properties.props =================================================================== RCS file: /cvsroot/plone/CMFPlone/skins/plone_styles/stylesheet_properties.props,v retrieving revision 1.18 retrieving revision 1.18.14.1 diff -C2 -d -r1.18 -r1.18.14.1 *** stylesheet_properties.props 28 Oct 2002 23:22:14 -0000 1.18 --- stylesheet_properties.props 27 May 2003 21:01:35 -0000 1.18.14.1 *************** *** 1,5 **** plone_skin:string=Plone Default ! mainFont:string=65% Verdana, Helvetica, Arial, sans-serif mainBackground:string=White mainFontColor:string=Black --- 1,5 ---- plone_skin:string=Plone Default ! mainFont:string=11px Verdana, Helvetica, Arial, sans-serif mainBackground:string=White mainFontColor:string=Black *************** *** 25,29 **** descriptionFont:string=bold 100% Verdana, Helvetica, Arial, sans-serif ! contentFont:string=120% Verdana, Helvetica, Arial, sans-serif contentBackground:string=White contentImageBorder:string=0 --- 25,29 ---- descriptionFont:string=bold 100% Verdana, Helvetica, Arial, sans-serif ! contentFont:string=110% Verdana, Helvetica, Arial, sans-serif contentBackground:string=White contentImageBorder:string=0 |