Author: lkaufmann Date: 2014-05-07 10:31:44 +0200 (Wed, 07 May 2014) New Revision: 1921 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1921 Log: Refs #4997 Adds Roboto font and update news display Added: trunk/wao-web/src/main/webapp/fonts/Roboto-Black.ttf trunk/wao-web/src/main/webapp/fonts/Roboto-Bold.ttf trunk/wao-web/src/main/webapp/fonts/Roboto-Regular.ttf Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-04-30 16:36:52 UTC (rev 1920) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-05-07 08:31:44 UTC (rev 1921) @@ -64,15 +64,15 @@ <s:url action="delete-news" id="deleteNewsUrl"> <s:param name="newsId" value="topiaId" /> </s:url> - <s:a href="%{deleteNewsUrl}"> - <i class="fa fa-trash-o"></i> <s:text name="wao.ui.action.delete" /> + <s:a href="%{deleteNewsUrl}" cssClass="btn-delete" title="%{getText('wao.ui.action.delete')}" > + <i class="fa fa-trash-o"></i> </s:a> <s:url action="edit-news!input" id="editNewsUrl"> <s:param name="newsId" value="topiaId" /> </s:url> - <s:a href="%{editNewsUrl}"> - <i class="fa fa-edit"></i> <s:text name="wao.ui.action.edit" /> + <s:a href="%{editNewsUrl}" cssClass="btn-edit" title="%{getText('wao.ui.action.edit')}"> + <i class="fa fa-edit"></i> </s:a> </s:if> </p> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-04-30 16:36:52 UTC (rev 1920) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-05-07 08:31:44 UTC (rev 1921) @@ -52,7 +52,7 @@ <div class="navbar"> <div class="navbar-inner"> - <a class="brand" href="#">Wao <span><s:text name="%{obsProgram.getI18nKey()}"/></span></a> + <a class="brand" href="#">WAO <span><s:text name="%{obsProgram.getI18nKey()}"/></span></a> <%--<a class="brand" href="#">Wao <s:property value="%{getText(#obsProgram.getI18nKey())}" /></a>--%> <ul class="nav"> Added: trunk/wao-web/src/main/webapp/fonts/Roboto-Black.ttf =================================================================== (Binary files differ) Property changes on: trunk/wao-web/src/main/webapp/fonts/Roboto-Black.ttf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/wao-web/src/main/webapp/fonts/Roboto-Bold.ttf =================================================================== (Binary files differ) Property changes on: trunk/wao-web/src/main/webapp/fonts/Roboto-Bold.ttf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/wao-web/src/main/webapp/fonts/Roboto-Regular.ttf =================================================================== (Binary files differ) Property changes on: trunk/wao-web/src/main/webapp/fonts/Roboto-Regular.ttf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-04-30 16:36:52 UTC (rev 1920) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-07 08:31:44 UTC (rev 1921) @@ -38,6 +38,24 @@ } /****************************************************************************** + * Fonts + *****************************************************************************/ +@font-face { + font-family: "Roboto"; + src: url('fonts/Roboto-Regular.ttf'); +} +@font-face { + font-family: "Roboto"; + font-weight: bold; + src: url('fonts/Roboto-Bold.ttf'); +} +@font-face { + font-family: "Roboto"; + font-weight: 900; + src: url('fonts/Roboto-Black.ttf'); +} + +/****************************************************************************** * Des classes à usage transverse *****************************************************************************/ @@ -259,7 +277,7 @@ } .large-table tbody th, .large-table td { - border: solid 1px #aaaaaa; + border: none !important; border-left-style: dashed; border-right-style: dashed; padding: 2px; @@ -356,13 +374,13 @@ } .btn-primary { - background-color: #2f4f4f; - background-image: linear-gradient(to bottom, #446f6f, #2f4f4f); + background-color: #008A8A; + background-image: linear-gradient(to bottom, #008A8A, #007070); color: #FFF !important; text-decoration: none !important; } .btn-primary:hover { - background-color: #2f4f4f; + background-color: #007070; } /****************************************************************************** @@ -517,6 +535,19 @@ color: #434343; } +main.home .news a { + color: #0d9898; +} +main.home .news a:hover, +main.home .news a:active { + color: #2f4f4f; +} + +/* Fix a 1px gap between icons in fontawesome */ +main.home .news a.btn-edit { + padding-top: 1px; +} + main.home .news p.publication { color: #cdcdcd; font-size: 14px; @@ -527,6 +558,8 @@ margin-left: 10px; text-decoration: none; color: #2f4f4f; + font-weight: bold; + font-size: 15px; } main.home .news p.publication > a i.fa { color: #2f4f4f;