This is an automated email from the git hooks/post-receive script. New commit to branch refonteUI in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit 5c8c9cc982243c6ffec9ca9e1e68b8c8f78e4555 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Mon Aug 29 09:24:06 2016 +0200 RefonteUI - modif de la mise en page et affichage des bookmarks --- bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp | 15 ++++++--------- bow-ui/src/main/webapp/css/bookmark.css | 10 ++++++---- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp index b9a0d02..d529c25 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp @@ -38,15 +38,10 @@ </s:a> </div> <div class="bookmark-content"> - <div class="left"> - <s:set var="favicon" value="#bookmark.favicon"/> - <c:if test="${fn:length(favicon) > 0}"> - <img class="favicon" src="data:image/png;base64,${u:base64(favicon)}"/> - </c:if> - - <s:a href="alias/%{#bookmark.wikittyId}.action" cssClass="bookmark-link"><s:property value="%{#bookmark.link}"/></s:a> - - </div> + <s:set var="favicon" value="#bookmark.favicon"/> + <c:if test="${fn:length(favicon) > 0}"> + <img class="bookmark-favicon" src="data:image/png;base64,${u:base64(favicon)}"/> + </c:if> <div class="bookmark-tags"> <s:iterator value="#bookmark.labels" var="tag"> @@ -61,6 +56,8 @@ </s:iterator> </div> + <s:a href="alias/%{#bookmark.wikittyId}.action" cssClass="bookmark-link"><s:property value="%{#bookmark.link}"/></s:a> + <div class="clear bookmark-description"> <s:property value="%{#bookmark.description}"/> </div> diff --git a/bow-ui/src/main/webapp/css/bookmark.css b/bow-ui/src/main/webapp/css/bookmark.css index c0b0721..b6338ae 100644 --- a/bow-ui/src/main/webapp/css/bookmark.css +++ b/bow-ui/src/main/webapp/css/bookmark.css @@ -60,10 +60,12 @@ width: 100%; } -.bookmark .favicon { - width: 32px; - height: 32px; - float:left; +.bookmark-favicon { + width: 20px; + height: 20px; + float: left; + margin-right: 10px; + margin-top: 3px; } .bookmark .screenshot{ -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.