This is an automated email from the git hooks/post-receive script. New commit to branch feature/253-tuiles in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 00d5cb81fba22bd017ee03aa3ed900ed78a020e2 Author: jcouteau <couteau@codelutin.com> Date: Wed Mar 11 14:59:12 2020 +0100 MAJ Avatar et LetterAvatar - Mise en paramètre de taille et taille de police --- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 4 +++- pollen-ui-riot-js/src/main/web/tag/PollenHeaderReboot.tag.html | 7 ++++++- .../src/main/web/tag/admin/UserEditModal.tag.html | 2 +- pollen-ui-riot-js/src/main/web/tag/components/Avatar.tag.html | 10 ++++------ pollen-ui-riot-js/src/main/web/tag/components/Card.tag.html | 4 ++-- .../src/main/web/tag/components/LetterAvatar.tag.html | 9 ++++----- pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html | 2 +- pollen-ui-riot-js/src/main/web/tag/poll/Participants.tag.html | 2 +- pollen-ui-riot-js/src/main/web/tag/poll/PollCard.tag.html | 2 +- .../src/main/web/tag/poll/PollCardReboot.tag.html | 2 +- 10 files changed, 24 insertions(+), 20 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html b/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html index b7ecf95b..9fbb0eaa 100644 --- a/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html @@ -52,6 +52,7 @@ import "./popup/ChoiceDetailModal.tag.html"; import "./popup/AddReportModal.tag.html"; import "./popup/ShowReportsModal.tag.html"; <Pollen class="body-wrapper colors-default"> + <PollenHeaderReboot/> <ConfirmPopup/> <ConfirmPopupReboot/> <InformationPopup/> @@ -310,6 +311,8 @@ import "./popup/ShowReportsModal.tag.html"; <!-- <PollenFooter/>--> <PollenMessageManager/> +</div> +</div> <script type="es6"> import session from "../js/Session"; @@ -380,7 +383,6 @@ import "./popup/ShowReportsModal.tag.html"; <style> - .body-content > div { height: 100%; } diff --git a/pollen-ui-riot-js/src/main/web/tag/PollenHeaderReboot.tag.html b/pollen-ui-riot-js/src/main/web/tag/PollenHeaderReboot.tag.html index 7fa07352..817f08ce 100644 --- a/pollen-ui-riot-js/src/main/web/tag/PollenHeaderReboot.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/PollenHeaderReboot.tag.html @@ -31,7 +31,7 @@ import "./components/Avatar.tag.html"; </div> <div class="profileItem"> <a if="{user}" href="#user/profile" class="link {selectedMenu === 'userProfile' ? 'selected' : ''}"> - <Avatar class="avatar" avatar={user.avatar} name={user.name} rounded="true"/><span>{_t.myProfile}</span> + <Avatar class="avatar" avatar={user.avatar} name={user.name} rounded="true" size="50px" font-size="2.5em"/><span>{_t.myProfile}</span> </a> </div> <div class="menuItem"> @@ -158,6 +158,11 @@ import "./components/Avatar.tag.html"; display: flex; align-items: center; } + + .pollen-header a { + color: var(--White); + text-decoration:none; + } .pollen-header a.link:hover { background-color:var(--Elm); diff --git a/pollen-ui-riot-js/src/main/web/tag/admin/UserEditModal.tag.html b/pollen-ui-riot-js/src/main/web/tag/admin/UserEditModal.tag.html index c784f08e..9a32cac2 100644 --- a/pollen-ui-riot-js/src/main/web/tag/admin/UserEditModal.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/admin/UserEditModal.tag.html @@ -30,7 +30,7 @@ import "../components/UserEmailAddressList.tag.html"; <div class="modal-content"> <div class="column avatar"> <div class="user-avatar"> - <Avatar avatar="{parent.opts.user.avatar}" name={parent.opts.user && parent.opts.user.name || ""} rounded="true"/> + <Avatar avatar="{parent.opts.user.avatar}" name={parent.opts.user && parent.opts.user.name || ""} rounded="true" size="30px" font-size="1.7em"/> </div> <button if="{parent.opts.user.avatar}" onclick="{parent.deleteAvatar}" diff --git a/pollen-ui-riot-js/src/main/web/tag/components/Avatar.tag.html b/pollen-ui-riot-js/src/main/web/tag/components/Avatar.tag.html index 3cf34d15..e1e9b575 100644 --- a/pollen-ui-riot-js/src/main/web/tag/components/Avatar.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/components/Avatar.tag.html @@ -20,9 +20,9 @@ --> import "./LetterAvatar.tag.html"; <Avatar> - <LetterAvatar class="avatar-letter" name={opts.name} rounded={opts.rounded} if={!opts.avatar} /> + <LetterAvatar class="avatar-letter" name={opts.name} rounded={opts.rounded} size={opts.size} fontSize={opts.fontSize} if={!opts.avatar} /> - <img class="avatar-avatar {rounded: opts.rounded}" if="{opts.avatar}" + <img class="avatar-avatar {rounded: opts.rounded}" style="width: {opts.size}; height: {opts.rounded};" if="{opts.avatar}" src="{resourceService.getPreviewUrl(opts.avatar, true)}" show={opts.avatar} alt="{_t.avatar}"> @@ -39,12 +39,10 @@ import "./LetterAvatar.tag.html"; </script> <style> - .avatar-avatar { - width: 30px; - height: 30px; + border: 1px solid #FFFFFF; + box-sizing: border-box; } - .avatar-avatar.rounded { border-radius: 100%; } diff --git a/pollen-ui-riot-js/src/main/web/tag/components/Card.tag.html b/pollen-ui-riot-js/src/main/web/tag/components/Card.tag.html index b15a2c3f..e823b5f5 100644 --- a/pollen-ui-riot-js/src/main/web/tag/components/Card.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/components/Card.tag.html @@ -38,11 +38,11 @@ import "./Avatar.tag.html"; <div class="card-content"> <div if={!opts.href && !opts.onletterclick} class="card-avatar"> - <Avatar avatar={opts.avatar} name={opts.name} rounded="true"/> + <Avatar avatar={opts.avatar} name={opts.name} rounded="true" size="30px" fontSize="1.7em"/> </div> <a if={opts.href || opts.onletterclick} href={opts.href} onclick={opts.onletterclick} class="card-avatar"> - <Avatar avatar={opts.avatar} name={opts.name} rounded="true"/> + <Avatar avatar={opts.avatar} name={opts.name} rounded="true" size="30px" fontSize="1.7em"/> </a> <div class="card-name" title={opts.name}> diff --git a/pollen-ui-riot-js/src/main/web/tag/components/LetterAvatar.tag.html b/pollen-ui-riot-js/src/main/web/tag/components/LetterAvatar.tag.html index 7c875c9f..2086dc3e 100644 --- a/pollen-ui-riot-js/src/main/web/tag/components/LetterAvatar.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/components/LetterAvatar.tag.html @@ -19,8 +19,8 @@ #L% --> <LetterAvatar onresize={redraw}> - <svg style="background: {backgroundColor}" class="svg {rounded: opts.rounded}"> - <text x="50%" y="50%" text-anchor="middle" dominant-baseline="central" class="letter"> + <svg style="background: {backgroundColor}; width:{opts.size}; height:{opts.size};" class="svg {rounded: opts.rounded}"> + <text x="50%" y="50%" text-anchor="middle" dominant-baseline="central" class="letter" style="font-size: {opts.fontSize}"> {avatarLetter} </text> </svg> @@ -56,9 +56,9 @@ <style> .svg { - width: 30px; - height: 30px; border-radius: 0; + border: 1px solid #FFFFFF; + box-sizing: border-box; } .svg.rounded { @@ -68,7 +68,6 @@ .letter { fill: #fff; fontFamily: 'Lucida Console', Monaco, monospace; - fontSize: 1.70em; } </style> diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html index 499be227..0d6e2271 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html @@ -112,7 +112,7 @@ import "./Report.tag.html"; <div class="separator-bottom"> <div if={parent.parent.commentEditing !== element} class="comment"> <div class="comment-user"> - <Avatar class="comment-avatar" avatar={element.authorAvatar} name={element.authorName} rounded="true"/> + <Avatar class="comment-avatar" avatar={element.authorAvatar} name={element.authorName} rounded="true" size="30px" font-size="1.7em"/> <div class="user"> {element.authorName} <Report target={element}/> diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Participants.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Participants.tag.html index 570e435e..7c33db01 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Participants.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Participants.tag.html @@ -44,7 +44,7 @@ </span> </div> <div class="avatar"> - <Avatar avatar={element.avatar} name={element.name} rounded="true"/> + <Avatar avatar={element.avatar} name={element.name} rounded="true" size="30px" font-size="1.7em"/> </div> <div class="name"> {element.name} diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/PollCard.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/PollCard.tag.html index e2c17a59..433555d4 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/PollCard.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/PollCard.tag.html @@ -49,7 +49,7 @@ import "../components/Avatar.tag.html"; </div> <div class="poll-creator" title={opts.poll.creatorName}> - <Avatar class="creator-avatar" avatar={opts.poll.creatorAvatar} name={opts.poll.creatorName} rounded="true"/> + <Avatar class="creator-avatar" avatar={opts.poll.creatorAvatar} name={opts.poll.creatorName} rounded="true" size="30px" font-size="1.7em"/> <div class="creator-name"> {opts.poll.creatorName} <div class="creation-date"> diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/PollCardReboot.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/PollCardReboot.tag.html index 46f28ae4..5d2aeb93 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/PollCardReboot.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/PollCardReboot.tag.html @@ -21,7 +21,7 @@ import "../components/Avatar.tag.html"; <Tooltip position="top" content="{opts.poll.creatorName}"> - <Avatar class="avatar" avatar={parent.opts.poll.creatorAvatar} name={parent.opts.poll.creatorName} rounded="true"/> + <Avatar class="avatar" avatar={parent.opts.poll.creatorAvatar} name={parent.opts.poll.creatorName} rounded="true" size="30px" fontSize="1.7em"/> </Tooltip> <Tooltip position="top" content="{opts.poll.questions[0].voteCount === 0 ? 0 : (opts.poll.questions[0].voteCount)} votes"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.