This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 6cd9f577c76119026c231dad7e8d43080d2b1248 Author: Kevin Morin <morin@codelutin.com> Date: Mon Sep 18 17:17:27 2017 +0200 fixes #113 fil d'ariane dans les listes de votant --- .../main/web/tag/favoriteList/FavoriteList.tag.html | 19 +++++++++---------- .../main/web/tag/favoriteList/FavoriteLists.tag.html | 4 ---- .../src/main/web/tag/voterList/VoterList.tag.html | 4 ++-- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteList.tag.html b/pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteList.tag.html index cf8fd4f8..2f5ccfcc 100644 --- a/pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteList.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteList.tag.html @@ -11,16 +11,12 @@ require("../components/LoadingCard.tag.html"); <div show="{loaded}"> - <ol class="c-breadcrumbs"> - <li class="c-breadcrumbs__crumb"> - <a class="c-link" href="#favoriteLists"> - {__.title} - </a> - </li> - <li class="c-breadcrumbs__crumb c-text--loud">{favoriteList.name}</li> - </ol> - - <h1>{favoriteList.name}</h1> + <h1> + <a class="c-link" href="#favoriteLists"> + {__.title} / + </a> + {favoriteList.name} + </h1> <div class="main-content"> <div class="c-alert c-alert--info"> @@ -210,6 +206,9 @@ require("../components/LoadingCard.tag.html"); </script> <style> + h1 .c-link { + font-weight: normal; + } .elements { display: flex; diff --git a/pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteLists.tag.html b/pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteLists.tag.html index dbe9237c..78cb2c99 100644 --- a/pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteLists.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteLists.tag.html @@ -8,10 +8,6 @@ require("./FavoriteListEditModal.tag.html"); <div class="container" > - <ol class="c-breadcrumbs"> - <li class="c-breadcrumbs__crumb c-text--loud">{__.title}</li> - </ol> - <div show="{loaded}"> <h1>{__.title}</h1> diff --git a/pollen-ui-riot-js/src/main/web/tag/voterList/VoterList.tag.html b/pollen-ui-riot-js/src/main/web/tag/voterList/VoterList.tag.html index eb45e0c0..1cf69dd8 100644 --- a/pollen-ui-riot-js/src/main/web/tag/voterList/VoterList.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/voterList/VoterList.tag.html @@ -7,14 +7,14 @@ require("./ImportFavoritListModal.tag.html"); require("../components/ContextualMenu.tag.html"); <VoterList> - <ol class="c-breadcrumbs"> + <ol class="c-breadcrumbs" if="{opts.form.currentVoterList.parentId}"> <li class="c-breadcrumbs__crumb" each={list, index in getVoterListsStack()}> <a class="c-link" onclick={parent.setCurrent(list)}> {index === 0 ? parent.__.main_list : list.name} </a> </li> <li class="c-breadcrumbs__crumb c-text--loud"> - {opts.form.currentVoterList.parentId ? opts.form.currentVoterList.name : __.main_list} + {opts.form.currentVoterList.name} </li> </ol> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.