From 25cc50bfdb0d4029e84e37e54e20930fa8ffd8ab Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 27 Aug 2017 00:34:04 +0200 Subject: [PATCH] Please cherry-pick: - made CSS class name more common: foo-bar and not foo_bar - put copyright in h:outputText MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- web/WEB-INF/templates/guest/guest_footer.tpl | 2 +- web/WEB-INF/templates/login/user/user_footer.tpl | 4 +++- web/resources/css/layout.css | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl index d00a1dc6..93d6162a 100644 --- a/web/WEB-INF/templates/guest/guest_footer.tpl +++ b/web/WEB-INF/templates/guest/guest_footer.tpl @@ -35,7 +35,7 @@ - diff --git a/web/WEB-INF/templates/login/user/user_footer.tpl b/web/WEB-INF/templates/login/user/user_footer.tpl index ec6d264c..60fb57dd 100644 --- a/web/WEB-INF/templates/login/user/user_footer.tpl +++ b/web/WEB-INF/templates/login/user/user_footer.tpl @@ -29,7 +29,9 @@ - + diff --git a/web/resources/css/layout.css b/web/resources/css/layout.css index aae766a4..59ea6530 100644 --- a/web/resources/css/layout.css +++ b/web/resources/css/layout.css @@ -160,7 +160,7 @@ ul.navbar-mini li.navlink-mini { padding: 1px; } -ul.navbar-horizontal li.footer_copyright { +ul.navbar-horizontal li.footer-copyright { float: right; width: 300px; margin-right: 10px; -- 2.39.5