This is an automated email from the git hooks/post-receive script. New commit to branch refonteUI in repository bow. See http://git.chorem.org/bow.git commit 7aa7e1ef61b137edc81156aa4c7a821a78141c6e Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Wed Mar 18 22:34:17 2015 +0100 Refs #1205: Create refonteUI branche & init UI refactoring --- bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp | 8 +- bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp | 43 ++++--- .../src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp | 141 +++++++++++---------- bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp | 55 +++++--- .../src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp | 26 +--- bow-ui/src/main/webapp/css/bookmark.css | 135 ++++---------------- bow-ui/src/main/webapp/css/connexion.css | 13 +- bow-ui/src/main/webapp/css/global.css | 74 +++++++---- bow-ui/src/main/webapp/img/logobow.png | Bin 0 -> 1548 bytes 9 files changed, 224 insertions(+), 271 deletions(-) diff --git a/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp b/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp index f77707c..6d1d57f 100644 --- a/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp @@ -8,12 +8,12 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -58,8 +58,8 @@ </head> <body id="page-home"> <div id="wrap"> - <div id="page"> - <%@include file="/WEB-INF/jsp/inc/header.jsp" %> + <%@include file="/WEB-INF/jsp/inc/header.jsp" %> + <div id="page clearfix"> <div id="main"> <decorator:body /> </div> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp index 35a5e70..2cd679e 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp @@ -8,12 +8,12 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -24,7 +24,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> - + <head> <title><s:text name="bow.search.title" /></title> <s:url var="css" value="/css/bookmark.css" /> @@ -32,8 +32,11 @@ <s:head /> </head> <body> - <div class="menu clearfix"> - <h2> + <div class="menu content clearfix"> + <div class="left"> + Display mode + </div> + <p class="counter"> <s:if test="first - bowSession.user.bookmarks >= 0"> <s:url var="prev" action="home"> <s:param name="tagLine" value="%{tagLine}" /> @@ -55,8 +58,8 @@ </s:url> <s:a href="%{next}">>></s:a> </s:if> - </h2> - + </p> + <s:set name="bookmarksToDelete" value="%{searchResult.bookmarkCount}" /> <s:if test="%{#bookmarksToDelete > 0}"> <s:url var="deleteSearchResults" action="deleteSearchResults" escapeAmp="false"> @@ -66,7 +69,7 @@ </s:url> <s:a id="deleteSearchResultsButton" title="delete all" href="" onclick="deleteConfirmation('%{deleteSearchResults}', %{#bookmarksToDelete}); return(false);"></s:a> </s:if> - <s:form action="home" method="get" theme="simple"> + <s:form action="home" method="get" theme="simple" cssClass="right"> <label for="order"><s:text name="bow.search.orderby" /></label> <s:select id="order" name="order" list="possibleOrder"/> <s:submit key="bow.search.submit" name="submit" /> @@ -75,16 +78,18 @@ <s:hidden name="first" value="%{first}" /> </s:form> </div> - <div class="content"> - <s:if test="searchResult.bookmarks.empty"> - <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> - </s:if> - <s:else> - <s:iterator value="searchResult.bookmarks" var="bookmark"> - <s:set name="bookmark" value="bookmark"/> - <jsp:include page="inc/bookmark.jsp" flush="true"/> - </s:iterator> - </s:else> - </div> + + + <div class="content"> + <s:if test="searchResult.bookmarks.empty"> + <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> + </s:if> + <s:else> + <s:iterator value="searchResult.bookmarks" var="bookmark"> + <s:set name="bookmark" value="bookmark"/> + <jsp:include page="inc/bookmark.jsp" flush="true"/> + </s:iterator> + </s:else> + </div> </body> </html> 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 5e89bde..8b22773 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 @@ -8,12 +8,12 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -25,38 +25,80 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@taglib uri="/WEB-INF/bowutils" prefix="u" %> -<div class="bookmark"bow +<div class="bookmark clearfix" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> - <div class="bookmarkhead"> - <span 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> - <c:if test="${fn:length(favicon) <= 0}"> - <img src="img/ptit-livre.jpg"/> - </c:if> - </span> - <span class="left date"><s:property value="#bookmark.creationDate"/></span> - <span class="left"> - <s:if test="%{!#bookmark.privateAlias.empty}"> - <s:a cssClass="alias" href="%{config.aliasUrl + #bookmark.wikittyId}.action" - title="%{#bookmark.link}" target="_blank"> - a:<s:property value="%{#bookmark.privateAlias}" /> - </s:a> - </s:if> - </span> - <span class="left"> - <s:if test="%{!#bookmark.publicAlias.empty}"> - <s:a cssClass="alias" href="%{config.aliasUrl + #bookmark.publicAlias}.action" - title="%{#bookmark.link}" target="_blank"> - a:<s:property value="%{#bookmark.publicAlias}" /> - </s:a> - </s:if> - </span> - <span class="spacemax"></span> + <s:a title="%{#bookmark.link}" href="alias/%{#bookmark.wikittyId}.action" target="_blank" cssClass="left"> + <div class="screenshot"> + <s:set var="screenshot" value="#bookmark.screenshot"/> + <c:if test="${fn:length(screenshot) > 0}"> + <img src="data:image/png;base64,${u:base64(screenshot)}"/> + </c:if> + <c:if test="${fn:length(screenshot) <= 0}"> + <img src="img/livreG.jpg"/> + </c:if> + </div> + </s:a> + <div> + <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> + <c:if test="${fn:length(favicon) <= 0}"> + <img src="img/ptit-livre.jpg"/> + </c:if> + + <s:a href="alias/%{#bookmark.wikittyId}.action"><s:property value="%{#bookmark.link}"/></s:a> + + </div> + + <p class="tags left"> + <strong><s:text name="bow.bookmark.tags" /> :</strong> + <s:iterator value="#bookmark.labels" var="tag"> + <s:url var="search" action="home"> + <s:param name="addTag" value="%{#tag}"/> + <s:param name="tagLine" value="%{tagLine}"/> + <s:param name="fullTextLine" value="%{fullTextLine}"/> + <s:param name="order" value="%{order}"/> + <%-- on ne met pas 'first', il faut repartir de 0 --%> + </s:url> + <s:a href="%{search}" cssClass="tag"><s:property value="%{#tag}"/></s:a> + </s:iterator> + </p> + + <div class="clear"> + <s:property value="%{#bookmark.description}"/> + </div> + + + + <div class="right"> + <s:if test="%{!#bookmark.privateAlias.empty}"> + <s:a cssClass="alias" href="%{config.aliasUrl + #bookmark.wikittyId}.action" + title="%{#bookmark.link}" target="_blank"> + a:<s:property value="%{#bookmark.privateAlias}" /> + </s:a> + </s:if> + + <s:if test="%{!#bookmark.publicAlias.empty}"> + <s:a cssClass="alias" href="%{config.aliasUrl + #bookmark.publicAlias}.action" + title="%{#bookmark.link}" target="_blank"> + a:<s:property value="%{#bookmark.publicAlias}" /> + </s:a> + </s:if> + </div> + + <div class="right"> + <span class="date"><s:property value="#bookmark.creationDate"/></span> + + <div class="click"><s:property value="%{#bookmark.click}" /></div> + </div> + + + + <div class="actions"> <span class="right"> <s:url var="screenshotBookmark" action="screenshotBookmark" escapeAmp="true"> <s:param name="id" value="%{#bookmark.wikittyId}" /> @@ -89,42 +131,7 @@ onclick="return deleteConfirmation('%{#removeBookmark}','%{#bookmark.link}');"></s:a> </span> </div> + </div> - <div class="bookmarkcontenu"> - <s:a title="%{#bookmark.link}" href="alias/%{#bookmark.wikittyId}.action" target="_blank"> - <div class="screenshot"> - <s:set var="screenshot" value="#bookmark.screenshot"/> - <c:if test="${fn:length(screenshot) > 0}"> - <img src="data:image/png;base64,${u:base64(screenshot)}"/> - </c:if> - <c:if test="${fn:length(screenshot) <= 0}"> - <img src="img/livreG.jpg"/> - </c:if> - </div> - </s:a> - <div class="click"><s:property value="%{#bookmark.click}" /></div> - <div class="description"> - <p> - <s:a href="alias/%{#bookmark.wikittyId}.action"><s:property value="%{#bookmark.link}"/></s:a> - </p> - <h3><s:text name="bow.bookmark.description" /> :</h3> - <p> - <s:property value="%{#bookmark.description}"/> - </p> - <p class="tags"> - <strong><s:text name="bow.bookmark.tags" /> :</strong> - <s:iterator value="#bookmark.labels" var="tag"> - <s:url var="search" action="home"> - <s:param name="addTag" value="%{#tag}"/> - <s:param name="tagLine" value="%{tagLine}"/> - <s:param name="fullTextLine" value="%{fullTextLine}"/> - <s:param name="order" value="%{order}"/> - <%-- on ne met pas 'first', il faut repartir de 0 --%> - </s:url> - <s:a href="%{search}" cssClass="tag"><s:property value="%{#tag}"/></s:a> - </s:iterator> - </p> - </div> - </div> </div> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp index 8c14bc2..9b83b1e 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp @@ -8,12 +8,12 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -24,20 +24,44 @@ <div id="header" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> - <div> - <s:if test="%{#session.BowSession.user != null}"> - <s:url var="homeToken" action="home"> - <s:param name="token" value="%{#session.BowSession.getPermanentToken()}" /> - </s:url> - <s:a cssClass="logo" href="%{homeToken}">bow</s:a> - </s:if> - <s:else> - <s:a cssClass="logo" action="home">bow</s:a> - </s:else> + + <s:if test="%{#session.BowSession.user != null}"> + <s:url var="homeToken" action="home"> + <s:param name="token" value="%{#session.BowSession.getPermanentToken()}" /> + </s:url> + <s:a cssClass="logo" href="%{homeToken}">bow</s:a> + </s:if> + <s:else> + <s:a cssClass="logo" action="home">bow</s:a> + </s:else> + + + <div class="actions left"> + <s:url var="editBookmark" action="editBookmark" escapeAmp="true"> + <s:param name="tagLine"><s:property value="%{tagLine}" /></s:param> + <s:param name="fullTextLine"><s:property value="%{fullTextLine}" /></s:param> + <s:param name="order" value="%{order}"/> + <s:param name="first" value="%{first}"/> + </s:url> + + <s:a href="%{editBookmark}"> + <s:text name="bow.rightMenu.addUrl.link" /> + </s:a> </div> + <s:if test="%{#session.BowSession.user != null}"> + <div class="user right"> + <s:form action="logout" theme="simple"> + <div class="input"> + <s:submit key="bow.rightMenu.logout" name="submit" /> + </div> + </s:form> + <a href="http://maven-site.chorem.org/bow/" class="help" target="_blank"> + <s:text name="bow.rightMenu.help" /> + </a> + <s:a action="preferences"><s:text name="bow.preferences.title" /></s:a> + </div> <div class="recherche right"> - <h3><s:text name="bow.rightMenu.search" /></h3> <div class="input"> <s:form action="home" theme="simple"> <s:textfield name="tagLine" labelSeparator="" /> @@ -52,14 +76,15 @@ <s:submit key="bow.rightMenu.fullTextSearch" name="submit" /> </s:form> </div> - <div class="input"> + <!--div class="input"> <s:form action="openSearchResult" theme="simple"> <s:textfield name="q" labelSeparator="" /> <s:submit key="bow.rightMenu.externSearchEngine" name="submit" /> </s:form> - </div> + </div--> </div> </s:if> + <div id="msg"> <span id="actionmessageHeader"> <s:actionmessage /> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp index 4d55c3c..c50e797 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp @@ -25,37 +25,19 @@ modal="true" autoOpen="false" /> -<div id="logoutDiv" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> - <s:form action="logout" theme="simple"> - <div class="input"> - <s:submit key="bow.rightMenu.logout" name="submit" /> - </div> - </s:form> - <a href="http://maven-site.chorem.org/bow/" class="help" target="_blank"> - <s:text name="bow.rightMenu.help" /> - </a> -</div> + <div id="side" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> + xmlns:jsp="http://java.sun.com/JSP/Page"><s:a href="%{editBookmark}"> + <s:text name="bow.rightMenu.addUrl.link" /> + </s:a> <div id="colonneD"> <ul class="droite"> <s:if test="bowSession.admin"> <li><s:a action="fragment/callStatistic">CallStatistic</s:a></li> <li><s:a action="admin"><s:text name="bow.rightMenu.admin" /></s:a></li> </s:if> - <li><s:a action="preferences"><s:text name="bow.preferences.title" /></s:a></li> <li> - <s:url var="editBookmark" action="editBookmark" escapeAmp="true"> - <s:param name="tagLine"><s:property value="%{tagLine}" /></s:param> - <s:param name="fullTextLine"><s:property value="%{fullTextLine}" /></s:param> - <s:param name="order" value="%{order}"/> - <s:param name="first" value="%{first}"/> - </s:url> - <s:a href="%{editBookmark}"> - <s:text name="bow.rightMenu.addUrl.link" /> - </s:a> </li> </ul> <!--div id="nuage"--> diff --git a/bow-ui/src/main/webapp/css/bookmark.css b/bow-ui/src/main/webapp/css/bookmark.css index e6548df..53f3128 100644 --- a/bow-ui/src/main/webapp/css/bookmark.css +++ b/bow-ui/src/main/webapp/css/bookmark.css @@ -9,61 +9,53 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ #page{ - background-color:#9EDCF8; - float:left; - left:77%; - position:relative; - width:100%; - margin-bottom:50px; + margin: 15px 0 50px 0; } #header{ - background:#fff url('../img/fondhead.jpg') repeat-x 0 0; - float:left; - position:absolute; - right:85%; - top:0; - height:100px; + background:#fff; + height:30px; width:100%; + box-shadow: 0px 2px 5px rgba(0,0,0,0.05); } #header a.logo{ - background:transparent url('../img/logobow.jpg') repeat scroll 0 0; + background: transparent url('../img/logobow.png') no-repeat scroll 0 0; display:block; - height:100px; + height:25px; text-indent:-99999px; - width:290px; + width:50px; float:left; - left:8%; + margin-left:8%; position:relative; + border: 0; +} + +#header a { + color: #888888; + border-bottom: 2px solid #804561; + text-decoration: none; } #main{ - margin-top:120px; - float:left; - position:relative; - right:69%; - width:59%; clear:both; } .content{ - width:100%; - float:left; - background-color:#fff; - margin-bottom: 25px; + width:90%; + margin: 0 auto; } #side { @@ -72,12 +64,15 @@ position:relative; right:73%; width:27%; + display: none; /* FIXME LK : side to remove*/ } .bookmark{ width:100%; height:auto; - word-wrap:break-word; + clear: both; + background-color: #f3f6f9; + margin: 10px 0; } .spacemax { @@ -90,33 +85,9 @@ float:left; } -.bookmark .bookmarkhead{ - width:100%; - height:32px; - background-color:#bf8a9c; - border-bottom: 0 solid #9EDCF8; - position:relative; - clear:both; -} - -.bookmark .bookmarkcontenu{ - clear:both; - padding-top:5px; - padding-right: 152px; -} -.bookmark .bookmarkhead .date{ - color:#fff; - font-size:10px; - float:left; - margin-top:10px; -} .bookmark .bookmarkhead .screenshotLink{ - position:absolute; - margin-top: 10px; - top:0; - right:64px; width:31px; height:32px; background:url('../img/camera.png') no-repeat; @@ -126,40 +97,23 @@ background:url('../img/edit.jpg') no-repeat; width:31px; height:32px; - position:absolute; - top:0; - right:32px; } .bookmark .bookmarkhead .supprim{ background:url('../img/croix.jpg') no-repeat; width:31px; height:32px; - position:absolute; - top:0; - right:0; } .bookmark .bookmarkhead a{ color:#FFF; font-weight:bold; font-size:14px; - line-height:32px; - /*padding-left:40px;*/ - /*background:url('../img/ptit-livre.jpg') no-repeat;*/ - height:32px; display:block; text-decoration:none; - float:left; - margin-right:3%; - margin-left:3%; } .bookmark .bookmarkhead .alias{ - float:left; - margin-right:15px; - display:block; - /* background:url('../img/ptit-livre.jpg') no-repeat; */ } .bookmark .screenshot{ @@ -171,19 +125,13 @@ } .bookmark .description{ - float:left; margin:5px 5px; color:#999999; font-size:12px; position: relative; width: 100%; - top:-80px; - left: 100px; } -.bookmark .description h3{ - color:#88516c; -} .bookmark .description .tags{ color:#88516c; @@ -203,13 +151,7 @@ } .bookmark .click{ - background:transparent url('../img/click.jpg') no-repeat scroll 0 0; float:right; - height:27px; - margin:10px -25px 5px 5px; - padding-top:31px; - position:relative; - right:-120px; width:31px; text-align:center; } @@ -219,42 +161,15 @@ padding-left: 5px; } -#logoutDiv{ - float:right; - position:relative; - right:67%; - width:33%; - background:#BF8A9C url('../img/moyen-livre.jpg') no-repeat scroll 7% 44%; - height:100px; -} - -#logoutDiv a.help{ +a.help{ background:transparent url('../img/aide.jpg') no-repeat scroll 0 0; display:block; height:34px; text-indent:-99999px; width:34px; - margin-left:15%; - margin-top:12%; float:left; } -#logoutDiv form input{ - background:transparent url('../img/fondbouton.jpg') repeat-x scroll 0 0; - border:medium none; - color:#9C7186; - font-size:12px; - font-weight:bold; - height:27px; - line-height:27px; - display:block; - text-decoration:none; - text-align:center; - width:100px; - float:left; - margin-left:25%; - margin-top:6%; -} #side #colonneD{ font-size:14px; @@ -528,7 +443,7 @@ } #adminActions li a{ - text-decoration:none; + text-decoration:none; color:#804561; font-size:11px; font-weight:bold; diff --git a/bow-ui/src/main/webapp/css/connexion.css b/bow-ui/src/main/webapp/css/connexion.css index 75c64ee..8cdc29c 100644 --- a/bow-ui/src/main/webapp/css/connexion.css +++ b/bow-ui/src/main/webapp/css/connexion.css @@ -9,31 +9,32 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ #header{ - background:#FFFFFF url('../img/fondhead.jpg') repeat-x; + background:#FFFFFF; width:100%; float:left; - height:100px; + height:30px; clear:both; margin:0 auto; position:absolute; + box-shadow: 0px 2px 5px rgba(0,0,0,0.05); } #header a.logo{ - background:transparent url('../img/logobow.jpg') repeat scroll 0 0; + background:transparent url('../img/logobow.png') no-repeat scroll 0 0; display:block; - height:100px; + height:25px; text-indent:-99999px; width:290px; float:left; diff --git a/bow-ui/src/main/webapp/css/global.css b/bow-ui/src/main/webapp/css/global.css index a32c92d..f3ce2c9 100644 --- a/bow-ui/src/main/webapp/css/global.css +++ b/bow-ui/src/main/webapp/css/global.css @@ -9,12 +9,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% @@ -26,21 +26,33 @@ } body{ - font-size:10px; + font-size:12px; font-family:Verdana, Arial, Helvetica, sans-serif; } .clearfix{ - height:1%; } -.clearfix:after{ +/*.clearfix:after{ content:"."; height:0; line-height:0; display:block; visibility:hidden; clear:both; +}*/ + +.clearfix:before, +.clearfix:after { + content:""; + display:table; +} +.clearfix:after { + clear:both; +} + +.clear { + clear: both; } .left{ @@ -51,9 +63,26 @@ body{ float:right; } -.recherche{ - padding-top:20px; - padding-right:15%; +a { + color: #804561; + text-decoration: none; +} + +.recherche .input { + float: left; +} + +.user { + background: #CCC; +} + +.user a { + color: #888; + border-color: #888; +} + +.user #logout { + float: left; } /* #header .input{ @@ -84,28 +113,22 @@ textarea{ overflow-y:visible; position:relative; width:100%; - background-color:#9EDCF8; + background-color:#fafbfc; } #main .menu{ - width:90%; - height:35px; - background:#804561 url('../img/pointemenu.jpg') no-repeat right; - margin-bottom:15px; - padding:0 40px; - line-height:35px; + margin: 0 auto; clear:both; + border-bottom: 2px solid #804561; + text-align: center; } -#main div[class="menu clearfix"] h2{ - color:#9edcf8; - font-size:18px; - font-weight:normal; - float:left; + +#main .counter { + } #main .menu form{ - float:right; color:#9edcf8; font-size:12px; } @@ -143,7 +166,7 @@ textarea{ .errorMessage{ font-weight:normal; font-size:12px; - color:red; + color:red; } #actionmessageHeader{ @@ -165,13 +188,8 @@ textarea{ } .fond { - -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#dbdbdb'); - background-image: -moz-linear-gradient(top, #fff, #dbdbdb); - background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#dbdbdb)); + background: #E0EDF3; - -webkit-border-radius: 0.5em; - -moz-border-radius: 0.5em; - padding:10px; } diff --git a/bow-ui/src/main/webapp/img/logobow.png b/bow-ui/src/main/webapp/img/logobow.png new file mode 100644 index 0000000..19e350b Binary files /dev/null and b/bow-ui/src/main/webapp/img/logobow.png differ -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.