This is an automated email from the git hooks/post-receive script. New commit to branch refonteUI-2017 in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit d33bb6e2f7c80c1b699cdc988b178db40daa4955 Author: kaufmann <kaufmann@codelutin.com> Date: Wed Feb 5 17:32:27 2020 +0100 Modifications d'affichage générales --- bow-ui/src/main/less/base/_header.less | 8 ++- bow-ui/src/main/less/base/_layout.less | 2 + bow-ui/src/main/less/base/_sidebar.less | 7 +-- bow-ui/src/main/less/common/_bookmark-grid.less | 2 +- bow-ui/src/main/less/common/_bookmark-list.less | 4 +- bow-ui/src/main/less/common/_bookmark.less | 35 ++++++++--- bow-ui/src/main/less/common/_form.less | 5 +- bow-ui/src/main/less/common/_notifications.less | 2 +- bow-ui/src/main/less/variables/_colors.less | 29 +++------ bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp | 68 +++++++++++----------- bow-ui/src/main/webapp/WEB-INF/jsp/inc/sidebar.jsp | 13 ----- 11 files changed, 89 insertions(+), 86 deletions(-) diff --git a/bow-ui/src/main/less/base/_header.less b/bow-ui/src/main/less/base/_header.less index 585e6e6..8811943 100644 --- a/bow-ui/src/main/less/base/_header.less +++ b/bow-ui/src/main/less/base/_header.less @@ -5,17 +5,21 @@ height: @default-header-height; + border-bottom: 1px solid #EEE; + & > a, & > div { flex: 1; height: 100%; + + padding: @default-marge--medium; } &.empty { height: @default-header-height; - background-color: @color-sidebar-background; + background-color: @color-background-sidebar; .header-logo { text-align: center; @@ -28,8 +32,6 @@ } .header-logo { - padding: @default-marge--medium; - text-align: left; } diff --git a/bow-ui/src/main/less/base/_layout.less b/bow-ui/src/main/less/base/_layout.less index 0974156..f19adf8 100644 --- a/bow-ui/src/main/less/base/_layout.less +++ b/bow-ui/src/main/less/base/_layout.less @@ -23,5 +23,7 @@ body{ } h1 { + margin-bottom: @default-marge--medium; + margin-top: @default-marge--small; color: @color-main; } \ No newline at end of file diff --git a/bow-ui/src/main/less/base/_sidebar.less b/bow-ui/src/main/less/base/_sidebar.less index 2c66ca1..b96daef 100644 --- a/bow-ui/src/main/less/base/_sidebar.less +++ b/bow-ui/src/main/less/base/_sidebar.less @@ -13,12 +13,11 @@ position: fixed; width: @default-sidebar-width; - height: @default-sidebar-width; + height: @default-header-height; padding: 20px; text-align: center; - color: @color-text-on-color; background-color: #FFF; border-right: 1px solid #EEE; @@ -31,9 +30,9 @@ justify-content: space-between; height: 100%; - padding-top: @default-sidebar-width; + padding-top: @default-header-height; - background-color: @color-sidebar-background; + background-color: @color-background-sidebar; } .sidebar-menu-link { diff --git a/bow-ui/src/main/less/common/_bookmark-grid.less b/bow-ui/src/main/less/common/_bookmark-grid.less index c4a218e..bde4607 100644 --- a/bow-ui/src/main/less/common/_bookmark-grid.less +++ b/bow-ui/src/main/less/common/_bookmark-grid.less @@ -77,7 +77,7 @@ position: absolute; left: 0; top: 0; - background: @color-sidebar-background; + background: @color-background-sidebar; width: 100%; height: 100%; border-radius: 0 0 5px 5px; diff --git a/bow-ui/src/main/less/common/_bookmark-list.less b/bow-ui/src/main/less/common/_bookmark-list.less index 956880e..a152af0 100644 --- a/bow-ui/src/main/less/common/_bookmark-list.less +++ b/bow-ui/src/main/less/common/_bookmark-list.less @@ -7,6 +7,8 @@ justify-content: center; align-items: center; + margin-bottom: @default-marge--small * 2; + background-color: @color-bookmark-background; border: 1px solid #EEE; @@ -24,7 +26,7 @@ } .bookmark-icon { - width: 60px; + width: 70px; text-align: center; } diff --git a/bow-ui/src/main/less/common/_bookmark.less b/bow-ui/src/main/less/common/_bookmark.less index a7ef4eb..d6b85b4 100644 --- a/bow-ui/src/main/less/common/_bookmark.less +++ b/bow-ui/src/main/less/common/_bookmark.less @@ -14,6 +14,11 @@ } } +.cloud-tag { + margin-left: @default-marge--tiny; + margin-right: @default-marge--tiny; +} + .bookmarks-tags-cloud--selected { padding-top: @default-marge--small; padding-bottom: @default-marge--small; @@ -21,6 +26,8 @@ background: lighten(@color-background-tag-cloud, 5%); border-bottom: none; + color: #FFF; + text-align: center; } #bookmarks-display-settings { @@ -32,15 +39,20 @@ margin-top: @default-marge--medium; padding: @default-marge--small; - background: #1e2a2f0d; // @color-bookmark-header-background; - border: 1px solid #1e2a2f11; + background: @color-bookmarks-header; + border: 1px solid @color-separation-border; color: @color-text; position: relative; text-align: center; font-size: 130%; - .icon.active { - color: @color-link-active; + .icon { + opacity: 0.5; + + &.active { + color: @color-link-active; + opacity: 1; + } } & > div { flex: 1; @@ -79,17 +91,17 @@ .bookmark-title { color: @color-bookmark-title; - font-weight: bold; font-size: 120%; } .bookmark-link { color: inherit; + font-weight: bold; } .bookmark-favicon { - width: 16px; - height: 16px; + width: 20px; + height: 20px; margin-right: @default-marge--small; } @@ -110,5 +122,14 @@ .pagination { + margin: @default-marge--medium; text-align: center; + + .current { + margin: @default-marge--medium @default-marge--small; + padding: (@default-marge--small / 2) @default-marge--small; + + background-color: @color-bookmarks-header; + border: 2px solid transparent; + } } diff --git a/bow-ui/src/main/less/common/_form.less b/bow-ui/src/main/less/common/_form.less index 12d5c36..8636b0d 100644 --- a/bow-ui/src/main/less/common/_form.less +++ b/bow-ui/src/main/less/common/_form.less @@ -8,7 +8,8 @@ margin: @default-marge--small auto @default-marge--large auto; } -label { +label, +.label { color: @color-form-label; font-style: normal; } @@ -39,7 +40,7 @@ label { padding: @default-marge--small @default-marge--small; background-color: transparent; - border: 1px solid @color-separation-border; + border: 1px solid @color-form-input-border; border-radius: 3px; &:focus { diff --git a/bow-ui/src/main/less/common/_notifications.less b/bow-ui/src/main/less/common/_notifications.less index 9fae669..e9e9b0d 100644 --- a/bow-ui/src/main/less/common/_notifications.less +++ b/bow-ui/src/main/less/common/_notifications.less @@ -1,6 +1,6 @@ #msg { position: fixed; - top: @default-sidebar-width + 20px; + top: @default-header-height + 20px; right : 20px; } .error{ diff --git a/bow-ui/src/main/less/variables/_colors.less b/bow-ui/src/main/less/variables/_colors.less index ead63c1..c5e7f27 100644 --- a/bow-ui/src/main/less/variables/_colors.less +++ b/bow-ui/src/main/less/variables/_colors.less @@ -6,41 +6,30 @@ @color-blue : #0a3d62; @color-blue-pale : #E9F2F5; -@col-purple : #804561; -@col-purple-bright : #f390bf; -@col-blue : #7DBED2; -@col-blue-dark : darken(@col-blue, 25%); -@col-grey-medium : #DDD; -@col-grey-pale : #f9f5f7; +@color-main : @color-green; @color-background : #FFF; +@color-background-sidebar : @color-black; @color-background-tag-cloud : @color-blue; @color-background-list-odd : @color-blue-pale; @color-background-list-even : darken(@color-blue-pale, 5%); -@color-main : @color-green; - -@color-sidebar-background : @color-black; -@color-menu-link : #FFF;//@color-grey; +@color-menu-link : #FFF; @color-menu-link-hover : @color-red; - @color-link : @color-main; @color-link-hover : @color-red; //darken(@color-green, 25%); @color-link-active : darken(@color-red, 25%); @color-button-border-1 : @color-main; @color-button-border-2 : @color-green-2; +@color-bookmark-background : mix(#FFF, @color-main, 98%); +@color-bookmark-title : @color-black; +@color-bookmarks-header : #F3F4F4; -@color-form-label : @color-black; - -@color-separation-border : @color-grey; +@color-form-label : lighten(@color-black, 25%); +@color-form-input-border : @color-grey; +@color-separation-border : #EEE; @color-text : @color-black; -@color-text-on-color : #FFF; - -@color-bookmark-header-background : #083f6729; -@color-bookmark-background : mix(#FFF, @color-main, 95%); -@color-bookmark-title : @color-black; -@color-bookmark-shadow : @color-black; 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 2b7d475..7fc2866 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp @@ -78,44 +78,44 @@ </s:iterator> </s:else> - </div> - <div class="pagination"> - <s:if test="first - bowSession.user.bookmarks >= 0"> - <s:url var="prev" action="home"> - <s:param name="tagLine" value="%{tagLine}" /> - <s:param name="fullTextLine" value="%{fullTextLine}" /> - <s:param name="order" value="%{order}"/> - <s:param name="first" value="%{first - bowSession.user.bookmarks}"/> - </s:url> - <s:a href="%{prev}"><<</s:a> - </s:if> + <div class="pagination"> + <s:if test="first - bowSession.user.bookmarks >= 0"> + <s:url var="prev" action="home"> + <s:param name="tagLine" value="%{tagLine}" /> + <s:param name="fullTextLine" value="%{fullTextLine}" /> + <s:param name="order" value="%{order}"/> + <s:param name="first" value="%{first - bowSession.user.bookmarks}"/> + </s:url> + <s:a href="%{prev}" class="button"><<</s:a> + </s:if> - <span class="current"> - <s:property value="%{first+1}"/>-<s:property value="%{first + bowSession.user.bookmarks}"/> - </span> + <span class="current"> + <s:property value="%{first+1}"/> - <s:property value="%{first + bowSession.user.bookmarks}"/> + </span> - <s:if test="first + bowSession.user.bookmarks < searchResult.bookmarkCount"> - <s:url var="next" action="home"> - <s:param name="tagLine" value="%{tagLine}" /> - <s:param name="fullTextLine" value="%{fullTextLine}" /> - <s:param name="order" value="%{order}"/> - <s:param name="first" value="%{first + bowSession.user.bookmarks}"/> - </s:url> - <s:a href="%{next}">>></s:a> - </s:if> - </div> + <s:if test="first + bowSession.user.bookmarks < searchResult.bookmarkCount"> + <s:url var="next" action="home"> + <s:param name="tagLine" value="%{tagLine}" /> + <s:param name="fullTextLine" value="%{fullTextLine}" /> + <s:param name="order" value="%{order}"/> + <s:param name="first" value="%{first + bowSession.user.bookmarks}"/> + </s:url> + <s:a href="%{next}" class="button">>></s:a> + </s:if> + </div> - <div id="bookmarks-tags-edition"> - <s:set name="bookmarksToDelete" value="%{searchResult.bookmarkCount}" /> - <s:if test="%{#bookmarksToDelete > 0}"> - <s:url var="deleteSearchResults" action="deleteSearchResults" escapeAmp="false"> - <s:param name="tagLine" value="%{tagLine}" /> - <s:param name="fullTextLine" value="%{fullTextLine}" /> - <s:param name="order" value="%{order}"/> - </s:url> - <s:a id="deleteSearchResultsButton" title="delete all" href="" onclick="deleteConfirmation('%{deleteSearchResults}', %{#bookmarksToDelete}); return(false);" cssClass="button">Tout supprimer</s:a> - </s:if> + <div id="bookmarks-tags-edition" class="buttons-group"> + <s:set name="bookmarksToDelete" value="%{searchResult.bookmarkCount}" /> + <s:if test="%{#bookmarksToDelete > 0}"> + <s:url var="deleteSearchResults" action="deleteSearchResults" escapeAmp="false"> + <s:param name="tagLine" value="%{tagLine}" /> + <s:param name="fullTextLine" value="%{fullTextLine}" /> + <s:param name="order" value="%{order}"/> + </s:url> + <s:a id="deleteSearchResultsButton" title="delete all" href="" onclick="deleteConfirmation('%{deleteSearchResults}', %{#bookmarksToDelete}); return(false);" cssClass="button">Tout supprimer</s:a> + </s:if> + </div> </div> </body> </html> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/sidebar.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/sidebar.jsp index 1cd71e9..fe9409d 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/sidebar.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/sidebar.jsp @@ -71,12 +71,6 @@ </div> <s:if test="!bowSession.user.extensionNames.contains('BowSharedUser')"> - <div class="sidebar-menu-link"> - <s:a action="preferences"> - <i class="icon-preferences icon"></i> - </s:a> - </div> - <s:if test="bowSession.admin"> <div class="sidebar-menu-link"> <s:a action="fragment/callStatistic" title="CallStatistic"> @@ -90,13 +84,6 @@ </s:a> </div> </s:if> - - <div class="sidebar-menu-link"> - <s:url var="logout" action="logout" escapeAmp="true" /> - <s:a href="%{logout}" class="sidebar-menu-link" title="Deconnexion"> - <span class="icon icon-logout"></span> - </s:a> - </div> </s:if> </div> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.