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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
tworrall 2013-12-16 11:57:40 -05:00
commit 093359f992
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
productMods/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
View file

@ -75,7 +75,7 @@
<p class="submit"> <p class="submit">
<input type="submit" id="submit" value="${submitLabel}" role="submit" /> <input type="submit" id="submit" value="${submitLabel}" role="submit" />
<span class="or"> or </span> <span class="or"> or </span>
<a title="${i18n().cancel_title}" href="${editConfiguration.cancelUrl}">${i18n().cancel_link}</a> <a class="cancel" title="${i18n().cancel_title}" href="${editConfiguration.cancelUrl}">${i18n().cancel_link}</a>
</p> </p>
</form> </form>

5
themes/wilma/css/wilma.css
View file

@ -368,6 +368,11 @@ form.deleteForm {
padding-top: 1em; padding-top: 1em;
border-top: 1px dotted #e3e9e9; border-top: 1px dotted #e3e9e9;
} }
form.editForm span {
color: #c00;
font-weight: normal;
font-size: small;
}
form h3.delete-entry { form h3.delete-entry {
padding-right: .8em; padding-right: .8em;
display: inline; display: inline;