Changeset 36042 for main/trunk/model-interfaces-dev/wmtb
- Timestamp:
- 2022-02-03T11:10:21+13:00 (2 years ago)
- Location:
- main/trunk/model-interfaces-dev/wmtb
- Files:
-
- 1 added
- 1 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/model-interfaces-dev/wmtb/interfaceConfig.xml
r34273 r36042 43 43 </actionList> 44 44 <optionList> 45 <option name="cssTheme" value="interfaces/default/style/themes/main/jquery-ui-1.8.16.custom.css"/> 45 <!-- Uncomment and update this option if you want to introduce custom CSS to this interface. --> 46 <!-- <option name="cssTheme" value="interfaces/default/style/themes/main/jquery-ui.theme.css"/> --> 47 46 48 <option name="highlightQueryTerms" value="true"/> 47 49 <!-- Set one or other of the following two options (berryBasket and favouriteBasket) to true --> -
main/trunk/model-interfaces-dev/wmtb/styles/gs-wmtb-custom.css
r36036 r36042 10 10 --bp-small-max: 1024px; /* 1 less */ 11 11 --a-link-color: rgb(86, 154, 189); 12 --content-padding: 2rem; 13 } 14 15 /* Override core styles to suit */ 16 17 body { 18 background-color: initial; 19 } 20 21 #gs_content { 22 padding: var(--content-padding); 23 } 24 25 .sectionHeader { 26 font-family: 'Montserrat', sans-serif; 27 } 28 29 div#rightSidebar { 30 min-width: initial; 31 float: initial; 32 margin: initial; 12 33 } 13 34 … … 129 150 /* Selecting the children ensures that there is space between them */ 130 151 div.outer > * { 131 padding: 2rem;152 padding: var(--content-padding); 132 153 } 133 154 … … 137 158 div.outer.collectionDisplay { 138 159 display: grid; 139 grid-template-columns: 1fr 3fr 1fr; 160 grid-template-columns: 1fr 2.8fr 1fr; 161 } 162 163 div.outer.collectionDisplay > * { 164 border-right: 1px solid #eaecef; 165 } 166 167 div.outer.collectionDisplay > :last-child { 168 border-right: none; 140 169 } 141 170 … … 143 172 display: flex; 144 173 flex-direction: column; 145 146 border-right: 1px solid #eaecef;147 174 } 148 175 … … 154 181 .side-navbar a.active { 155 182 font-weight: bold; 183 184 /* Override core styles */ 185 background-color: inherit; 156 186 } 157 187 … … 160 190 appearance: none; 161 191 width: 100%; 162 border: 1px solid # eaecef;192 border: 1px solid #d9dbdf; 163 193 } 164 194 -
main/trunk/model-interfaces-dev/wmtb/transform/layouts/header.xsl
r34626 r36042 60 60 <!-- whakatohea.co.nz stylesheets and fonts --> 61 61 62 <!-- 63 TODO: These should go, they can interfere with Greenstone styling 64 and add an unnecessary overhead to render/load times. 65 Need to extract the font styling and re-create the page image header. 66 I suspect it will be easier to maintain our own recreation regardless. 67 --> 62 68 <link rel="stylesheet" type="text/css" href="interfaces/{$interface_name}/styles/main_style.css" title="wsite-theme-css"/> 63 69 <link id="wsite-base-style" rel="stylesheet" type="text/css" href="interfaces/{$interface_name}/styles/sites.css"/> 64 65 <link href='//fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,700,400italic,700italic&subset=latin,latin-ext' rel='stylesheet' type='text/css' /> 70 <link rel="stylesheet" type="text/css" href="interfaces/{$interface_name}/styles/wsite.css"/> 66 71 67 72 <link href='//fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,700,400italic,700italic&subset=latin,latin-ext' rel='stylesheet' type='text/css' /> 68 73 <link href='//fonts.googleapis.com/css?family=Montserrat:400,700&subset=latin,latin-ext' rel='stylesheet' type='text/css' /> 69 <link href='//fonts.googleapis.com/css?family=Montserrat:400,700&subset=latin,latin-ext' rel='stylesheet' type='text/css' />70 <link href='//fonts.googleapis.com/css?family=Montserrat:400,700&subset=latin,latin-ext' rel='stylesheet' type='text/css' />71 <link href='//fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,700,400italic,700italic&subset=latin,latin-ext' rel='stylesheet' type='text/css' />72 <link href='//fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,700,400italic,700italic&subset=latin,latin-ext' rel='stylesheet' type='text/css' />73 <link href='//fonts.googleapis.com/css?family=Montserrat:400,700&subset=latin,latin-ext' rel='stylesheet' type='text/css' />74 <link href='//fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,700,400italic,700italic&subset=latin,latin-ext' rel='stylesheet' type='text/css' />75 <link href='//fonts.googleapis.com/css?family=Montserrat:400,700&subset=latin,latin-ext' rel='stylesheet' type='text/css' />76 77 <link rel="stylesheet" type="text/css" href="interfaces/{$interface_name}/styles/wsite.css"/>78 74 79 75 <!-- The all important Greenstone styling customisations --> 76 <link rel="stylesheet" href="interfaces/{$interface_name}/style/core.css" type="text/css"/> 80 77 <link rel="stylesheet" href="interfaces/{$interface_name}/styles/gs-wmtb-custom.css" type="text/css" /> 81 78 82 79 <link rel="shortcut icon" href="interfaces/{$interface_name}/images/favicon.ico"/> 83 80 84 <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery .min.js"><xsl:text> </xsl:text></script>85 <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery-ui-1.10.2.custom/js/jquery-ui-1.10.2.custom.min.js"><xsl:text> </xsl:text></script>81 <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery-3.6.0.min.js"><xsl:text> </xsl:text></script> 82 <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery-ui-1.13.0.custom/jquery-ui.min.js"><xsl:text> </xsl:text></script> 86 83 <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery.themeswitcher.min.js"><xsl:text> </xsl:text></script> 87 84 <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery.blockUI.js"><xsl:text> </xsl:text></script> -
main/trunk/model-interfaces-dev/wmtb/transform/layouts/main.xsl
r36037 r36042 2 2 <xsl:stylesheet version="1.0" 3 3 xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 4 5 4 xmlns:java="http://xml.apache.org/xslt/java" 6 5 xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil" 7 6 xmlns:gslib="http://www.greenstone.org/skinning" 8 xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat" 9 10 xmlns:lxslt="http://xml.apache.org/xslt" 11 xmlns:result="http://www.example.com/results" 12 xmlns:exsl="http://exslt.org/common" 7 xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat" 8 xmlns:lxslt="http://xml.apache.org/xslt" 9 xmlns:result="http://www.example.com/results" 10 xmlns:exsl="http://exslt.org/common" 13 11 14 12 extension-element-prefixes="java util result exsl" 15 13 exclude-result-prefixes="util java util"> 14 15 <xsl:import href="./toc.xsl" /> 16 16 <!-- 17 17 <xsl:import href="footer.xsl"/> … … 129 129 <xsl:apply-templates select="/page"/> 130 130 </div> 131 <br class="clear" /> 132 131 132 <xsl:if test="not(/page/pageResponse/format[@type='display']/gsf:option[@name='sideBar']) or /page/pageResponse/format[@type='display']/gsf:option[@name='sideBar']/@value='true'"> 133 <!-- We need this for-each statement to select the right node --> 134 <xsl:for-each select="/page/pageResponse/document"> 135 <xsl:call-template name="rightSidebarTOCAlt"/> 136 </xsl:for-each> 137 </xsl:if> 138 139 <!-- <br class="clear" /> --> 140 133 141 </div><!-- end class main-wrap--> 142 134 143 <xsl:call-template name="wmtb-footer"/> 135 144 136 145 </div> <!-- end site-canvas --> 137 146 </div> <!-- end shifted-frame -->
Note:
See TracChangeset
for help on using the changeset viewer.