Changeset 33272 for main

Timestamp:

2019-07-02T13:14:54+12:00 (5 years ago)

Author:

davidb

Message:

Mostly CSS changes; removal of custom.js as this is now handled elsewhere

File:

• main/trunk/model-interfaces-dev/heritage-nz/transform/layouts/main.xsl (modified) (6 diffs)

main/trunk/model-interfaces-dev/heritage-nz/transform/layouts/main.xsl

@@ -15 +15 @@
     exclude-result-prefixes="util java util">
 
-<!--
-    <xsl:import href="header.xsl"/>
-    <xsl:include href="formatmanager.xsl"/>
-    -->
-    
     <!-- the main layout is defined here -->
     <xsl:template name="mainTemplate">
@@ -44 +39 @@
                 <!-- ***** in header.xsl ***** -->
                 <xsl:call-template name="create-html-header"/>
-                <xsl:call-template name="berryBasketHeadTags"/> 
-                <!-- custom berry basket javascript -->
-                <!-- ***** custom css **** -->
-                <script type="text/javascript" src="interfaces/heritage-nz/js/berrybasket/custom.js"><xsl:text> </xsl:text></script>
+                <xsl:call-template name="basketHeadTags"/>  
                 <script type="text/javascript" src="interfaces/heritage-nz/js/iframeResizer.contentWindow.min.js"><xsl:text> </xsl:text></script>
 
@@ -66 +58 @@
                   #container { top: 105px; }
 -->
-                                  #container { line-height: inherit; }
+                                  #container { line-height: 1.5; }
+
+                                 <xsl:text disable-output-escaping="yes">
 
                   #gs_banner { background-color: #820404; background-image: none; }
@@ -72 +66 @@
                   .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
                   border: 1px solid #400000;
-                  background: #660000 url("images/ui-bg_highlight-hard_15_459e00_1x100.png") repeat-x scroll 50% 50%;
+                  background: #660000 repeat-x scroll 50% 50%; 
                   font-weight: bold;
                   color: #000;
@@ -79 +73 @@
                   .ui-widget-header {
                   border: 1px solid #400000;
-                  background: #660000 url("images/ui-bg_gloss-wave_50_43a21a_500x100.png") repeat-x scroll 50% 50%;
+                  background: #660000 repeat-x scroll 50% 50%; 
                   color: #FFF;
                   font-weight: bold;
@@ -99 +93 @@
                     margin-top: 10px;
                   }
+                 </xsl:text>
                 </style>
 <!--