Commit 3db95c41 by Tuomas Riihimäki

Merge branch 'devel' of codecrew.fi:bortal into devel

2 parents 5cc1a71a c0836669
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<composite:implementation> <composite:implementation>
<h:outputStylesheet library="style/#{sessionHandler.getLayout()}/css" name="tabnav.css" /> <h:outputStylesheet library="style/#{sessionHandler.getTemplate()}/css" name="tabnav.css" />
<div class="userstatus" style="float: right; margin-right: 10px; color: #7DAC0C; font-size: 16px;"> <div class="userstatus" style="float: right; margin-right: 10px; color: #7DAC0C; font-size: 16px;">
<h:outputText value="#{i18n['user.cardPower']}: #{userView.usersCardtemplate.name}" /> <h:outputText value="#{i18n['user.cardPower']}: #{userView.usersCardtemplate.name}" />
</div> </div>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!