litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2164 Now that the stylesheets object is available to all templates through configuration shared variables, can move styles out of dump.ftl into dump.css.

Browse source
This commit is contained in:
ryounes 2011-08-11 15:55:40 +00:00
parent 3cbc60d357
commit 4aa4b5ec76
2 changed files with 21 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
webapp/web/css/dump.css
View file

@ -2,47 +2,35 @@
/* Styles for Freemarker template variable dump */
.dump {
border-top: 3px solid #ccc;
border-bottom: 3px solid #ccc;
padding: 1em 0;
margin: 1em 0;
}
.dump li {
list-style-type: none;
}
.dump .directive h6 {
.div.dump {
margin-top: 1em;
border-top: 2px solid #ccc;
padding-top: .75em;
}
.dump.datamodel .var,
.dump.datamodel .directive {
border-bottom: 1px solid #ccc;
padding: 1em 0;
margin: 1em 0;
}
.dump ol li,
.dump ul li {
.dump ul li.variable {
margin-bottom: .5em;
border-bottom: 1px solid #ccc;
padding-top: .75em;
padding-bottom: .75em;
}
.dump .var p {
margin-bottom: .3em;
}
.dump .directive ol,
.dump .directive ul {
.dump ul ul {
margin-left: 1.5em;
}
.dump .directive ol li {
list-style: decimal inside none;
.dump ul li {
list-style: none;
}
.dump .var .var,
.dump.datamodel .var .var {
margin-left: 1.5em;
.dump ul li p {
margin-bottom: .25em;
}
.dump ul li.item {
margin-bottom: 1.25em;
}
.dump ul li.item .value {
margin-left: 1.5em;
}

40
webapp/web/templates/freemarker/body/partials/dump/dump.ftl
View file

@ -2,41 +2,7 @@
<#-- Template for dump directives -->
<#-- Styles here are temporary; use stylesheets.add() once that's working (see below) -->
<style>
div.dump {
margin-top: 1em;
border-top: 2px solid #ccc;
padding-top: .75em;
}
.dump ul li.variable {
margin-bottom: .5em;
border-bottom: 1px solid #ccc;
padding-top: .75em;
padding-bottom: .75em;
}
.dump ul ul {
margin-left: 1.5em;
}
.dump ul li {
list-style: none;
}
.dump ul li p {
margin-bottom: .25em;
}
.dump ul li.item {
margin-bottom: 1.25em;
}
.dump ul li.item .value {
margin-left: 1.5em;
}
</style>
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/dump.css" />')}
<div class="dump">
<h3>${title}</h3>
@ -205,7 +171,3 @@ div.dump {
<li class="item"><#nested></li>
</#macro>
<#-- This will work after we move stylesheets to Configuration sharedVariables
${stylesheets.add('<link rel="stylesheet" href="/css/fmdump.css">')}
-->