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 28e92bd72b42d10bfff8f183fbd1f9bb1a5a570d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Apr 18 15:22:52 2018 +0200 fix #203 : lien vers liberapay --- pollen-ui-riot-js/src/main/web/css/custom.css | 3 +++ pollen-ui-riot-js/src/main/web/css/main.css | 18 ++++++++++++++++++ pollen-ui-riot-js/src/main/web/i18n/en.json | 2 ++ pollen-ui-riot-js/src/main/web/i18n/fr.json | 2 ++ .../src/main/web/tag/PollenHeader.tag.html | 16 +++++++++++----- 5 files changed, 36 insertions(+), 5 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/css/custom.css b/pollen-ui-riot-js/src/main/web/css/custom.css index ecd2d8a5..e696ce18 100644 --- a/pollen-ui-riot-js/src/main/web/css/custom.css +++ b/pollen-ui-riot-js/src/main/web/css/custom.css @@ -118,4 +118,7 @@ --list-alternate-row: #f3f3f3; --hatching: #f3f3f3; + + --liberapay-background: #f6c915; + --liberapay-color: #1a171b; } diff --git a/pollen-ui-riot-js/src/main/web/css/main.css b/pollen-ui-riot-js/src/main/web/css/main.css index 8d7aefcc..3acb9bf2 100644 --- a/pollen-ui-riot-js/src/main/web/css/main.css +++ b/pollen-ui-riot-js/src/main/web/css/main.css @@ -579,3 +579,21 @@ pollenfooter a:hover { margin-left: 0; margin-right: 0; } + +.liberapay-btn { + background-color: var(--liberapay-background); + border-radius: 4px; + color: var(--liberapay-color); + display: inline-block; + font-family: Helvetica Neue,Helvetica,sans-serif; + font-size: 14px; + font-weight: 700; + line-height: 22px; + padding: 5px 7px 3px; + position: relative; + text-decoration: none; +} + +.liberapay-btn svg g { + fill: var(--liberapay-color); +} diff --git a/pollen-ui-riot-js/src/main/web/i18n/en.json b/pollen-ui-riot-js/src/main/web/i18n/en.json index 9440c900..9a96b36f 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -249,6 +249,8 @@ "header_createDatePoll": "New date poll", "header_feedback": "Bug, observation ?", "header_newPoll" : "New poll", + "header_supportUs" : "Support us", + "header_supportUsAlt" : "Donate using Liberapay", "poll_cancel": "Cancel", "poll_description_next": "Next", "poll_description_info": "Information", diff --git a/pollen-ui-riot-js/src/main/web/i18n/fr.json b/pollen-ui-riot-js/src/main/web/i18n/fr.json index 72288b4b..1a7155ad 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -249,6 +249,8 @@ "header_createDatePoll": "Nouveau sondage de dates", "header_feedback": "Un bug, une remarque ?", "header_newPoll" : "Nouveau sondage", + "header_supportUs" : "Nous soutenir", + "header_supportUsAlt" : "Faire un don sur Liberapay", "poll_cancel": "Annuler", "poll_description_next": "Suivant", "poll_description_info": "Informations", diff --git a/pollen-ui-riot-js/src/main/web/tag/PollenHeader.tag.html b/pollen-ui-riot-js/src/main/web/tag/PollenHeader.tag.html index 145b8461..e0ecd71b 100644 --- a/pollen-ui-riot-js/src/main/web/tag/PollenHeader.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/PollenHeader.tag.html @@ -26,6 +26,15 @@ require("./components/Avatar.tag.html"); <PollenHeader> <a class="header-home instance-title" href="#" target="_top"></a> + <a class="liberapay-btn" href="https://{session.locale}.liberapay.com/pollen/donate"> + <svg viewBox="0 0 80 80" height="16" width="16" alt={__.supportUsAlt}> + <g transform="translate(-78.37-208.06)"> + <path d="m104.28 271.1c-3.571 0-6.373-.466-8.41-1.396-2.037-.93-3.495-2.199-4.375-3.809-.88-1.609-1.308-3.457-1.282-5.544.025-2.086.313-4.311.868-6.675l9.579-40.05 11.69-1.81-10.484 43.44c-.202.905-.314 1.735-.339 2.489-.026.754.113 1.421.415 1.999.302.579.817 1.044 1.546 1.395.729.353 1.747.579 3.055.679l-2.263 9.278"></path> + <path d="m146.52 246.14c0 3.671-.604 7.03-1.811 10.07-1.207 3.043-2.879 5.669-5.01 7.881-2.138 2.213-4.702 3.935-7.693 5.167-2.992 1.231-6.248 1.848-9.767 1.848-1.71 0-3.42-.151-5.129-.453l-3.394 13.651h-11.162l12.52-52.19c2.01-.603 4.311-1.143 6.901-1.622 2.589-.477 5.393-.716 8.41-.716 2.815 0 5.242.428 7.278 1.282 2.037.855 3.708 2.024 5.02 3.507 1.307 1.484 2.274 3.219 2.904 5.205.627 1.987.942 4.11.942 6.373m-27.378 15.461c.854.202 1.91.302 3.167.302 1.961 0 3.746-.3 [...] + </g> + </svg> + <span class="action-label">{__.supportUs}</span> + </a> <div class="header-actions"> <div if={canCreatePoll}> @@ -181,17 +190,14 @@ require("./components/Avatar.tag.html"); } @media (max-width: 640px) { - .user-name { + .user-name, + .action-label { display: none; } .header-home { margin-left: 10px; } - - .action-label { - display: none; - } } </style> </PollenHeader> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.