Menu
▾
▴
Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31969] trunk
|
From: Sylvie G. <sgr...@gm...> - 2011-01-19 11:11:28
|
Btw darkroom the poor kid in the family is not very healthy these days Top boxes overlapping, no more background code highlight with white screen.... It will be great to have one theme working with dark background Perhaps each time modification to css/tpl is done, the test must be done on a dark theme too My 2 cents (as it is tru I uses it only on my local) On Wed, 2011-01-19 at 19:55 +0900, Gary Cunningham-Lee wrote: > Ah, I see that div#middle is given a fixedwidth class separately now > when the fixed-width preference is active, but this is only the style > used by Fivealive, whose design has the header and footer going > full-width. Other themes (default) should be contained in a div > completely when fixed-width is on, right? So this means using the div > class(or id) fixedwidth around all of it, as before, unless I'm missing > something (div#main could be used of the fixedwidth div instead if we > want to remove one div; there's no particular reason for an explicit > fixedwidth div nested in div#main). > > -- Gary > > Gary Cunningham-Lee wrote: > > Hi, > > > > There's now a mismatch between tpl and CSS regarding the fixedwidth div. > > In tiki.tpl, it's div id="fixedwidth", but this commit changes the id to > > a class in layout.css. To make them consistent, which should be changed? > > > > -- Gary > > > > jon...@us... wrote: > > > >> Revision: 31969 > >> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31969&view=rev > >> Author: jonnybradley > >> Date: 2011-01-18 12:31:59 +0000 (Tue, 18 Jan 2011) > >> > >> Log Message: > >> ----------- > >> [ENH] layout: Add pref for fixed width width and move some classes around to work with new top and bottom module zones. Adapt fivealive to suit. > >> > >> Modified Paths: > >> -------------- > >> trunk/lib/prefs/layout.php > >> trunk/lib/setup/theme.php > >> trunk/styles/eatlon/options/teal.css > >> trunk/styles/eatlon.css > >> trunk/styles/fivealive.css > >> trunk/styles/layout/layout.css > >> trunk/styles/twist.css > >> trunk/templates/tiki-admin_include_look.tpl > >> trunk/templates/tiki.tpl > >> > >> Added Paths: > >> ----------- > >> trunk/styles/fivealive/header_left.png > >> > >> Modified: trunk/lib/prefs/layout.php > >> =================================================================== > >> --- trunk/lib/prefs/layout.php 2011-01-18 12:19:50 UTC (rev 31968) > >> +++ trunk/lib/prefs/layout.php 2011-01-18 12:31:59 UTC (rev 31969) > >> @@ -11,5 +11,13 @@ > >> 'name' => tra('Layout per section'), > >> 'type' => 'flag', > >> ), > >> + 'layout_fixed_width' => array( > >> + 'name' => tra('Layout Width'), > >> + 'type' => 'text', > >> + 'description' => tra('Constrains the site display width (default: 990px).'), > >> + 'dependencies' => array( > >> + 'feature_fixed_width', > >> + ), > >> + ), > >> ); > >> } > >> > >> Modified: trunk/lib/setup/theme.php > >> =================================================================== > >> --- trunk/lib/setup/theme.php 2011-01-18 12:19:50 UTC (rev 31968) > >> +++ trunk/lib/setup/theme.php 2011-01-18 12:31:59 UTC (rev 31969) > >> @@ -16,6 +16,10 @@ > >> $prefs['style_option'] = $prefs['site_style_option']; > >> } > >> > >> +if ($prefs['feature_fixed_width'] === 'y') { > >> + $headerlib->add_css('.fixed_width .fixedwidth { width:' . (!empty($prefs['layout_fixed_width']) ? $prefs['layout_fixed_width'] : '990px') . '; }'); > >> +} > >> + > >> if ( $prefs['useGroupTheme'] == 'y' && $group_style = $userlib->get_user_group_theme()) { > >> $prefs['style'] = $group_style; > >> $smarty->assign_by_ref('group_style', $group_style); > >> > >> Modified: trunk/styles/eatlon/options/teal.css > >> =================================================================== > >> --- trunk/styles/eatlon/options/teal.css 2011-01-18 12:19:50 UTC (rev 31968) > >> +++ trunk/styles/eatlon/options/teal.css 2011-01-18 12:31:59 UTC (rev 31969) > >> @@ -27,7 +27,7 @@ > >> body.fullscreen {padding: 3em} > >> > >> /* next two: fixed-width: 960px */ > >> -body.fixed_width #fixedwidth { > >> +body.fixed_width .fixedwidth { > >> margin-bottom: 20px; > >> width: 900px !important; > >> background: #fff; > >> > >> Modified: trunk/styles/eatlon.css > >> =================================================================== > >> --- trunk/styles/eatlon.css 2011-01-18 12:19:50 UTC (rev 31968) > >> +++ trunk/styles/eatlon.css 2011-01-18 12:31:59 UTC (rev 31969) > >> @@ -25,7 +25,7 @@ > >> body.fullscreen {padding: 3em} > >> > >> /* next two: fixed-width: 960px */ > >> -body.fixed_width #fixedwidth { > >> +body.fixed_width .fixedwidth { > >> margin-bottom: 20px; > >> width: 900px !important; > >> background: #fff; > >> > >> Added: trunk/styles/fivealive/header_left.png > >> =================================================================== > >> (Binary files differ) > >> > >> > >> Property changes on: trunk/styles/fivealive/header_left.png > >> ___________________________________________________________________ > >> Added: svn:mime-type > >> + application/octet-stream > >> > >> Modified: trunk/styles/fivealive.css > >> =================================================================== > >> --- trunk/styles/fivealive.css 2011-01-18 12:19:50 UTC (rev 31968) > >> +++ trunk/styles/fivealive.css 2011-01-18 12:31:59 UTC (rev 31969) > >> @@ -33,14 +33,19 @@ > >> > >> /*#fixedwidth*/ > >> > >> -body.fixed_width #fixedwidth { > >> - width: 100%; > >> +body.fixed_width .fixedwidth { > >> } > >> > >> -#header { > >> +#header_outer { > >> background: url(fivealive/options/blueberry/headertile.png) 0 0 no-repeat; > >> + height: 203px; > >> + overflow: none; > >> } > >> > >> +#header { > >> + background: url(fivealive/header_left.png) 0 0 no-repeat; > >> +} > >> + > >> #top_modules { > >> background: url(fivealive/options/blueberry/siteheader.jpg) 0 0 no-repeat; > >> } > >> @@ -52,7 +57,6 @@ > >> margin: auto; > >> margin-top: 0; > >> margin-bottom: 0; > >> - width: 990px; > >> background: transparent; > >> } > >> > >> @@ -61,7 +65,6 @@ > >> margin: auto; > >> margin-top: 0; > >> margin-bottom: 0; > >> - width: 990px; > >> background: transparent; > >> } > >> > >> @@ -134,7 +137,7 @@ > >> #loadstats small { > >> text-align: left !important; > >> margin: auto; > >> - width: 980px; > >> + width: 90%; > >> display: block; > >> } > >> > >> > >> Modified: trunk/styles/layout/layout.css > >> =================================================================== > >> --- trunk/styles/layout/layout.css 2011-01-18 12:19:50 UTC (rev 31968) > >> +++ trunk/styles/layout/layout.css 2011-01-18 12:31:59 UTC (rev 31969) > >> @@ -27,24 +27,22 @@ > >> display: block; > >> } > >> > >> -/* general #fixedwidth wrapper when fixed width is off */ > >> -#fixedwidth { > >> +/* general .fixedwidth wrapper when fixed width is off */ > >> +.fixedwidth { > >> display: table; > >> - margin: auto; > >> - margin-top: 0; > >> - margin-bottom: 0; > >> + margin: 0 auto; > >> width: 100%; > >> } > >> > >> /* when fixed width is set to on */ > >> -.fixed_width #fixedwidth { > >> +.fixed_width .fixedwidth { > >> width: 990px; > >> } > >> .fixed_width #main { > >> margin-top: 18px; > >> margin-bottom: 5px; > >> } > >> -.fixed_width #fixedwidth[id] { > >> +.fixed_width .fixedwidth[id] { > >> height: auto; > >> } > >> > >> @@ -53,7 +51,8 @@ > >> } > >> > >> .fullscreen #c1c2 #wrapper #col1.marginright { > >> - margin-right: 30px} > >> + margin-right: 30px; > >> +} > >> > >> .button { > >> display: inline-block; > >> @@ -780,6 +779,11 @@ > >> > >> /***** Boxes *****/ > >> /** Modules **/ > >> + > >> +.modules { > >> + position: relative; > >> +} > >> + > >> .box { > >> overflow: hidden; > >> } > >> > >> Modified: trunk/styles/twist.css > >> =================================================================== > >> --- trunk/styles/twist.css 2011-01-18 12:19:50 UTC (rev 31968) > >> +++ trunk/styles/twist.css 2011-01-18 12:31:59 UTC (rev 31969) > >> @@ -17,7 +17,7 @@ > >> font: 76%/1.4em black Verdana, Geneva, Arial, Helvetica, sans-serif} > >> > >> /* next two: fixed-width: 800px */ > >> -body.fixed_width #fixedwidth { > >> +body.fixed_width .fixedwidth { > >> margin-bottom: 20px; > >> width: 800px !important; > >> background: #fff; > >> > >> Modified: trunk/templates/tiki-admin_include_look.tpl > >> =================================================================== > >> --- trunk/templates/tiki-admin_include_look.tpl 2011-01-18 12:19:50 UTC (rev 31968) > >> +++ trunk/templates/tiki-admin_include_look.tpl 2011-01-18 12:31:59 UTC (rev 31969) > >> @@ -28,6 +28,9 @@ > >> </div> > >> > >> {preference name=feature_fixed_width} > >> + <div class="adminoptionboxchild" id="feature_fixed_width_childcontainer"> > >> + {preference name=layout_fixed_width} > >> + </div> > >> > >> {if isset($thumbfile)} > >> <div class="adminoptionboxchild"> > >> > >> Modified: trunk/templates/tiki.tpl > >> =================================================================== > >> --- trunk/templates/tiki.tpl 2011-01-18 12:19:50 UTC (rev 31968) > >> +++ trunk/templates/tiki.tpl 2011-01-18 12:31:59 UTC (rev 31969) > >> @@ -34,19 +34,21 @@ > >> {if ($prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y') } > >> {if $prefs.module_zones_top eq 'fixed' or ($prefs.module_zones_top ne 'n' && $top_modules|@count > 0)} > >> {if $prefs.feature_layoutshadows eq 'y'}<div id="header-shadow">{eval var=$prefs.header_shadow_start}{/if} > >> - <header class="clearfix" id="header"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> > >> - {* Site header section *} > >> - <div class="content clearfix modules" id="top_modules"> > >> - {section name=homeix loop=$top_modules} > >> - {$top_modules[homeix].data} > >> - {/section} > >> - </div> > >> - </header> > >> + <div id="header_outer"> > >> + <header class="clearfix" id="header"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> > >> + {* Site header section *} > >> + <div class="content clearfix modules fixedwidth" id="top_modules"> > >> + {section name=homeix loop=$top_modules} > >> + {$top_modules[homeix].data} > >> + {/section} > >> + </div> > >> + </header> > >> + </div> > >> {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.header_shadow_end}</div>{/if} > >> {/if} > >> {/if} > >> > >> - {if $prefs.feature_layoutshadows eq 'y'}<div id="middle-shadow">{eval var=$prefs.middle_shadow_start}{/if}<div class="clearfix" id="middle"> > >> + {if $prefs.feature_layoutshadows eq 'y'}<div id="middle-shadow">{eval var=$prefs.middle_shadow_start}{/if}<div class="clearfix fixedwidth" id="middle"> > >> <div class="clearfix {if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'}nofullscreen{else}fullscreen{/if}" id="c1c2"> > >> <div class="clearfix" id="wrapper"> > >> <div id="col1" class="{if $prefs.feature_left_column eq 'fixed' or ($prefs.feature_left_column ne 'n' && $left_modules|@count > 0 && $show_columns.left_modules ne 'n')}marginleft{/if}{if $prefs.feature_right_column eq 'fixed' or ($prefs.feature_right_column ne 'n' && $right_modules|@count > 0 && $show_columns.right_modules ne 'n')} marginright{/if}"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> > >> @@ -155,7 +157,7 @@ > >> {if $prefs.feature_layoutshadows eq 'y'}<div id="footer-shadow">{eval var=$prefs.footer_shadow_start}{/if} > >> <footer id="footer"> > >> <div class="footerbgtrap"> > >> - <div id="bottom_modules" class="content modules"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> > >> + <div id="bottom_modules" class="content modules fixedwidth"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> > >> {section name=homeix loop=$bottom_modules} > >> {$bottom_modules[homeix].data} > >> {/section} > >> > >> > >> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > >> > >> ------------------------------------------------------------------------------ > >> Protect Your Site and Customers from Malware Attacks > >> Learn about various malware tactics and how to avoid them. Understand > >> malware threats, the impact they can have on your business, and how you > >> can protect your company and customers by using code signing. > >> http://p.sf.net/sfu/oracle-sfdevnl > >> _______________________________________________ > >> Tikiwiki-cvs mailing list > >> Tik...@li... > >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > >> > >> > >> > >> ----- > >> No virus found in this message. > >> Checked by AVG - www.avg.com > >> Version: 10.0.1191 / Virus Database: 1435/3387 - Release Date: 01/17/11 > >> > >> > >> > >> > > > > > > ------------------------------------------------------------------------------ > > Protect Your Site and Customers from Malware Attacks > > Learn about various malware tactics and how to avoid them. Understand > > malware threats, the impact they can have on your business, and how you > > can protect your company and customers by using code signing. > > http://p.sf.net/sfu/oracle-sfdevnl > > _______________________________________________ > > Tikiwiki-cvs mailing list > > Tik...@li... > > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > > > > > > ----- > > No virus found in this message. > > Checked by AVG - www.avg.com > > Version: 10.0.1191 / Virus Database: 1435/3389 - Release Date: 01/18/11 > > > > > > > > > ------------------------------------------------------------------------------ > Protect Your Site and Customers from Malware Attacks > Learn about various malware tactics and how to avoid them. Understand > malware threats, the impact they can have on your business, and how you > can protect your company and customers by using code signing. > http://p.sf.net/sfu/oracle-sfdevnl > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |