Index: advanced/in-bulletin/elements/html_head.elm.tpl =================================================================== --- advanced/in-bulletin/elements/html_head.elm.tpl (revision 13400) +++ advanced/in-bulletin/elements/html_head.elm.tpl (working copy) @@ -1,6 +1,12 @@ -inc/styles.css" type="text/css" /> - + + \ No newline at end of file Index: advanced/in-bulletin/inc/styles.css =================================================================== --- advanced/in-bulletin/inc/styles.css (revision 13400) +++ advanced/in-bulletin/inc/styles.css (working copy) @@ -106,15 +106,15 @@ /* --- Topic Button Styles --- */ .big-button-left-border { - background: #EFEFEF url('../img/big_buttons/left_border.gif') repeat-y top left; + background: #EFEFEF url('@templates_base@/in-bulletin/img/big_buttons/left_border.gif') repeat-y top left; } .big-button-bottom td { - background: #EFEFEF url('../img/big_buttons/bottom_border.gif') repeat-x top left; + background: #EFEFEF url('@templates_base@/in-bulletin/img/big_buttons/bottom_border.gif') repeat-x top left; } .big-button-text { - background: #EFEFEF url('../img/big_buttons/top_border.gif') repeat-x top left; + background: #EFEFEF url('@templates_base@/in-bulletin/img/big_buttons/top_border.gif') repeat-x top left; font: bold 11px Arial, sans-serif; letter-spacing: 0px; color: #1F569A; @@ -127,11 +127,11 @@ /* --- Post Button Styles --- */ .small-button-bottom td { - background: #efefef url('../img/small_buttons/bottom_border.gif') repeat-x top left + background: #efefef url('@templates_base@/in-bulletin/img/small_buttons/bottom_border.gif') repeat-x top left } .small-button-text { - background: url('../img/small_buttons/top_border.gif') repeat-x top left; + background: url('@templates_base@/in-bulletin/img/small_buttons/top_border.gif') repeat-x top left; font: 10px Arial, sans-serif; color: #153C6A; padding-top: 15px; Index: advanced/in-commerce/elements/html_head.elm.tpl =================================================================== --- advanced/in-commerce/elements/html_head.elm.tpl (revision 13400) +++ advanced/in-commerce/elements/html_head.elm.tpl (working copy) @@ -1,6 +1,6 @@ -inc/styles.css" type="text/css" /> - + + Index: advanced/in-link/elements/html_head.elm.tpl =================================================================== --- advanced/in-link/elements/html_head.elm.tpl (revision 13400) +++ advanced/in-link/elements/html_head.elm.tpl (working copy) @@ -1,11 +1,11 @@ -inc/styles.css" type="text/css" /> - + + - - + + Index: advanced/in-news/elements/html_head.elm.tpl =================================================================== --- advanced/in-news/elements/html_head.elm.tpl (revision 13400) +++ advanced/in-news/elements/html_head.elm.tpl (working copy) @@ -1,3 +1,3 @@ -inc/styles.css" type="text/css" /> - + + Index: advanced/platform/designs/default_design.des.tpl =================================================================== --- advanced/platform/designs/default_design.des.tpl (revision 13400) +++ advanced/platform/designs/default_design.des.tpl (working copy) @@ -15,6 +15,9 @@ + + + Index: advanced/platform/elements/html_head.elm.tpl =================================================================== --- advanced/platform/elements/html_head.elm.tpl (revision 13400) +++ advanced/platform/elements/html_head.elm.tpl (working copy) @@ -1,39 +1,49 @@ -" /> + -" /> -" /> + + - + - + - - - + - + Index: advanced/platform/elements/menu.elm.tpl =================================================================== --- advanced/platform/elements/menu.elm.tpl (revision 13400) +++ advanced/platform/elements/menu.elm.tpl (working copy) @@ -4,12 +4,14 @@
- - - - + - +
+ - - - + + \ No newline at end of file Index: simple/elements/html_head.elm.tpl =================================================================== --- simple/elements/html_head.elm.tpl (revision 13400) +++ simple/elements/html_head.elm.tpl (working copy) @@ -8,15 +8,21 @@ - + - - - + + + @@ -27,4 +33,4 @@ - \ No newline at end of file + \ No newline at end of file Index: simple/inc/content.css =================================================================== --- simple/inc/content.css (revision 13400) +++ simple/inc/content.css (working copy) @@ -1,6 +1,6 @@ /* -- RSS Feed Icon -- */ .link-rss a { - background:url('../img/icon-rss.png') no-repeat left top; + background:url('@templates_base@/img/icon-rss.png') no-repeat left top; display:block; height:19px; text-indent:-999em; @@ -49,28 +49,28 @@ } #side-box .round-top-red { - background:url('../img/bg-side-box-top-red.png') no-repeat left top; + background:url('@templates_base@/img/bg-side-box-top-red.png') no-repeat left top; height:16px; margin:0 -17px; } #side-box .round-bottom, #side-box-plain .round-bottom { - background:url('../img/bg-side-box-bottom.png') no-repeat left bottom; + background:url('@templates_base@/img/bg-side-box-bottom.png') no-repeat left bottom; height:16px; margin:0 -17px; } #side-box .round-top, #side-box-plain .round-top { - background:url('../img/bg-side-box-top.png') no-repeat left top; + background:url('@templates_base@/img/bg-side-box-top.png') no-repeat left top; height:16px; margin:0 -17px; } /* -- !Side Box -- */ #side-box h3 { - background:#960c03 url('../img/bg-side-box-top-red.png') no-repeat left top; + background:#960c03 url('@templates_base@/img/bg-side-box-top-red.png') no-repeat left top; border:none; color:#FFF; font-size:1.16em; @@ -80,7 +80,7 @@ } #side-box label { -background:url('../img/icon-email.png') no-repeat left center; +background:url('@templates_base@/img/icon-email.png') no-repeat left center; color:#9b9b9b; font-size:12px; display:block; @@ -97,7 +97,7 @@ } #side-box .submit input { - background:url('../img/bg-form-email-submit.png') no-repeat left top; + background:url('@templates_base@/img/bg-form-email-submit.png') no-repeat left top; border:none; color:#666; cursor:pointer; @@ -110,7 +110,7 @@ } #side-box .submit input:hover { - background-image:url('../img/bg-form-email-submit-hover.png'); + background-image:url('@templates_base@/img/bg-form-email-submit-hover.png'); color:#FFF; } @@ -167,20 +167,20 @@ } #content-main .round-top { - background:url('../img/bg-content-top.png') no-repeat left top; + background:url('@templates_base@/img/bg-content-top.png') no-repeat left top; height:21px; margin:0 -21px; } #content-main .round-bottom { - background:url('../img/bg-content-bottom.png') no-repeat left bottom; + background:url('@templates_base@/img/bg-content-bottom.png') no-repeat left bottom; height:21px; margin:0 -21px; } /* -- !Latest -- */ #block-latest .feature { -background:url('../img/bg-block-latest-featured.png') no-repeat 237px top; +background:url('@templates_base@/img/bg-block-latest-featured.png') no-repeat 237px top; color:#666; margin:5px 0 0; padding:10px 0 0 194px; Index: simple/inc/layout.css =================================================================== --- simple/inc/layout.css (revision 13400) +++ simple/inc/layout.css (working copy) @@ -6,7 +6,7 @@ body { margin:0; padding:28px 0 0; - background: #f8f8f8 url('../img/bg-body.png') repeat-x left top; + background: #f8f8f8 url('@templates_base@/img/bg-body.png') repeat-x left top; } #wrapper { @@ -84,7 +84,7 @@ } h1#branding a { -background:url('../img/logo.png') no-repeat left top; +background:url('@templates_base@/img/logo.png') no-repeat left top; display:block; height:105px; text-indent:-999em; @@ -110,7 +110,7 @@ } #nav-sec li { - background:url('../img/bg-nav-sec-li.png') no-repeat left center; + background:url('@templates_base@/img/bg-nav-sec-li.png') no-repeat left center; float:left; margin:0 0 0 15px; padding:0 0 0 16px; @@ -155,7 +155,7 @@ /* -- !Navigation -- */ ul#nav { -background:#282828 url('../img/bg-nav.png') repeat-x left top; +background:#282828 url('@templates_base@/img/bg-nav.png') repeat-x left top; border-top:1px solid #FFF; font-size:12px; margin:0; @@ -167,7 +167,7 @@ } #nav li a { -background:url('../img/bg-nav.png') no-repeat left -35px; +background:url('@templates_base@/img/bg-nav.png') no-repeat left -35px; color:#FFF; display:block; font-weight:700; @@ -178,7 +178,7 @@ } #nav li:hover a,#nav li.hover a,#nav li a.active { - background:url('../img/bg-nav.png') no-repeat left -70px; + background:url('@templates_base@/img/bg-nav.png') no-repeat left -70px; } #nav li a:hover { @@ -187,16 +187,16 @@ /* Rounded Corner */ #nav li:first-child a,#nav li.first-child a { -background:url('../img/bg-nav.png') no-repeat left -105px; +background:url('@templates_base@/img/bg-nav.png') no-repeat left -105px; } #nav li:first-child:hover a,#nav li:first-child a.active,#nav li.first-child:hover a,#nav li.first-child-hover a,#nav li.first-child a.active { -background:url('../img/bg-nav.png') no-repeat left -140px; +background:url('@templates_base@/img/bg-nav.png') no-repeat left -140px; } /* Contact Us */ #nav li.last-child a { -background:url('../img/bg-nav.png') no-repeat left -315px; +background:url('@templates_base@/img/bg-nav.png') no-repeat left -315px; } /* Red Border on Hover */ @@ -256,7 +256,7 @@ /* -- !Search Form -- */ #masthead form { - background:#282828 url('../img/bg-form-search.png') no-repeat right top; + background:#282828 url('@templates_base@/img/bg-form-search.png') no-repeat right top; border-top:1px solid #FFF; bottom:0; position:absolute; @@ -285,7 +285,7 @@ } #masthead form .submit input { - background:url('../img/bg-form-search-submit.png') no-repeat left top; + background:url('@templates_base@/img/bg-form-search-submit.png') no-repeat left top; border:none; color:#FFF; cursor:pointer; @@ -323,7 +323,7 @@ } #content-tools a { -background:url('../img/ir-content-tools.png') no-repeat 0 50%; +background:url('@templates_base@/img/ir-content-tools.png') no-repeat 0 50%; display:block; float:left; height:11px; @@ -365,7 +365,7 @@ } #site-info ul { - background:url('../img/bg-nav.png') repeat-x 0 -350px; + background:url('@templates_base@/img/bg-nav.png') repeat-x 0 -350px; } #site-info ul li { @@ -374,7 +374,7 @@ } #site-info ul li a { - background:url('../img/bg-nav.png') no-repeat left -35px; + background:url('@templates_base@/img/bg-nav.png') no-repeat left -35px; color:#FFF; display:block; font-weight:700; @@ -386,7 +386,7 @@ #site-info ul li a:hover, #site-info ul li a.active { - background:url('../img/bg-nav.png') no-repeat left -70px; + background:url('@templates_base@/img/bg-nav.png') no-repeat left -70px; } #site-info ul li a:hover { @@ -396,14 +396,14 @@ /* Rounded Corner */ #site-info ul li:first-child a, #site-info ul li.first-child a { - background:url('../img/bg-nav.png') no-repeat left -175px; + background:url('@templates_base@/img/bg-nav.png') no-repeat left -175px; } #site-info ul li:first-child a:hover, #site-info ul li:first-child a.active, #site-info ul li.first-child a:hover, #site-info ul li.first-child a.active { - background:url('../img/bg-nav.png') no-repeat left -210px; + background:url('@templates_base@/img/bg-nav.png') no-repeat left -210px; } /* Back to top */ @@ -412,12 +412,12 @@ } #site-info ul li.last-child a { - background:url('../img/bg-nav.png') no-repeat right -245px; + background:url('@templates_base@/img/bg-nav.png') no-repeat right -245px; } #site-info ul li.last-child a:hover, #site-info ul li.last-child a.active { - background:url('../img/bg-nav.png') no-repeat right -280px; + background:url('@templates_base@/img/bg-nav.png') no-repeat right -280px; } /* Red Border on Hover */ @@ -447,13 +447,13 @@ } #content-main.inner .round-top { -background:url('../img/bg-content-inside-top.png') no-repeat left top; +background:url('@templates_base@/img/bg-content-inside-top.png') no-repeat left top; height:21px; margin:0 -21px; } #content-main.inner .round-bottom { -background:url('../img/bg-content-inside-bottom.png') no-repeat left bottom; +background:url('@templates_base@/img/bg-content-inside-bottom.png') no-repeat left bottom; height:21px; margin:0 -21px; } @@ -461,11 +461,11 @@ /* !Sub Navigation --------------------- */ #nav-sub { -background:#46474b url('../img/bg-nav-sub-bottom.png') no-repeat left bottom; +background:#46474b url('@templates_base@/img/bg-nav-sub-bottom.png') no-repeat left bottom; } #nav-sub ul { -background:url('../img/bg-nav-sub-top.png') no-repeat left top; +background:url('@templates_base@/img/bg-nav-sub-top.png') no-repeat left top; list-style:none; margin:0; padding:15px 0; @@ -478,7 +478,7 @@ } #nav-sub li a { -background:url('../img/bg-nav-sub-li.png') no-repeat 12px .65em; +background:url('@templates_base@/img/bg-nav-sub-li.png') no-repeat 12px .65em; border-bottom:1px solid #1c1d21; color:#FFF; display:block; @@ -487,7 +487,7 @@ } #nav-sub li.expanded a { -background:#6a6b6d url('../img/bg-nav-sub-li-expanded.png') no-repeat 10px .65em; +background:#6a6b6d url('@templates_base@/img/bg-nav-sub-li-expanded.png') no-repeat 10px .65em; text-decoration:none; } Index: simple/inc/override.css =================================================================== --- simple/inc/override.css (revision 13400) +++ simple/inc/override.css (working copy) @@ -1,4 +1,4 @@ -#block-latest .feature { height: auto !important; padding: 10px 0 0 0; background: url('../img/bg-block-latest-featured.png') repeat-x -2px top; } +#block-latest .feature { height: auto !important; padding: 10px 0 0 0; background: url('@templates_base@/img/bg-block-latest-featured.png') repeat-x -2px top; } #block-latest .feature div { padding-bottom: 4px; } #block-latest .feature div div { padding-bottom: 0; } #block-latest .feature-1 { padding: 0; background: none; } Index: simple/inc/print.css =================================================================== --- simple/inc/print.css (revision 13400) +++ simple/inc/print.css (working copy) @@ -1,4 +1,4 @@ - @import url(typography.css); +@import url(typography.css); #nav, #nav-sec, #nav-sub, #content-tools, #nav-accessibility, #masthead form, #site-info ul { display: none; Index: simple/inc/screen.css =================================================================== --- simple/inc/screen.css (revision 13400) +++ simple/inc/screen.css (working copy) @@ -1,12 +1,3 @@ -@import 'reset.css'; /* Reset */ - @import url(typography.css); - /* Typography */ - @import url(layout.css); - /* Structure */ - @import url(content.css); - /* Content */ - - /* !Hacks --------------------- */ /* Add height to containers */ Index: simple/inc/typography.css =================================================================== --- simple/inc/typography.css (revision 13400) +++ simple/inc/typography.css (working copy) @@ -96,7 +96,7 @@ } #content li { -background:url('../img/li.png') no-repeat 0 .31em; +background:url('@templates_base@/img/li.png') no-repeat 0 .31em; margin:6px 0; padding:0 0 0 12px; }