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 807ce172453e5d8d7ba2d82b6ef1d60799d8bf81 Author: kaufmann <kaufmann@codelutin.com> Date: Tue Feb 4 15:23:02 2020 +0100 Génération de la police d'icônes par script --- .gitignore | 2 + bow-ui/src/main/less/common/_icons.less | 179 +++++++++++------------------ bow-ui/src/main/webapp/font/bow-icons.eot | Bin 8200 -> 5406 bytes bow-ui/src/main/webapp/font/bow-icons.svg | 158 +++++++++++++++++++------ bow-ui/src/main/webapp/font/bow-icons.ttf | Bin 8028 -> 5228 bytes bow-ui/src/main/webapp/font/bow-icons.woff | Bin 8104 -> 3380 bytes doc/icons/Readme.md | 8 ++ doc/icons/flag.svg | 10 ++ doc/icons/fontcustom.sh | 16 +++ doc/icons/fontcustom.yml | 96 ++++++++++++++++ doc/icons/gear.svg | 12 ++ doc/icons/graph.svg | 15 +++ doc/icons/grid.svg | 48 ++++++++ doc/icons/heart.svg | 52 +++++++++ doc/icons/help.svg | 16 +++ doc/icons/list.svg | 51 ++++++++ doc/icons/lock.svg | 12 ++ doc/icons/logout.svg | 65 +++++++++++ doc/icons/lutin.svg | 60 ++++++++++ doc/icons/pencil.svg | 13 +++ doc/icons/photo.svg | 13 +++ doc/icons/preferences.svg | 15 +++ doc/icons/search.svg | 12 ++ doc/icons/settings.svg | 14 +++ doc/icons/share.svg | 11 ++ doc/icons/square-plus.svg | 11 ++ doc/icons/trashcan.svg | 13 +++ doc/icons/user-group.svg | 106 +++++++++++++++++ doc/icons/user.svg | 67 +++++++++++ doc/icons/world.svg | 14 +++ 30 files changed, 942 insertions(+), 147 deletions(-) diff --git a/.gitignore b/.gitignore index eb3f5d5..633facb 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ target/* */*.iml */.idea bow-ui/src/main/webapp/generated-css/ +doc/icons/output +doc/icons/.fontcustom-manifest.json diff --git a/bow-ui/src/main/less/common/_icons.less b/bow-ui/src/main/less/common/_icons.less index 1be8c4b..821ec0b 100644 --- a/bow-ui/src/main/less/common/_icons.less +++ b/bow-ui/src/main/less/common/_icons.less @@ -1,122 +1,81 @@ +/* + Icon Font: bow-icons +*/ + @font-face { - font-family: 'bow-icons'; - src: url('../font/bow-icons.eot?7z7uw9'); - src: url('../font/bow-icons.eot?7z7uw9#iefix') format('embedded-opentype'), - url('../font/bow-icons.ttf?7z7uw9') format('truetype'), - url('../font/bow-icons.woff?7z7uw9') format('woff'), - url('../font/bow-icons.svg?7z7uw9#bow-icons') format('svg'); + font-family: "bow-icons"; + src: url("../font/bow-icons.eot"); + src: url("../font/bow-icons.eot?#iefix") format("embedded-opentype"), + url("../font/bow-icons.woff") format("woff"), + url("../font/bow-icons.ttf") format("truetype"), + url("../font/bow-icons.svg#bow-icons") format("svg"); font-weight: normal; font-style: normal; } -.icon { - /* use !important to prevent issues with browser extensions that change fonts */ - font-family: 'bow-icons' !important; - speak: none; +@media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: "bow-icons"; + src: url("../font/bow-icons.svg#bow-icons") format("svg"); + } +} + +[data-icon]:before { content: attr(data-icon); } + +[data-icon]:before, +.icon-flag:before, +.icon-gear:before, +.icon-graph:before, +.icon-grid:before, +.icon-heart:before, +.icon-help:before, +.icon-list:before, +.icon-lock:before, +.icon-logout:before, +.icon-lutin:before, +.icon-pencil:before, +.icon-photo:before, +.icon-preferences:before, +.icon-search:before, +.icon-settings:before, +.icon-share:before, +.icon-square-plus:before, +.icon-trashcan:before, +.icon-user:before, +.icon-user-group:before, +.icon-world:before { + display: inline-block; + font-family: "bow-icons"; font-style: normal; font-weight: normal; font-variant: normal; - text-transform: none; line-height: 1; - - /* Better Font Rendering =========== */ - -webkit-font-smoothing: antialiased; + text-decoration: inherit; + text-rendering: optimizeLegibility; + text-transform: none; -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + font-smoothing: antialiased; } -.icon-lock:before { - content: "\e91c"; -} -.icon-trashcan:before { - content: "\e91d"; -} -.icon-pencil:before { - content: "\e91e"; -} -.icon-lutin:before { - content: "\e919"; -} -.icon-menu:before { - content: "\e91a"; -} -.icon-heart:before { - content: "\e91b"; -} -.icon-grid:before { - content: "\e917"; -} -.icon-list:before { - content: "\e918"; -} -.icon-stats:before { - content: "\e916"; -} -.icon-admin:before { - content: "\e915"; -} -.icon-bookmark-group:before { - content: "\e90e"; -} -.icon-group:before { - content: "\e911"; -} -.icon-signs:before { - content: "\e913"; -} -.icon-bow_letter_b:before { - content: "\e900"; - //color: #804561; -} -.icon-bow_letter_o:before { - content: "\e901"; - //color: #7dbed2; -} -.icon-bow_letter_w:before { - content: "\e902"; - //color: #7dbed2; -} -.icon-exit:before { - content: "\e903"; -} -.icon-search:before { - content: "\e90d"; -} -.icon-bookmark:before { - content: "\e904"; -} -.icon-bookmark-check:before { - content: "\e905"; -} -.icon-bookmark-minus:before { - content: "\e906"; -} -.icon-bookmark-plus:before { - content: "\e907"; -} -.icon-bookmark-remove:before { - content: "\e908"; -} -.icon-link:before { - content: "\e909"; -} -.icon-mail:before { - content: "\e90a"; -} -.icon-camera:before { - content: "\e90b"; -} -.icon-settings:before { - content: "\e90c"; -} -.icon-tag:before { - content: "\e90f"; -} -.icon-tags:before { - content: "\e910"; -} -.icon-eject:before { - content: "\e912"; -} -.icon-star:before { - content: "\e914"; -} +.icon-flag:before { content: "\f100"; } +.icon-gear:before { content: "\f101"; } +.icon-graph:before { content: "\f102"; } +.icon-grid:before { content: "\f103"; } +.icon-heart:before { content: "\f104"; } +.icon-help:before { content: "\f105"; } +.icon-list:before { content: "\f106"; } +.icon-lock:before { content: "\f107"; } +.icon-logout:before { content: "\f108"; } +.icon-lutin:before { content: "\f109"; } +.icon-pencil:before { content: "\f10a"; } +.icon-photo:before { content: "\f10b"; } +.icon-preferences:before { content: "\f10c"; } +.icon-search:before { content: "\f10d"; } +.icon-settings:before { content: "\f10e"; } +.icon-share:before { content: "\f10f"; } +.icon-square-plus:before { content: "\f110"; } +.icon-trashcan:before { content: "\f111"; } +.icon-user:before { content: "\f112"; } +.icon-user-group:before { content: "\f113"; } +.icon-world:before { content: "\f114"; } diff --git a/bow-ui/src/main/webapp/font/bow-icons.eot b/bow-ui/src/main/webapp/font/bow-icons.eot index 293ce19..7528065 100644 Binary files a/bow-ui/src/main/webapp/font/bow-icons.eot and b/bow-ui/src/main/webapp/font/bow-icons.eot differ diff --git a/bow-ui/src/main/webapp/font/bow-icons.svg b/bow-ui/src/main/webapp/font/bow-icons.svg index 1f7ba06..25df599 100644 --- a/bow-ui/src/main/webapp/font/bow-icons.svg +++ b/bow-ui/src/main/webapp/font/bow-icons.svg @@ -1,41 +1,125 @@ <?xml version="1.0" standalone="no"?> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > +<!-- +2020-1-29: Created. +--> <svg xmlns="http://www.w3.org/2000/svg"> -<metadata>Generated by IcoMoon</metadata> +<metadata> +Created by FontForge 20110222 at Wed Jan 29 10:41:19 2020 + By root +Created by root with FontForge 2.0 (http://fontforge.sf.net) +</metadata> <defs> -<font id="bow-icons" horiz-adv-x="1024"> -<font-face units-per-em="1024" ascent="960" descent="-64" /> -<missing-glyph horiz-adv-x="1024" /> -<glyph unicode=" " horiz-adv-x="512" d="" /> -<glyph unicode="" glyph-name="bow_letter_b" horiz-adv-x="858" d="M42.127 946.796l-0.825-0.13c-6.89-1.305-12.601-3.41-17.185-7.164-2.884-2.362-4.322-5.667-6.128-8.732h-4.792v-920.358l115.679 115.604v-176.817h416.648c103.724 0 179.728 26.674 228.965 78.944s69.871 127.649 69.871 219.892c0 104.801-48.383 181.687-114.52 216.027 28.805 15.758 51.579 39.209 67.144 66.987 23.176 41.36 32.972 90.755 32.972 137.117 0 71.759-18.855 140.548-65.413 191.548s-120.008 82.42-222.959 82.42h-275.25 [...] -<glyph unicode="" glyph-name="bow_letter_o" horiz-adv-x="501" d="M251.072 469.395c-82.706 0-143.41-14.164-182.485-57.453s-52.944-110.363-52.944-209.382c0-87.026 13.173-150.808 51.579-193.537s99.014-59.823 183.85-59.823c85.052 0 145.427 15.293 183.695 57.402s50.858 105.917 50.858 195.959c0 96.265-12.923 163.159-51.296 207.141s-99.048 59.695-183.258 59.695zM251.072 434.485c79.95 0 127.822-14.325 156.953-47.714s42.691-91.199 42.691-184.211c0-86.676-12.977-140.814-41.763-172.488s-76. [...] -<glyph unicode="" glyph-name="bow_letter_w" horiz-adv-x="739" d="M136.14 478.85l-122.945-107.074 2.989-10.615 115.757-411.962h171.020l43.798 140.103 57.633-140.103h166.099l152.186 412.143-57.582 53.151-70.464 57.582-113.67-309.629-73.942 172.308h-93.832l-84.969-171.664zM117.925 416.708l101.844-349.331 115.087 232.466h49.157l99.474-231.796 127.015 345.981 31.689-25.893 39.65-36.61-135.672-367.443h-118.41l-85.51 207.862-64.95-207.862h-118.925l-105.606 375.867 40.475 35.271z" /> -<glyph unicode="" glyph-name="exit" d="M741.125 892.719c-68.481 0-124.219-55.738-124.219-124.219s55.738-124.219 124.219-124.219c68.481 0 124.219 55.738 124.219 124.219s-55.738 124.219-124.219 124.219zM741.125 871.906c57.24 0 103.406-46.167 103.406-103.406s-46.167-103.438-103.406-103.438c-57.24 0-103.406 46.198-103.406 103.438s46.167 103.406 103.406 103.406zM470.938 678.562c-6.315 0.082-12.194-1.108-17.469-2.844-0.224-0.066-0.501-0.142-0.656-0.188l-0.25-0.062-0.281-0.094c-1.089-0. [...] -<glyph unicode="" glyph-name="bookmark" d="M272-70.624l240 240 240-240v1030.624h-480v-1030.624zM304 928h416v-921.376l-208 208-208-208v921.376z" /> -<glyph unicode="" glyph-name="bookmark-check" d="M512 169.376l240-240v1030.624h-480v-1030.624l240 240zM304 928h416v-921.376l-208 208-208-208v921.376zM676.688 715.312l-196.688-196.688-100.688 100.688-22.624-24.976 112-114.336h22.624l208 210.336z" /> -<glyph unicode="" glyph-name="bookmark-minus" d="M368 624h288v-32h-288v32zM512 169.376l240-240v1030.624h-480v-1030.624l240 240zM304 928h416v-921.376l-208 208-208-208v921.376z" /> -<glyph unicode="" glyph-name="bookmark-plus" d="M528 464v128h128v32h-128v128h-32v-128h-128v-32h128v-128zM512 169.376l240-240v1030.624h-480v-1030.624l240 240zM304 928h416v-921.376l-208 208-208-208v921.376z" /> -<glyph unicode="" glyph-name="bookmark-remove" d="M512 169.376l240-240v1030.624h-480v-1030.624l240 240zM304 928h416v-921.376l-208 208-208-208v921.376zM612.688 484.688l22.624 22.624-100.688 100.688 100.688 100.688-22.624 22.624-100.688-100.688-100.688 100.688-22.624-22.624 100.688-100.688-100.688-100.688 22.624-22.624 100.688 100.688z" /> -<glyph unicode="" glyph-name="link" d="M847.776 960c-0.048 0-0.096 0-0.128 0-38.416 0-74.928-12.128-105.584-35.152l-209.664-209.68c-33.888-34.592-52.528-78.336-52.496-123.232 0.016-24.464 4.976-48.176 14.72-70.4v0c0.944-2.16 1.92-4.288 2.96-6.4l28.72 14.144c-0.816 1.664-1.6 3.344-2.336 5.056l-14.672-6.384 14.656 6.416c-7.984 18.192-12.032 37.584-12.048 57.648-0.016 36.448 15.376 72.272 43.248 100.72l207.024 207.2c24.88 18.4 54.416 28.064 85.488 28.064 0.032 0 0.064 0 0.112 0 38.4 [...] -<glyph unicode="" glyph-name="mail" d="M1024 768h-1024v-624h1024v624zM953.68 736l-441.68-284.96-441.68 284.96h883.36zM32 176v546.64l480-309.68 480 309.68v-546.64h-960z" /> -<glyph unicode="" glyph-name="camera" d="M615.68 816h-207.36l-128-160h-280.32v-544h1024v544h-280.32l-128 160zM32 624h96v-480h-96v480zM992 144h-832v480h135.68l128 160h176.64l128-160h263.68v-480zM512 528c-79.392 0-144-64.592-144-144s64.608-144 144-144 144 64.592 144 144-64.608 144-144 144zM512 272c-61.76 0-112 50.256-112 112s50.24 112 112 112 112-50.256 112-112-50.24-112-112-112z" /> -<glyph unicode="" glyph-name="settings" d="M656 358.624l-66.4 66.4 120.944 118.976h57.456c80.304 0 176 37.472 176 216v25.168l-140.448-65.84-48.608 50.624 61.44 142.048h-24.384c-178.528 0-216-96.176-216-176v-57.44l-119.072-120.864-194.304 194.304 51.168 51.168-188.272 112.976-49.664-49.664 112.976-188.288 51.168 51.184 194.464-194.464-392.704-398.56-31.872-109.296 47.488-44.688 109.712 27.136 399.68 393.072 66.608-66.576-48-48 326.624-326.624 118.624 118.624-326.624 326.624-48-48z [...] -<glyph unicode="" glyph-name="search" d="M398.333 840.5c-153.524 0-278.833-125.31-278.833-278.833s125.31-278.833 278.833-278.833c62.447 0 119.992 21.007 166.569 55.938l283.268-283.268 56.327 56.327-283.268 283.268c34.931 46.576 55.938 104.122 55.938 166.569 0 153.524-125.31 278.833-278.833 278.833zM398.333 760.833c110.469 0 199.167-88.698 199.167-199.167s-88.698-199.167-199.167-199.167c-110.469 0-199.167 88.698-199.167 199.167s88.698 199.167 199.167 199.167z" /> -<glyph unicode="" glyph-name="bookmark-group" d="M272 960v-1030.625l240 240 240-240v1030.625h-480zM304 928h416v-921.375l-208 208-208-208v921.375zM416 733.688c-34.992 0-63.469-28.477-63.469-63.469 0-18.45 8.007-34.994 20.625-46.594-24.36-11.389-45.469-30.772-45.469-52.781v-44.281h11.156v44.281c0 28.959 48.197 52.313 77.156 52.313s77.156-23.354 77.156-52.313v-44.281h11.156v44.281c0 22.009-21.108 41.392-45.469 52.781 12.623 11.599 20.625 28.14 20.625 46.594 0 34.992-28.477 63.469-63 [...] -<glyph unicode="" glyph-name="tag" d="M624-70.624l-624 624v406.624h406.624l624-624-406.624-406.624zM32 566.624l592-592 361.376 361.376-592 592h-361.376v-361.376zM272 576c-61.76 0-112 50.24-112 112s50.24 112 112 112 112-50.24 112-112-50.24-112-112-112zM272 768c-44.112 0-80-35.888-80-80s35.888-80 80-80 80 35.888 80 80-35.888 80-80 80z" /> -<glyph unicode="" glyph-name="tags" d="M545.552-6.624l-545.552 545.552v357.072h357.072l545.552-545.552-357.072-357.072zM32 552.176l513.552-513.552 311.824 311.824-513.552 513.552h-311.824v-311.824zM684.864 4.688l-22.624 22.624 323.136 323.136-518.24 518.24 22.624 22.624 540.864-540.864zM224 576c-52.944 0-96 43.056-96 96s43.056 96 96 96 96-43.056 96-96-43.056-96-96-96zM224 736c-35.296 0-64-28.704-64-64s28.704-64 64-64 64 28.704 64 64-28.704 64-64 64z" /> -<glyph unicode="" glyph-name="group" d="M307.61 705.982c-74.5 0-135.129-60.629-135.129-135.129 0-39.281 17.046-74.504 43.912-99.201-51.864-24.249-96.806-65.516-96.806-112.375v-94.278h23.752v94.278c0 61.655 102.615 111.377 164.27 111.377s164.27-49.721 164.27-111.377v-94.278h23.752v94.278c0 46.859-44.941 88.126-96.806 112.375 26.876 24.695 43.912 59.913 43.912 99.201 0 74.5-60.629 135.129-135.129 135.129zM716.39 705.982c-74.5 0-135.129-60.629-135.129-135.129 0-39.281 17.046-74.504 [...] -<glyph unicode="" glyph-name="eject" d="M499.424 656l-176-227.056 12.576-28.944h352l12.576 28.944-176 227.056h-25.152zM368.928 432l143.072 182.096 143.072-182.096h-286.144zM352 336h320v-32h-320v32zM512 960c-136.768 0-265.328-53.28-362.032-150-96.72-96.672-149.984-225.248-149.984-362s53.264-265.328 149.984-362.016c96.704-96.72 225.264-149.984 362.032-149.984 136.752 0 265.328 53.28 362.032 150 96.72 96.688 149.984 225.264 149.984 362.016s-53.264 265.328-149.984 362.016c-96.704 96. [...] -<glyph unicode="" glyph-name="signs" d="M496 304v-336h-112v-32h256v32h-112v336h160v224h-160v32h357.92l130.656 112-130.656 112h-357.92v64h-32v-64h-160v-224h160v-32h-357.92l-130.656-112 130.656-112h357.92zM368 752h506.080l93.344-80-93.344-80h-506.080v160zM149.92 496h506.080v-160h-506.080l-93.344 80 93.344 80z" /> -<glyph unicode="" glyph-name="star" d="M512 992.704l-139.376-400.704h-387.264l315.872-245.68-140.624-421.856 351.392 263.536 351.376-263.536-140.624 421.856 315.888 245.68h-387.264l-139.376 400.704zM685.248 357.68l115.376-346.144-288.624 216.464-288.624-216.464 115.376 346.144-260.112 202.32h316.736l116.624 335.296 116.624-335.296h316.736l-260.112-202.32z" /> -<glyph unicode="" glyph-name="admin" d="M752.478 600.32v-123.618c-6.097 7.487-13.269 13.263-21.641 17.085-12.057 5.504-24.516 8.239-37.359 8.239-18.085 0-33.669-4.726-46.774-14.161s-23.182-21.739-30.259-36.941c-7.077-15.202-10.631-31.723-10.631-49.546 0-18.609 3.827-35.521 11.428-50.723 7.863-14.94 18.331-26.853 31.436-35.764 13.367-8.911 28.288-13.364 44.8-13.364 13.891 0 26.741 3.163 38.536 9.454 8.371 4.549 15.125 10.718 20.464 18.3l3.911-23.805h31.474v294.845zM313.513 502.026 [...] -<glyph unicode="" glyph-name="stats" d="M368-64h-224v576h224v-576zM176-32h160v512h-160v-512zM880-64h-224v416h224v-416zM688-32h160v352h-160v-352zM624-64h-224v1024h224v-1024zM432-32h160v960h-160v-960z" /> -<glyph unicode="" glyph-name="grid" d="M184 776v-80h80v80h-80zM376 776v-80h80v80h-80zM568 776v-80h80v80h-80zM760 776v-80h80v80h-80zM184 584v-80h80v80h-80zM376 584v-80h80v80h-80zM568 584v-80h80v80h-80zM760 584v-80h80v80h-80zM184 392v-80h80v80h-80zM376 392v-80h80v80h-80zM568 392v-80h80v80h-80zM760 392v-80h80v80h-80zM184 200v-80h80v80h-80zM376 200v-80h80v80h-80zM568 200v-80h80v80h-80zM760 200v-80h80v80h-80z" /> -<glyph unicode="" glyph-name="list" d="M107 733.969v-27.938h810v27.938h-810zM107 552.625v-27.937h810v27.937h-810zM107 371.312v-27.937h810v27.937h-810zM107 189.969v-27.938h810v27.938h-810z" /> -<glyph unicode="" glyph-name="lutin" horiz-adv-x="395" d="M280.592 64.171c-11.779-7.202-23.559-12.42-36.618-16.997-9.155-2.625-15.684-11.779-15.044-21.574 0.64-16.357 7.202-34.026 18.981-50.35 24.871-34.666 64.114-49.070 87.001-32.041 23.559 16.997 22.246 58.225-2.625 92.891-8.514 12.42-18.981 21.574-30.089 28.776-5.89 3.937-15.044 3.937-21.574-0.64zM119.042 61.547c-7.202 3.937-16.997 3.937-23.559-1.312-8.514-6.53-16.997-14.404-24.199-24.199-24.839-34.666-25.511-76.534-2.625-92.8 [...] -<glyph unicode="" glyph-name="menu" d="M512 883c-30.718 0-59.593-11.964-81.312-33.688-21.723-21.72-33.688-50.598-33.688-81.312s11.964-59.593 33.688-81.312c21.72-21.723 50.594-33.688 81.312-33.688 30.715 0 59.593 11.964 81.312 33.688 21.723 21.72 33.688 50.598 33.688 81.312s-11.964 59.593-33.688 81.312c-21.72 21.723-50.598 33.688-81.312 33.688zM512 563c-30.718 0-59.593-11.964-81.312-33.688-21.723-21.72-33.688-50.598-33.688-81.312s11.964-59.593 33.688-81.312c21.72-21.723 50.594-33. [...] -<glyph unicode="" glyph-name="heart" d="M768 896c-117.712 0-218.224-66.336-256-158.864-37.776 92.528-138.288 158.864-256 158.864-160.24 0-256-138.304-256-272 0-137.424 85.216-284.080 253.28-435.872 123.808-111.824 249.44-185.232 250.688-185.968l8.032-4.656 8.032 4.656c1.264 0.736 126.88 74.144 250.688 185.968 168.064 151.792 253.28 298.448 253.28 435.872 0 133.696-95.76 272-256 272zM768 864c-512-618.667-256-309.333 0 0z" /> -<glyph unicode="" glyph-name="lock" d="M784 688c0 149.984-122.016 272-272 272s-272-122.016-272-272v-240h-128v-512h800v512h-128v240zM272 688c0 132.336 107.664 240 240 240s240-107.664 240-240v-240h-480v240zM880-32h-736v448h736v-448zM496 129.632v-49.632h32v49.632c36.464 7.424 64 39.744 64 78.368 0 44.112-35.888 80-80 80s-80-35.888-80-80c0-38.624 27.536-70.96 64-78.368zM512 256c26.464 0 48-21.536 48-48s-21.536-48-48-48-48 21.536-48 48 21.536 48 48 48z" /> -<glyph unicode="" glyph-name="trashcan" d="M752 603.376l192.656-655.888 30.688 9.008-56.992 194.064 93.248 31.088-72.8 254.8-95.12-31.696-61.52 209.44-30.16-8.864v162.672h-37.344l-79.984 192h-210.336l-66.176-82.16-146.192 2.352-32.048-112.192h-35.92v-832h608v667.376zM917.2 395.536l55.2-193.2-63.088-21.024-56.608 192.72 64.496 21.504zM439.664 928h173.664l66.672-160h-268.256l-28.224 90.336 56.144 69.664zM236.016 847.808l117.872-1.904 24.368-77.904h-165.040l22.8 79.808zM720-32h-544v [...] -<glyph unicode="" glyph-name="pencil" d="M168.739 290.757l-46.522-232.54 232.54 46.522 547.026 547.026-186.018 186.018zM320.879 168.027l-111.048-22.196 22.196 111.048 380.661 380.661 88.852-88.852zM750.124 597.272l-88.852 88.852 54.493 54.493 88.852-88.852z" /> -</font></defs></svg> \ No newline at end of file +<font id="bow-icons" horiz-adv-x="512" > + <font-face + font-family="bow-icons" + font-weight="500" + font-stretch="normal" + units-per-em="512" + panose-1="2 0 6 3 0 0 0 0 0 0" + ascent="448" + descent="-64" + bbox="-1.73438 -67.3076 520.103 451.313" + underline-thickness="25.6" + underline-position="-51.2" + unicode-range="U+0020-F114" + /> + <missing-glyph /> + <glyph glyph-name="space" unicode=" " horiz-adv-x="200" + /> + <glyph glyph-name="uniF113" unicode="" +d="M309.817 233.958c-2.45996 -41.7812 -29.5713 -83.5469 -35.5781 -88.1777l-0.517578 -0.303711c-10.835 -6.34863 -19.0117 -8.12012 -28.0273 -0.552734l-0.948242 0.794922c-5.50879 1.53711 4.73438 -1.32129 -0.774414 0.21582 +c-6.24707 5.05273 -35.9482 48.2373 -35.1602 87.7529c0.618164 31.0107 23.0635 55.2188 50.5039 55.2188c27.498 0 50.375 -24.4111 50.502 -54.9482zM321.257 233.825c-0.150391 36.335 -27.3311 66.5205 -61.9414 66.5205 +c-34.6689 0 -61.2188 -30.249 -61.9404 -66.4307c-0.932617 -46.7666 32.7061 -94.1992 41.5557 -98.2803c16.0625 -11.9102 28.8486 -6.55176 40.2529 -0.232422c11.3291 5.83301 39.2998 51.1201 42.0635 98.0625c6.87988 116.671 -15.0654 -255.503 0.0107422 0.179688 +c-0.523438 131.023 0.972656 -243.167 -0.000976562 0.180664zM215.551 151.561l-7.61133 8.53809l-40.335 -35.9531l-23.4346 -112.832h230.291l-23.4346 112.832l-40.335 35.9531l-7.61133 -8.53809l37.5146 -33.4395l19.8076 -95.3691h-202.174l19.8076 95.3691z +M215.094 152.162l-11.0889 -2.80762l3.00586 -11.8701c4.97949 -19.6494 19.6553 -31.498 36.1025 -35.8398c26.8945 -7.09863 61.0186 5.06445 68.5459 35.7559l2.83789 11.584l-11.1104 2.7207l-2.83789 -11.584c-5.5498 -22.6279 -32.0391 -33.3486 -54.5166 -27.416 +c-13.1768 3.47754 -24.0781 12.377 -27.9336 27.5889zM453.819 298.625c-2.46387 -41.7783 -29.5752 -83.5439 -35.5771 -88.1768l-0.515625 -0.301758c-10.8418 -6.34961 -19.0205 -8.12012 -28.0342 -0.554688l-0.946289 0.794922 +c-7.70508 2.15332 6.92969 -1.9375 -0.775391 0.216797c-6.24902 5.05469 -35.9453 48.2373 -35.1582 87.751c0.620117 31.0098 23.0605 55.2227 50.5 55.2227c27.5059 0 50.3789 -24.415 50.5068 -54.9521zM465.259 298.492 +c-0.152344 36.335 -27.3271 66.5244 -61.9463 66.5244c-34.6699 0 -61.2139 -30.2559 -61.9375 -66.4336c-0.930664 -46.7627 32.7227 -94.2041 41.5303 -98.2686c16.2598 -11.9844 28.8232 -6.57422 40.3428 -0.212891c11.21 5.78223 39.2324 51.0967 42.001 98.0303 +l0.00976562 0.180664c-0.536133 132.225 0.981445 -241.953 0 0.179688zM376.828 87.4229v-11.4395h141.639l-23.4385 112.834l-40.332 35.9521l-7.61133 -8.53906l37.5117 -33.4385l19.8115 -95.3691h-127.58zM359.549 216.23l-7.61328 8.53906l-15.2031 -13.5547 +l7.61328 -8.53906zM359.091 216.835l-11.0879 -2.81055l3.00781 -11.8662c13.3018 -52.5195 92.7598 -48.5576 104.646 -0.0849609l2.84375 11.5781l-11.1094 2.72852l-2.84375 -11.5781c-9.03613 -36.8555 -72.2031 -40.2842 -82.4482 0.165039zM165.819 298.625 +c-2.46387 -41.7783 -29.5752 -83.5439 -35.5771 -88.1768l-0.515625 -0.301758c-10.8418 -6.34961 -19.0205 -8.12012 -28.0342 -0.554688l-0.946289 0.794922c-7.70508 2.15332 6.92969 -1.93652 -0.775391 0.216797c-6.24902 5.05469 -35.9453 48.2373 -35.1582 87.751 +c0.620117 31.0098 23.0605 55.2227 50.5 55.2227c27.5059 0 50.3789 -24.4141 50.5068 -54.9521zM177.259 298.492c-0.152344 36.335 -27.3271 66.5244 -61.9463 66.5244c-34.6699 0 -61.2139 -30.2559 -61.9375 -66.4336 +c-0.930664 -46.7627 32.7227 -94.2041 41.5303 -98.2686c16.2598 -11.9844 28.8232 -6.57422 40.3418 -0.212891c11.2109 5.78223 39.2334 51.0967 42.002 98.0303l0.00976562 0.180664v0.179688zM174.225 202.731l7.61328 8.53711l-15.1406 13.5l-7.61328 -8.53711z +M71.5479 216.23l-7.61133 8.53906l-40.332 -35.9521l-23.4385 -112.834h141.74v11.4395h-127.682l19.8115 95.3691zM71.0908 216.835l-11.0879 -2.81055l3.00781 -11.8662c13.3018 -52.5195 92.7598 -48.5576 104.646 -0.0849609l2.84375 11.5781l-11.1094 2.72852 +l-2.84375 -11.5781c-9.03613 -36.8555 -72.2031 -40.2842 -82.4482 0.165039z" /> + <glyph glyph-name="uniF104" unicode="" +d="M384 416c80.1201 0 128 -69.1523 128 -136c0 -68.7119 -42.6084 -142.04 -126.64 -217.936c-61.9043 -55.9121 -124.712 -92.6162 -125.345 -92.9844l-4.01562 -2.32812l-4.01562 2.32812c-0.624023 0.368164 -63.4404 37.0723 -125.345 92.9844 +c-84.0312 75.8955 -126.64 149.224 -126.64 217.936c0 66.8477 47.8799 136 128 136c58.8564 0 109.112 -33.168 128 -79.4316c18.8877 46.2637 69.1436 79.4316 128 79.4316zM384 400c-256 -309.333 -128 -154.667 0 0z" /> + <glyph glyph-name="uniF10D" unicode="" +d="M16 280c0 102.85 49.0957 152 152 152c102.85 0 152 -49.0957 152 -152c0 -102.85 -49.0957 -152 -152 -152c-102.85 0 -152 49.0957 -152 152zM0 280c0 -110.43 57.5166 -168 168 -168c110.43 0 168 57.5166 168 168c0 110.43 -57.5166 168 -168 168 +c-110.429 0 -168 -57.5166 -168 -168zM285.657 173.657l-11.3145 -11.3145l48 -48l11.3145 11.3145zM352.012 132.686l140.68 -140.68l-36.6865 -36.6865l-140.68 140.68zM352.012 155.313l-59.3135 -59.3145l163.307 -163.307l59.3135 59.3135z" /> + <glyph glyph-name="uniF10B" unicode="" +d="M300.155 360l64 -80h131.845v-240h-480v240h131.845l64 80h88.3105zM371.845 296l-64 80h-103.689l-64 -80h-140.155v-272h512v272h-140.155zM200 160c0 38.9014 17.0967 56 56 56c38.9023 0 56 -17.0967 56 -56c0 -38.9023 -17.0967 -56 -56 -56 +c-38.9014 0 -56 17.0967 -56 56zM184 160c0 -46.4297 25.5684 -72 72 -72c46.4297 0 72 25.5684 72 72c0 46.4297 -25.5684 72 -72 72c-46.4297 0 -72 -25.5684 -72 -72zM80 288h-16v-256h16v256zM432 224z" /> + <glyph glyph-name="uniF105" unicode="" +d="M16 192c0 161.566 78.4307 240 240 240c161.566 0 240 -78.4307 240 -240c0 -161.566 -78.4307 -240 -240 -240c-161.566 0 -240 78.4307 -240 240zM0 192c0 -169.098 86.8994 -256 256 -256c169.098 0 256 86.8994 256 256c0 169.098 -86.8994 256 -256 256 +c-169.098 0 -256 -86.8994 -256 -256zM144 192c0 76.2354 35.7637 112 112 112c76.2354 0 112 -35.7637 112 -112c0 -76.2354 -35.7637 -112 -112 -112c-76.2354 0 -112 35.7637 -112 112zM128 192c0 -83.7637 44.2354 -128 128 -128c83.7637 0 128 44.2354 128 128 +c0 83.7637 -44.2354 128 -128 128c-83.7637 0 -128 -44.2354 -128 -128zM200 304h16v136h-16v-136zM296 304h16v136h-16v-136zM200 -56h16v136h-16v-136zM296 -56h16v136h-16v-136zM368 248v-16h136v16h-136zM368 152v-16h136v16h-136zM8 248v-16h136v16h-136zM8 152v-16 +h136v16h-136z" /> + <glyph glyph-name="uniF114" unicode="" +d="M256.008 448.906c-141.908 0 -256.931 -115.021 -256.906 -256.915c-0.0078125 -141.891 114.997 -256.905 256.898 -256.897c141.885 -0.0166016 256.914 115.005 256.906 256.906c0.0078125 141.885 -115.005 256.906 -256.898 256.906zM256.008 432.906 +c133.06 0 240.906 -107.854 240.898 -240.906c0.0078125 -133.067 -107.854 -240.922 -240.906 -240.906c-133.067 -0.0078125 -240.906 107.837 -240.898 240.899c-0.0224609 133.059 107.83 240.913 240.906 240.913zM264 440h-16v-496h16v496zM504 184v16h-496v-16h496z +M244.969 433.729l-9.9375 12.541c-0.601562 -0.477539 -115.031 -90.3389 -115.031 -254.271c0 -163.929 114.432 -253.795 115.031 -254.271l9.9375 12.541s-108.969 85.3018 -108.969 241.729c0 156.431 108.969 241.729 108.969 241.729zM276.969 446.271 +l-9.9375 -12.541s108.969 -85.2988 108.969 -241.729c0 -156.428 -108.969 -241.729 -108.969 -241.729l9.9375 -12.541c0.599609 0.475586 115.031 90.3418 115.031 254.271c0 163.932 -114.43 253.793 -115.031 254.271zM71.1221 355.643l-14.2441 -7.28516 +c0.920898 -1.80176 43.7959 -84.3574 199.122 -84.3574c155.325 0 198.201 82.5557 199.122 84.3574l-14.2441 7.28516s-35.5127 -75.6426 -184.878 -75.6426s-184.878 75.6426 -184.878 75.6426zM56.8779 35.6426l14.2441 -7.28516s35.5127 75.6426 184.878 75.6426 +s184.878 -75.6426 184.878 -75.6426l14.2441 7.28516c-0.920898 1.80176 -43.7969 84.3574 -199.122 84.3574c-155.326 0 -198.201 -82.5557 -199.122 -84.3574z" /> + <glyph glyph-name="uniF10A" unicode="" +d="M154.343 10.3428l11.3145 11.3145l-80 80l-11.3145 -11.3145zM86.5752 91.2607l337.425 337.426l68.6865 -68.6865l-337.426 -337.425l-137.372 -68.6865zM73.4248 100.739l-75.1592 -150.319l16.1543 -16.1543l150.319 75.1592l350.574 350.575l-91.3135 91.3135z +M426.343 282.343l11.3145 11.3145l-80 80l-11.3145 -11.3145zM458.343 314.343l11.3145 11.3145l-80 80l-11.3145 -11.3145zM41.9404 23.7607l-3.88086 -15.5215l27.3438 -6.83594l6.83594 -27.3438l15.5215 3.88086l-9.16406 36.6562z" /> + <glyph glyph-name="uniF102" unicode="" +d="M184 -64h-112v288h112v-288zM88 -48h80v256h-80v-256zM440 -64h-112v208h112v-208zM344 -48h80v176h-80v-176zM312 -64h-112v512h112v-512zM216 -48h80v480h-80v-480z" /> + <glyph glyph-name="uniF10E" unicode="" +d="M328 147.312l24 24l163.312 -163.312l-59.3125 -59.3125l-163.312 163.312l24 24l-33.3037 33.2881l-199.84 -196.536l-54.8555 -13.5684l-23.7441 22.3447l15.9355 54.6475l1.42383 1.44043l194.929 197.84l-97.2324 97.2314l-25.584 -25.5918l-56.4883 94.1445 +l24.832 24.832l94.1367 -56.4883l-25.585 -25.584l97.1523 -97.1523l59.5361 60.4326v28.7197c0 39.9121 18.7363 88 108 88h12.1924l-30.7207 -71.0244l24.3047 -25.3115l70.2236 32.9199v-12.584c0 -89.2637 -47.8477 -108 -88 -108h-28.7275l-60.4727 -59.4883z +M58.0723 398.76l39.5117 -65.8555l33.5117 33.5117l-65.8555 39.5117zM75.4561 -12.7598l273.271 268.76h35.2725c44.3203 0 68.376 26.6396 71.6162 79.2402l-57.3926 -26.8965l-39.6953 40.9365l25.1357 57.8877c-53.5762 -3 -79.6641 -26.3682 -79.6641 -71.168v-35.2803 +l-268.88 -272.903l-12.0645 -41.3525l10.2559 -9.65625zM456 -28.6875l36.6875 36.6875l-140.688 140.688l-36.6875 -36.6875z" /> + <glyph glyph-name="uniF106" unicode="" +d="M53.5 334.984h405v-13.9688h-405v13.9688zM53.5 244.312h405v-13.9688h-405v13.9688zM53.5 153.656h405v-13.9688h-405v13.9688zM53.5 62.9844h405v-13.9688h-405v13.9688z" /> + <glyph glyph-name="uniF100" unicode="" +d="M64 448h-16v-512h16v512zM232 368l29.5898 25.8281l-10.1797 12.3438l-51.4102 -42.4004v-203.771h268.944l-52 104l52 104h-236.944zM216 352h227.056l-44 -88l44 -88h-227.056v176zM208 200v16h-144v176h184v-32h16v48h-216v-208h160z" /> + <glyph glyph-name="uniF103" unicode="" +d="M92 356h40v-40h-40v40zM188 356h40v-40h-40v40zM284 356h40v-40h-40v40zM380 356h40v-40h-40v40zM92 260h40v-40h-40v40zM188 260h40v-40h-40v40zM284 260h40v-40h-40v40zM380 260h40v-40h-40v40zM92 164h40v-40h-40v40zM188 164h40v-40h-40v40zM284 164h40v-40h-40v40z +M380 164h40v-40h-40v40zM92 68h40v-40h-40v40zM188 68h40v-40h-40v40zM284 68h40v-40h-40v40zM380 68h40v-40h-40v40z" /> + <glyph glyph-name="uniF112" unicode="" +d="M326.64 293.281c-3.44043 -58.4404 -41.3633 -116.86 -49.7646 -123.337l-0.724609 -0.424805c-15.1553 -8.88086 -26.5918 -11.3584 -39.2031 -0.774414l-1.3252 1.1123c-7.70605 2.15039 6.62109 -1.84766 -1.08398 0.302734 +c-8.73828 7.06738 -50.2832 67.4717 -49.1807 122.743c0.866211 43.376 32.2598 77.2373 70.6426 77.2373c38.4629 0 70.4619 -34.1455 70.6396 -76.8594zM342.641 293.096c-0.210938 50.8232 -38.2285 93.0449 -86.6406 93.0449 +c-48.4922 0 -85.6289 -42.3105 -86.6387 -92.9189c-1.30566 -65.4141 45.7471 -131.761 58.125 -137.469c22.4678 -16.6602 40.3525 -9.16504 56.3047 -0.325195c15.8457 8.1582 54.9697 71.5029 58.8359 137.164c9.62207 163.192 -21.0723 -357.383 0.0146484 0.251953 +c-0.732422 183.268 1.35938 -340.129 -0.000976562 0.251953zM194.784 178.028l-10.6465 11.9434l-56.418 -50.2891l-32.7783 -157.823h322.117l-32.7783 157.823l-56.418 50.2891l-10.6465 -11.9434l52.4727 -46.7734l27.7061 -133.396h-282.789l27.7061 133.396z +M194.146 178.87l-15.5098 -3.92773l4.20312 -16.6025c6.96484 -27.4844 27.4932 -44.0586 50.498 -50.1299c37.6191 -9.92969 85.3506 7.08301 95.8789 50.0117l3.96875 16.2031l-15.541 3.80664l-3.96875 -16.2031c-7.7627 -31.6514 -44.8145 -46.6465 -76.2549 -38.3486 +c-18.4307 4.86523 -33.6787 17.3125 -39.0713 38.5898z" /> + <glyph glyph-name="uniF10C" unicode="" +d="M104 296h-16v-360h16v360zM424 448h-16v-360h16v360zM264 144h-16v-208h16v208zM264 448h-16v-208h16v208zM56 344c0 28.2363 11.7637 40 40 40s40 -11.7637 40 -40s-11.7637 -40 -40 -40s-40 11.7637 -40 40zM40 344c0 -35.7637 20.2363 -56 56 -56s56 20.2363 56 56 +s-20.2363 56 -56 56s-56 -20.2363 -56 -56zM376 40c0 28.2363 11.7637 40 40 40s40 -11.7637 40 -40s-11.7637 -40 -40 -40s-40 11.7637 -40 40zM360 40c0 -35.7637 20.2363 -56 56 -56s56 20.2363 56 56s-20.2363 56 -56 56s-56 -20.2363 -56 -56zM216 192 +c0 28.2363 11.7637 40 40 40s40 -11.7637 40 -40s-11.7637 -40 -40 -40s-40 11.7637 -40 40zM200 192c0 -35.7637 20.2363 -56 56 -56s56 20.2363 56 56s-20.2363 56 -56 56s-56 -20.2363 -56 -56zM104 448h-16v-56h16v56zM424 -8h-16v-56h16v56z" /> + <glyph glyph-name="uniF107" unicode="" +d="M392 312v-120h64v-256h-400v256h64v120c0 74.9922 61.0078 136 136 136s136 -61.0078 136 -136zM136 312v-120h240v120c0 66.168 -53.832 120 -120 120s-120 -53.832 -120 -120zM440 -48v224h-368v-224h368zM248 32.8164c-18.2324 3.70312 -32 19.8711 -32 39.1836 +c0 22.0557 17.9443 40 40 40s40 -17.9443 40 -40c0 -19.3115 -13.7676 -35.4717 -32 -39.1836v-24.8164h-16v24.8164zM256 96c-13.2324 0 -24 -10.7676 -24 -24s10.7676 -24 24 -24s24 10.7676 24 24s-10.7676 24 -24 24z" /> + <glyph glyph-name="uniF111" unicode="" +d="M176 384h16v48h96v-48h16v64h-128v-64zM104 368h-16v-432h304v432h-16v-416h-272v416zM200 288h-16v-272h16v272zM296 288h-16v-272h16v272zM64 384v-16h352v16h-352z" /> + <glyph glyph-name="uniF108" unicode="" +d="M352 73.7656h-16v-121.766h-320v480h320v-121.766h16v137.766h-352v-512h352v137.766zM429.337 144.566l14.0732 -14.0723l76.6924 76.6924l-76.6924 76.6924l-14.0732 -14.0732l62.6201 -62.6191zM506.029 197.235v19.9023h-353.604v-19.9023h353.604z" /> + <glyph glyph-name="uniF10F" unicode="" +d="M320 344c0 60.1797 27.7627 88 88 88c60.1797 0 88 -27.7627 88 -88c0 -60.1797 -27.7627 -88 -88 -88c-60.1797 0 -88 27.7627 -88 88zM304 344c0 -67.7627 36.1797 -104 104 -104c67.7627 0 104 36.1797 104 104c0 67.7627 -36.1797 104 -104 104 +c-67.7627 0 -104 -36.1797 -104 -104zM16 112c0 49.5605 22.4307 72 72 72c49.5605 0 72 -22.4307 72 -72c0 -49.5605 -22.4307 -72 -72 -72c-49.5605 0 -72 22.4307 -72 72zM0 112c0 -57.0977 30.8945 -88 88 -88c57.0977 0 88 30.8945 88 88c0 57.0977 -30.8945 88 -88 88 +c-57.0977 0 -88 -30.8945 -88 -88zM328 8c0 38.9023 17.0967 56 56 56c38.9023 0 56 -17.0967 56 -56c0 -38.9023 -17.0967 -56 -56 -56c-38.9023 0 -56 17.0967 -56 56zM312 8c0 -46.4297 25.5684 -72 72 -72c46.4297 0 72 25.5684 72 72c0 46.4297 -25.5684 72 -72 72 +c-46.4297 0 -72 -25.5684 -72 -72zM317.029 8.57227l5.94141 14.8555l-160 64l-5.94141 -14.8555zM147.705 174.749l8.58984 -13.498l176 112l-8.58984 13.498z" /> + <glyph glyph-name="uniF109" unicode="" +d="M140.296 0.0859375l0.0166016 0.0322266c3.26465 2.28809 7.8418 2.28809 10.7871 0.319336c5.55273 -3.60059 10.7871 -8.17773 15.0439 -14.3877c12.4355 -17.333 13.0918 -37.9473 1.3125 -46.4453c-11.4434 -8.51465 -31.0654 -1.3125 -43.501 16.0205 +c-5.88965 8.16211 -9.16992 16.9971 -9.49023 25.1748c-0.320312 4.89746 2.94434 9.47559 7.52246 10.7871c6.5293 2.28906 12.4189 4.89746 18.3086 8.49902zM59.5215 -1.22656v-0.015625c6.54492 -3.58594 13.0752 -6.53027 19.6211 -7.84277 +c5.2334 -1.3125 8.83496 -6.5459 8.17871 -11.7793c-0.992188 -7.8418 -4.25781 -16.0205 -9.49121 -23.543c-12.0996 -17.333 -31.7207 -24.5186 -43.5 -16.0205c-11.4434 8.17871 -11.1074 29.1123 1.3125 46.4453c3.60059 4.89746 7.8418 8.83496 12.0986 12.0996 +c3.28125 2.625 8.17871 2.625 11.7803 0.65625zM99.4209 202.527h0.015625h-1.3125c-33.0332 0 -57.8887 29.1123 -53.3115 61.4902c7.52246 50.6865 18.6455 80.7744 31.0654 114.465c8.17773 22.5498 21.5898 59.1846 47.4209 67.3623 +c14.0527 4.25781 31.4014 3.26562 36.2988 -12.7549c3.9209 -12.4199 -5.88965 -37.6113 -12.7559 -27.1445c-1.3125 1.64844 3.26562 33.6904 -16.6768 21.5908c-12.4355 -7.52246 -3.60059 -50.3662 -1.96875 -61.1533 +c4.25781 -31.0811 14.3887 -53.6475 23.8789 -99.1006c6.86621 -33.3535 -18.3086 -64.7549 -52.6543 -64.7549zM98.7646 8.58398c-32.3779 0 -61.1543 21.2539 -73.5898 53.9678c-2.28809 5.55371 -5.55273 11.123 -9.81055 16.0205 +c-10.1309 10.7871 -15.3643 23.543 -15.3643 36.2979c0 18.6455 10.4668 35.6426 29.7529 48.7344c18.6445 12.4199 43.1641 19.3018 69.0117 19.3018c25.8467 0 50.6865 -6.86621 69.0117 -19.3018c18.9648 -12.7559 29.7686 -30.0889 29.7686 -48.7344 +c0 -13.0752 -5.23438 -25.5107 -15.3652 -36.2979c-4.57715 -4.89746 -7.8418 -10.1309 -10.1309 -16.0205c-12.0986 -33.0332 -41.2119 -53.9678 -73.2529 -53.9678h-0.03125z" /> + <glyph glyph-name="uniF110" unicode="" +d="M248 48h16v288h-16v-288zM112 200v-16h288v16h-288zM16 -48v480h480v-480h-480zM0 -64h512v512h-512v-512z" /> + <glyph glyph-name="uniF101" unicode="" +d="M216 432h80v-69.7656l58.1611 -19.3877l45.8389 45.8398l52.6865 -52.6865l-45.8398 -45.8389l19.3877 -58.1611h69.7656v-80h-69.7656l-19.3877 -58.1611l45.8398 -45.8389l-52.6865 -52.6865l-45.8389 45.8398l-58.1611 -19.3877v-69.7656h-80v69.7656 +l-58.1611 19.3877l-45.8389 -45.8398l-52.6865 52.6865l45.8398 45.8389l-19.3877 58.1611h-69.7656v80h69.7656l19.3877 58.1611l-45.8398 45.8389l52.6865 52.6865l45.8389 -45.8398l58.1611 19.3877v69.7656zM312 448h-112v-74.2344l-37.8389 -12.6123l-50.1611 50.1602 +l-75.3135 -75.3135l50.1602 -50.1611l-12.6123 -37.8389h-74.2344v-112h74.2344l12.6123 -37.8389l-50.1602 -50.1611l75.3135 -75.3135l50.1611 50.1602l37.8389 -12.6123v-74.2344h112v74.2344l37.8389 12.6123l50.1611 -50.1602l75.3135 75.3135l-50.1602 50.1611 +l12.6123 37.8389h74.2344v112h-74.2344l-12.6123 37.8389l50.1602 50.1611l-75.3135 75.3135l-50.1611 -50.1602l-37.8389 12.6123v74.2344zM216 192c0 28.2363 11.7637 40 40 40s40 -11.7637 40 -40s-11.7637 -40 -40 -40s-40 11.7637 -40 40zM200 192 +c0 -35.7637 20.2363 -56 56 -56s56 20.2363 56 56s-20.2363 56 -56 56s-56 -20.2363 -56 -56z" /> + </font> +</defs></svg> diff --git a/bow-ui/src/main/webapp/font/bow-icons.ttf b/bow-ui/src/main/webapp/font/bow-icons.ttf index 12149d4..a401714 100644 Binary files a/bow-ui/src/main/webapp/font/bow-icons.ttf and b/bow-ui/src/main/webapp/font/bow-icons.ttf differ diff --git a/bow-ui/src/main/webapp/font/bow-icons.woff b/bow-ui/src/main/webapp/font/bow-icons.woff index 93abdef..d7fde40 100644 Binary files a/bow-ui/src/main/webapp/font/bow-icons.woff and b/bow-ui/src/main/webapp/font/bow-icons.woff differ diff --git a/doc/icons/Readme.md b/doc/icons/Readme.md new file mode 100644 index 0000000..3d9dbbf --- /dev/null +++ b/doc/icons/Readme.md @@ -0,0 +1,8 @@ +# Mise à jour de la police d'icônes + +* Ajout d'icônes au format svg dans le dossier ```doc/icons``` +* Exécuter le script ```fontcustom.sh``` + +# Source des icônes + +* https://github.com/linea-io/Linea-Iconset \ No newline at end of file diff --git a/doc/icons/flag.svg b/doc/icons/flag.svg new file mode 100644 index 0000000..cd9e11b --- /dev/null +++ b/doc/icons/flag.svg @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve"> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="7" y1="0" x2="7" y2="64"/> +<polyline fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" points="32.062,6 26,11 26,35 57,35 51,23 57,11 + 26,11 "/> +<polyline fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" points="26,30 7,30 7,6 32,6 32,11 "/> +</svg> diff --git a/doc/icons/fontcustom.sh b/doc/icons/fontcustom.sh new file mode 100755 index 0000000..f5919e6 --- /dev/null +++ b/doc/icons/fontcustom.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +sudo rm -rf output + +docker run --rm --name fc -v $(pwd):/work -ti -d thomaswelton/fontcustom +docker exec -it fc fontcustom compile /work -c /work/fontcustom.yml -o /work/output +docker stop fc + +# Installe la font générée +cp output/bow-icons.ttf ../../bow-ui/src/main/webapp/font/ +cp output/bow-icons.svg ../../bow-ui/src/main/webapp/font/ +cp output/bow-icons.woff ../../bow-ui/src/main/webapp/font/ +cp output/bow-icons.eot ../../bow-ui/src/main/webapp/font/ + +# Installe le CSS généré après l'avoir rectifié +cat output/bow-icons.css | sed 's|url("./bow-icons|url("../font/bow-icons|g' > ../../bow-ui/src/main/less/common/_icons.less diff --git a/doc/icons/fontcustom.yml b/doc/icons/fontcustom.yml new file mode 100644 index 0000000..1a30692 --- /dev/null +++ b/doc/icons/fontcustom.yml @@ -0,0 +1,96 @@ +# ============================================================================= +# Font Custom Configuration +# This file should live in the directory where you run `fontcustom compile`. +# For more info, visit <https://github.com/FontCustom/fontcustom>. +# ============================================================================= + + +# ----------------------------------------------------------------------------- +# Project Info +# ----------------------------------------------------------------------------- + +# The font's name. Also determines the file names of generated templates. +font_name: bow-icons + +# Format of CSS selectors. {{glyph}} is substituted for the glyph name. +#css_selector: .i-{{glyph}} + +# Generate fonts without asset-busting hashes. +no_hash: true + +# Encode WOFF fonts into the generated CSS. +#base64: true + +# Forces compilation, even if inputs have not changed +force: true + +# Display (possibly useful) debugging messages. +#debug: true + +# Hide status messages. +#quiet: true + + +# ----------------------------------------------------------------------------- +# Input / Output Locations +# You can save generated fonts, CSS, and other files to different locations +# here. Font Custom can also read input vectors and templates from different +# places. +# +# NOTE: +# - Be sure to preserve the whitespace in these YAML hashes. +# - INPUT[:vectors] and OUTPUT[:fonts] are required. Everything else is +# optional. +# - Specify output locations for custom templates by including their file +# names as the key. +# ----------------------------------------------------------------------------- + +#input: +# vectors: my/vectors +# templates: my/templates + +#output: +# fonts: app/assets/fonts +# css: app/assets/stylesheets +# preview: app/views/styleguide +# my-custom-template.yml: path/to/template/output + + +# ----------------------------------------------------------------------------- +# Templates +# A YAML array of templates and files to generate alongside fonts. Custom +# templates should be saved in the INPUT[:templates] directory and referenced +# by their base file name. +# +# For Rails and Compass templates, set `preprocessor_path` as the relative +# path from OUTPUT[:css] to OUTPUT[:fonts]. By default, these are the same +# directory. +# +# Included in Font Custom: preview, css, scss, scss-rails +# Default: css, preview +# ----------------------------------------------------------------------------- + +#templates: +#- scss-rails +#- preview +#- my-custom-template.yml + +#preprocessor_path: ../fonts/ + + +# ----------------------------------------------------------------------------- +# Font Settings (defaults shown) +# ----------------------------------------------------------------------------- + +# Size (in pica points) for which your font is designed. +#font_design_size: 16 + +# The em size. Setting this will scale the entire font to the given size. +#font_em: 512 + +# The font's ascent and descent. Used to calculate the baseline. +#font_ascent: 448 +#font_descent: 64 + +# Horizontally fit glyphs to their individual vector widths. +#autowidth: false diff --git a/doc/icons/gear.svg b/doc/icons/gear.svg new file mode 100644 index 0000000..e2e968b --- /dev/null +++ b/doc/icons/gear.svg @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve"> +<g> + <polygon fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" points="32,1 26,1 26,10 20,12 14,6 6,14 12,20 + 10,26 1,26 1,38 10,38 12,44 6,50 14,58 20,52 26,54 26,63 32,63 38,63 38,54 44,52 50,58 58,50 52,44 54,38 63,38 63,26 54,26 + 52,20 58,14 50,6 44,12 38,10 38,1 "/> + <circle fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" cx="32" cy="32" r="6"/> +</g> +</svg> diff --git a/doc/icons/graph.svg b/doc/icons/graph.svg new file mode 100644 index 0000000..107d046 --- /dev/null +++ b/doc/icons/graph.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve"> +<g> + <path d="M23,64H9V28h14V64z M11,62h10V30H11V62z"/> +</g> +<g> + <path d="M55,64H41V38h14V64z M43,62h10V40H43V62z"/> +</g> +<g> + <path d="M39,64H25V0h14V64z M27,62h10V2H27V62z"/> +</g> +</svg> diff --git a/doc/icons/grid.svg b/doc/icons/grid.svg new file mode 100644 index 0000000..84ea067 --- /dev/null +++ b/doc/icons/grid.svg @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + id="Layer_1" + x="0px" + y="0px" + width="64px" + height="64px" + viewBox="0 0 64 64" + enable-background="new 0 0 64 64" + xml:space="preserve" + sodipodi:docname="grid.svg" + inkscape:version="0.92.2 5c3e80d, 2017-08-06"><metadata + id="metadata11"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs + id="defs9" /><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1019" + id="namedview7" + showgrid="false" + inkscape:zoom="5.2149125" + inkscape:cx="-6.2556754" + inkscape:cy="42.546677" + inkscape:window-x="0" + inkscape:window-y="34" + inkscape:window-maximized="1" + inkscape:current-layer="Layer_1" /><path + style="fill:#000000;fill-opacity:1;stroke-width:0.66857851" + d="M 11.5 11.5 L 11.5 16.5 L 16.5 16.5 L 16.5 11.5 L 11.5 11.5 z M 23.5 11.5 L 23.5 16.5 L 28.5 16.5 L 28.5 11.5 L 23.5 11.5 z M 35.5 11.5 L 35.5 16.5 L 40.5 16.5 L 40.5 11.5 L 35.5 11.5 z M 47.5 11.5 L 47.5 16.5 L 52.5 16.5 L 52.5 11.5 L 47.5 11.5 z M 11.5 23.5 L 11.5 28.5 L 16.5 28.5 L 16.5 23.5 L 11.5 23.5 z M 23.5 23.5 L 23.5 28.5 L 28.5 28.5 L 28.5 23.5 L 23.5 23.5 z M 35.5 23.5 L 35.5 28.5 L 40.5 28.5 L 40.5 23.5 L 35.5 23.5 z M 47.5 23.5 L 47.5 28.5 L 52.5 28.5 L 52.5 23.5 L [...] + id="rect849" /></svg> \ No newline at end of file diff --git a/doc/icons/heart.svg b/doc/icons/heart.svg new file mode 100644 index 0000000..fd2d890 --- /dev/null +++ b/doc/icons/heart.svg @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + id="Layer_1" + x="0px" + y="0px" + width="64px" + height="64px" + viewBox="0 0 64 64" + enable-background="new 0 0 64 64" + xml:space="preserve" + sodipodi:docname="basic_heart_linea_modified.svg" + inkscape:version="0.92.2 5c3e80d, 2017-08-06"><metadata + id="metadata11"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs + id="defs9" /><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1019" + id="namedview7" + showgrid="false" + inkscape:zoom="2.6074563" + inkscape:cx="32" + inkscape:cy="32" + inkscape:window-x="0" + inkscape:window-y="34" + inkscape:window-maximized="1" + inkscape:current-layer="Layer_1" /><g + id="g4" + style="fill:#000000;fill-opacity:1"><path + d="M 48,4 C 40.643,4 34.361,8.146 32,13.929 29.639,8.146 23.357,4 16,4 5.985,4 0,12.644 0,21 c 0,8.589 5.326,17.755 15.83,27.242 7.738,6.989 15.59,11.577 15.668,11.623 L 32,60.156 32.502,59.865 C 32.581,59.819 40.432,55.231 48.17,48.242 58.674,38.755 64,29.589 64,21 64,12.644 58.015,4 48,4 Z m 0,2 C 16,44.666667 32,25.333333 48,6 Z" + id="path2" + style="fill:#000000;fill-opacity:1" + inkscape:connector-curvature="0" + sodipodi:nodetypes="scsscccccsscc" /></g></svg> \ No newline at end of file diff --git a/doc/icons/help.svg b/doc/icons/help.svg new file mode 100644 index 0000000..fbd6a1b --- /dev/null +++ b/doc/icons/help.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve"> +<circle fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" cx="32" cy="32" r="31"/> +<circle fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" cx="32" cy="32" r="15"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="26" y1="18" x2="26" y2="1"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="38" y1="18" x2="38" y2="1"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="26" y1="63" x2="26" y2="46"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="38" y1="63" x2="38" y2="46"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="46" y1="26" x2="63" y2="26"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="46" y1="38" x2="63" y2="38"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="1" y1="26" x2="18" y2="26"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="1" y1="38" x2="18" y2="38"/> +</svg> diff --git a/doc/icons/list.svg b/doc/icons/list.svg new file mode 100644 index 0000000..a3f2f8d --- /dev/null +++ b/doc/icons/list.svg @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + id="Layer_1" + x="0px" + y="0px" + width="64px" + height="64px" + viewBox="0 0 64 64" + enable-background="new 0 0 64 64" + xml:space="preserve" + sodipodi:docname="list.svg" + inkscape:version="0.92.2 5c3e80d, 2017-08-06"><metadata + id="metadata11"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs + id="defs9" /><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1019" + id="namedview7" + showgrid="false" + inkscape:zoom="5.2149125" + inkscape:cx="-6.2556754" + inkscape:cy="42.546677" + inkscape:window-x="0" + inkscape:window-y="34" + inkscape:window-maximized="1" + inkscape:current-layer="Layer_1" /><g + id="g822" + transform="translate(0,1.7493495)"><path + style="stroke-width:2.1290617" + d="M 6.6875 14.126953 L 6.6875 15.873047 L 57.3125 15.873047 L 57.3125 14.126953 L 6.6875 14.126953 z M 6.6875 25.460938 L 6.6875 27.207031 L 57.3125 27.207031 L 57.3125 25.460938 L 6.6875 25.460938 z M 6.6875 36.792969 L 6.6875 38.539062 L 57.3125 38.539062 L 57.3125 36.792969 L 6.6875 36.792969 z M 6.6875 48.126953 L 6.6875 49.873047 L 57.3125 49.873047 L 57.3125 48.126953 L 6.6875 48.126953 z " + transform="translate(0,-1.7493495)" + id="path2" /></g></svg> \ No newline at end of file diff --git a/doc/icons/lock.svg b/doc/icons/lock.svg new file mode 100644 index 0000000..cbd8446 --- /dev/null +++ b/doc/icons/lock.svg @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve"> +<g> + <path d="M49,17c0-9.374-7.626-17-17-17S15,7.626,15,17v15H7v32h50V32h-8V17z M17,17c0-8.271,6.729-15,15-15s15,6.729,15,15v15H17 + V17z M55,62H9V34h46V62z"/> + <path d="M31,51.898V55h2v-3.102c2.279-0.464,4-2.484,4-4.898c0-2.757-2.243-5-5-5s-5,2.243-5,5C27,49.414,28.721,51.435,31,51.898z + M32,44c1.654,0,3,1.346,3,3s-1.346,3-3,3s-3-1.346-3-3S30.346,44,32,44z"/> +</g> +</svg> diff --git a/doc/icons/logout.svg b/doc/icons/logout.svg new file mode 100644 index 0000000..cfe4e98 --- /dev/null +++ b/doc/icons/logout.svg @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + id="Layer_1" + x="0px" + y="0px" + width="64px" + height="64px" + viewBox="0 0 64 64" + enable-background="new 0 0 64 64" + xml:space="preserve" + sodipodi:docname="logout.svg" + inkscape:version="0.92.4 5da689c313, 2019-01-14"><metadata + id="metadata13"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs + id="defs11" /><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="2560" + inkscape:window-height="1031" + id="namedview9" + showgrid="false" + inkscape:zoom="3.6875" + inkscape:cx="32" + inkscape:cy="32" + inkscape:window-x="0" + inkscape:window-y="25" + inkscape:window-maximized="1" + inkscape:current-layer="Layer_1" /> + +<path + style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10" + d="M 43.000001,46.779297 43,63 H 1 V 1 1 h 42 l 2e-6,16.220703" + id="path826" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> +<g + id="g838" + transform="matrix(1.2438565,0,0,1.2438565,-75.555233,-15.436101)"><polyline + id="polyline2" + points="44,39 51,32 44,25 " + stroke-miterlimit="10" + style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:10" + transform="translate(60.595599,4.6101695)" /><polyline + id="polyline4" + points="51,32 39,32 5,32 " + stroke-miterlimit="10" + style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10" + transform="matrix(0.77250016,0,0,1,72.198091,4.6101695)" /></g></svg> \ No newline at end of file diff --git a/doc/icons/lutin.svg b/doc/icons/lutin.svg new file mode 100644 index 0000000..b165c1c --- /dev/null +++ b/doc/icons/lutin.svg @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="logo" + viewBox="0 0 12.343 31.99085" + version="1.1" + sodipodi:docname="lutin.svg" + width="12.343" + height="31.99085" + inkscape:version="0.92.2 5c3e80d, 2017-08-06"> + <metadata + id="metadata13"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs11" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1019" + id="namedview9" + showgrid="false" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:zoom="4.3958333" + inkscape:cx="2.6161134" + inkscape:cy="15.999213" + inkscape:window-x="0" + inkscape:window-y="34" + inkscape:window-maximized="1" + inkscape:current-layer="logo" /> + <path + style="fill:#000000;fill-opacity:1" + d="m 8.766,27.986638 c -0.368,0.225 -0.736,0.388 -1.144,0.531 -0.286,0.082 -0.49,0.368 -0.47,0.674 0.02,0.511 0.225,1.063 0.593,1.573 0.777,1.083 2.003,1.533 2.718,1.001 0.736,-0.531 0.695,-1.819 -0.082,-2.902 -0.266,-0.388 -0.593,-0.674 -0.94,-0.899 -0.184,-0.123 -0.47,-0.123 -0.674,0.02 z m -5.047,0.082 c -0.225,-0.123 -0.531,-0.123 -0.736,0.041 -0.266,0.204 -0.531,0.45 -0.756,0.756 -0.776,1.083 -0.797,2.391 -0.082,2.902 0.736,0.531 1.962,0.082 2.718,-1.001 0.327,-0.47 0.531,-0.98 [...] + id="path4" + inkscape:connector-curvature="0" /> +</svg> diff --git a/doc/icons/pencil.svg b/doc/icons/pencil.svg new file mode 100644 index 0000000..fb6f04f --- /dev/null +++ b/doc/icons/pencil.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> +<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve"> +<g> + <line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="20" y1="54" x2="10" y2="44"/> +</g> +<polygon fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" points="10,44 1,62 2,63 20,54 63,11 53,1 "/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="54" y1="20" x2="44" y2="10"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="58" y1="16" x2="48" y2="6"/> +<polyline fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" points="5,54 9,55 10,59 "/> +</svg> diff --git a/doc/icons/photo.svg b/doc/icons/photo.svg new file mode 100644 index 0000000..8556391 --- /dev/null +++ b/doc/icons/photo.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve"> +<g> + <polygon fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" points="46,20 38,10 26,10 18,20 1,20 1,52 63,52 + 63,20 "/> + <circle fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" cx="32" cy="36" r="8"/> + <line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="9" y1="20" x2="9" y2="52"/> + <line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="54" y1="28" x2="54" y2="28"/> +</g> +</svg> diff --git a/doc/icons/preferences.svg b/doc/icons/preferences.svg new file mode 100644 index 0000000..1e5e0a2 --- /dev/null +++ b/doc/icons/preferences.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve"> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="12" y1="19" x2="12" y2="64"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="52" y1="0" x2="52" y2="45"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="32" y1="38" x2="32" y2="64"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="26"/> +<circle fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" cx="12" cy="13" r="6"/> +<circle fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" cx="52" cy="51" r="6"/> +<circle fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" cx="32" cy="32" r="6"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="12" y1="0" x2="12" y2="7"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="52" y1="57" x2="52" y2="64"/> +</svg> diff --git a/doc/icons/search.svg b/doc/icons/search.svg new file mode 100644 index 0000000..8033950 --- /dev/null +++ b/doc/icons/search.svg @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve"> +<g> + <circle fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" cx="21" cy="21" r="20"/> + <line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="35" y1="35" x2="41" y2="41"/> + + <rect x="46.257" y="37.065" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 121.9178 50.5)" fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" width="8.485" height="26.87"/> +</g> +</svg> diff --git a/doc/icons/settings.svg b/doc/icons/settings.svg new file mode 100644 index 0000000..8bf1447 --- /dev/null +++ b/doc/icons/settings.svg @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve"> +<g> + <path d="M41,37.586l-4.15-4.15L44.409,26H48c5.019,0,11-2.342,11-13.5v-1.573l-8.778,4.115l-3.038-3.164L51.024,3H49.5 + C38.342,3,36,9.011,36,14v3.59l-7.442,7.554L16.414,13l3.198-3.198L7.845,2.741L4.741,5.845l7.061,11.768L15,14.414l12.154,12.154 + L2.788,51.298l-0.178,0.18l-1.992,6.831l2.968,2.793l6.857-1.696l24.98-24.567L39.586,39l-3,3L57,62.414L64.414,55L44,34.586 + L41,37.586z M7.259,6.155l0.896-0.896l8.232,4.939l-4.189,4.189L7.259,6.155z M9.432,57.595l-5.268,1.304l-1.282-1.207l1.508-5.169 + L38,18.41V14c0-5.6,3.261-8.521,9.958-8.896l-3.142,7.236l4.962,5.117l7.174-3.362C56.547,20.67,53.54,24,48,24h-4.409 + L9.432,57.595z M57,59.586L39.414,42L44,37.414L61.586,55L57,59.586z"/> +</g> +</svg> diff --git a/doc/icons/share.svg b/doc/icons/share.svg new file mode 100644 index 0000000..16b37ee --- /dev/null +++ b/doc/icons/share.svg @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve"> +<circle fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" cx="51" cy="13" r="12"/> +<circle fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" cx="11" cy="42" r="10"/> +<circle fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" cx="48" cy="55" r="8"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="40" y1="54" x2="20" y2="46"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="19" y1="35" x2="41" y2="21"/> +</svg> diff --git a/doc/icons/square-plus.svg b/doc/icons/square-plus.svg new file mode 100644 index 0000000..92fe5f1 --- /dev/null +++ b/doc/icons/square-plus.svg @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve"> +<g> + <line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="32" y1="50" x2="32" y2="14"/> + <line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="14" y1="32" x2="50" y2="32"/> +</g> +<rect x="1" y="1" fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" width="62" height="62"/> +</svg> diff --git a/doc/icons/trashcan.svg b/doc/icons/trashcan.svg new file mode 100644 index 0000000..5450b98 --- /dev/null +++ b/doc/icons/trashcan.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve"> +<g> + <polyline fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" points="25,8 25,1 39,1 39,8 "/> + <polyline fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" points="14,10 14,63 50,63 50,10 "/> + <line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="26" y1="20" x2="26" y2="54"/> + <line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="38" y1="20" x2="38" y2="54"/> + <line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="10" y1="9" x2="54" y2="9"/> +</g> +</svg> diff --git a/doc/icons/user-group.svg b/doc/icons/user-group.svg new file mode 100644 index 0000000..a71a2e3 --- /dev/null +++ b/doc/icons/user-group.svg @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + id="Layer_1" + x="0px" + y="0px" + width="64px" + height="64px" + viewBox="0 0 64 64" + enable-background="new 0 0 64 64" + xml:space="preserve" + sodipodi:docname="user-group.svg" + inkscape:version="0.92.4 5da689c313, 2019-01-14"><metadata + id="metadata15"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs + id="defs13"> + + +</defs><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="2560" + inkscape:window-height="1031" + id="namedview11" + showgrid="false" + inkscape:zoom="5.2149126" + inkscape:cx="61.821718" + inkscape:cy="42.819775" + inkscape:window-x="0" + inkscape:window-y="25" + inkscape:window-maximized="1" + inkscape:current-layer="Layer_1" /> + + +<g + id="g906"><g + transform="matrix(0.71492767,0,0,0.71492767,9.5367426,12.928698)" + id="g864"><path + style="fill:none;stroke:#000000;stroke-width:1.99999988;stroke-miterlimit:10" + inkscape:connector-curvature="0" + id="path4" + d="M 41.829928,19.367159 C 41.805732,13.492229 37.429901,8.7328298 32,8.7328298 c -5.429901,0 -9.712943,4.7605702 -9.829929,10.6343292 -0.153083,7.686227 5.646948,15.981982 6.805335,16.306022 2.016396,1.692042 4.032791,1.181093 6.049187,0 1.066076,-0.355239 6.330449,-8.245165 6.805335,-16.306022 z" + stroke-miterlimit="10" + sodipodi:nodetypes="cssccc" /><path + style="fill:none;stroke:#000000;stroke-width:1.99999988;stroke-miterlimit:10" + d="m 23.682368,33 -6.805335,6.066793 -3.780742,18.200378 H 32 50.903709 L 47.122967,39.066793 40.317632,33" + id="polyline8" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /><path + sodipodi:nodetypes="cssc" + inkscape:connector-curvature="0" + id="path834" + d="m 23.298853,33.886879 0.525702,2.075005 c 2.058897,8.126698 14.527305,7.480767 16.356066,0.02213 l 0.496557,-2.02522" + style="fill:none;stroke:#000000;stroke-width:1.99999988;stroke-miterlimit:10" /></g><g + id="g890"><path + sodipodi:nodetypes="cssccc" + stroke-miterlimit="10" + d="m 57.442119,18.691002 c -0.0173,-4.20015 -3.145701,-7.602776 -7.027688,-7.602776 -3.881986,0 -6.944051,3.403463 -7.027688,7.602776 -0.109443,5.495097 4.03716,11.425961 4.865322,11.657627 1.441578,1.209687 2.883154,0.844396 4.324732,0 0.762167,-0.253971 4.525813,-5.894697 4.865322,-11.657627 z" + id="path836" + inkscape:connector-curvature="0" + style="fill:none;stroke:#000000;stroke-width:1.42985523;stroke-miterlimit:10" /><path + style="fill:none;stroke:#000000;stroke-width:1.42985523;stroke-miterlimit:10" + d="M 47.103612 45.78677 L 50.414431 45.78677 L 63.929216 45.78677 L 61.226259 32.774816 L 56.360937 28.437498 " + id="path873" /><path + style="fill:none;stroke:#000000;stroke-width:1.42985523;stroke-miterlimit:10" + d="M 44.467926 28.437498 L 42.56705 30.132081 " + id="path838" /><path + style="fill:none;stroke:#000000;stroke-width:1.42985523;stroke-miterlimit:10" + d="m 44.193741,29.071552 0.375839,1.483478 c 1.471962,5.810002 10.385972,5.348208 11.693404,0.01582 l 0.355002,-1.447886" + id="path840" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cssc" /></g><g + id="g884"><path + style="fill:none;stroke:#000000;stroke-width:1.42985523;stroke-miterlimit:10" + inkscape:connector-curvature="0" + id="path852" + d="m 21.442114,18.691002 c -0.0173,-4.20015 -3.145701,-7.602776 -7.027688,-7.602776 -3.881986,0 -6.9440513,3.403463 -7.0276878,7.602776 -0.1094433,5.495097 4.0371598,11.425961 4.8653218,11.657627 1.441578,1.209687 2.883154,0.844396 4.324732,0 0.762167,-0.253971 4.525813,-5.894697 4.865322,-11.657627 z" + stroke-miterlimit="10" + sodipodi:nodetypes="cssccc" /><path + style="fill:none;stroke:#000000;stroke-width:1.42985523;stroke-miterlimit:10" + d="M 22.253573 30.124742 L 20.360932 28.437498 " + id="path878" /><path + style="fill:none;stroke:#000000;stroke-width:1.42985523;stroke-miterlimit:10" + d="M 8.4679212 28.437498 L 3.6025989 32.774816 L 0.89964181 45.78677 L 14.414426 45.78677 L 17.738438 45.786771 " + id="path854" /><path + sodipodi:nodetypes="cssc" + inkscape:connector-curvature="0" + id="path856" + d="m 8.1937357,29.071552 0.3758389,1.483478 c 1.4719624,5.810002 10.3859724,5.348208 11.6934044,0.01582 l 0.355002,-1.447886" + style="fill:none;stroke:#000000;stroke-width:1.42985523;stroke-miterlimit:10" /></g></g></svg> \ No newline at end of file diff --git a/doc/icons/user.svg b/doc/icons/user.svg new file mode 100644 index 0000000..834cfaa --- /dev/null +++ b/doc/icons/user.svg @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + id="Layer_1" + x="0px" + y="0px" + width="64px" + height="64px" + viewBox="0 0 64 64" + enable-background="new 0 0 64 64" + xml:space="preserve" + sodipodi:docname="user.svg" + inkscape:version="0.92.4 5da689c313, 2019-01-14"><metadata + id="metadata15"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs + id="defs13"> + + +</defs><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="2560" + inkscape:window-height="1031" + id="namedview11" + showgrid="false" + inkscape:zoom="1.84375" + inkscape:cx="-40.891282" + inkscape:cy="18.912503" + inkscape:window-x="0" + inkscape:window-y="25" + inkscape:window-maximized="1" + inkscape:current-layer="Layer_1" /> + +<path + style="fill:none;stroke:#000000;stroke-width:1.99999988;stroke-miterlimit:10" + inkscape:connector-curvature="0" + id="path4" + d="M 41.829928,19.367159 C 41.805732,13.492229 37.429901,8.7328298 32,8.7328298 c -5.429901,0 -9.712943,4.7605702 -9.829929,10.6343292 -0.153083,7.686227 5.646948,15.981982 6.805335,16.306022 2.016396,1.692042 4.032791,1.181093 6.049187,0 1.066076,-0.355239 6.330449,-8.245165 6.805335,-16.306022 z" + stroke-miterlimit="10" + sodipodi:nodetypes="cssccc" /><path + style="fill:none;stroke:#000000;stroke-width:1.99999988;stroke-miterlimit:10" + d="m 23.682368,33 -6.805335,6.066793 -3.780742,18.200378 H 32 50.903709 L 47.122967,39.066793 40.317632,33" + id="polyline8" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> +<path + sodipodi:nodetypes="cssc" + inkscape:connector-curvature="0" + id="path834" + d="m 23.298853,33.886879 0.525702,2.075005 c 2.058897,8.126698 14.527305,7.480767 16.356066,0.02213 l 0.496557,-2.02522" + style="fill:none;stroke:#000000;stroke-width:1.99999988;stroke-miterlimit:10" /></svg> \ No newline at end of file diff --git a/doc/icons/world.svg b/doc/icons/world.svg new file mode 100644 index 0000000..a5cc737 --- /dev/null +++ b/doc/icons/world.svg @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve"> +<path fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" d="M32.001,0.887c17.184,0,31.113,13.929,31.112,31.113 + C63.114,49.185,49.184,63.115,32,63.113C14.815,63.114,0.887,49.185,0.888,32.001C0.885,14.816,14.815,0.887,32.001,0.887z"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="32" y1="1" x2="32" y2="63"/> +<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="63" y1="32" x2="1" y2="32"/> +<path fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" d="M30,1c0,0-14,11-14,31s14,31,14,31"/> +<path fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" d="M34,1c0,0,14,11,14,31S34,63,34,63"/> +<path fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" d="M8,12c0,0,5,10,24,10s24-10,24-10"/> +<path fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" d="M8,52c0,0,5-10,24-10s24,10,24,10"/> +</svg> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

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 61fa6d6fcfa6fb93f6ba21d26c6d0de2a82890e6 Author: kaufmann <kaufmann@codelutin.com> Date: Wed Feb 5 11:22:16 2020 +0100 Modification de l'affichage des formulaire de création et modification --- bow-ui/src/main/less/common/_form.less | 14 +++++- bow-ui/src/main/less/common/_tabs.less | 44 +++++++++++++++-- .../main/resources/i18n/bow-ui_en_GB.properties | 4 ++ .../main/resources/i18n/bow-ui_fr_FR.properties | 4 ++ .../src/main/webapp/WEB-INF/jsp/editBookmark.jsp | 4 +- bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp | 56 ++++++++++++++-------- bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 16 ++++--- bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp | 43 +++++++++++++---- 8 files changed, 143 insertions(+), 42 deletions(-) diff --git a/bow-ui/src/main/less/common/_form.less b/bow-ui/src/main/less/common/_form.less index 57c370e..c9680c1 100644 --- a/bow-ui/src/main/less/common/_form.less +++ b/bow-ui/src/main/less/common/_form.less @@ -10,11 +10,12 @@ .bow-form-row { text-align: left; - border-bottom: 1px solid @color-separation-border; + // border-bottom: 1px solid @color-separation-border; padding-top: @default-marge--small; padding-bottom: @default-marge--small; display: flex; - + flex-direction: column; + label { display: block; float: left; @@ -35,4 +36,13 @@ border-radius: 3px; padding: @default-marge--small @default-marge--small; } +} + +select { + padding: (@default-marge--small / 2) (2 * @default-marge--small); + + background-color: inherit; + border: 1px solid @color-main; + border-right-color: @color-button-border-2; + border-top-color: @color-button-border-2; } \ No newline at end of file diff --git a/bow-ui/src/main/less/common/_tabs.less b/bow-ui/src/main/less/common/_tabs.less index e0379b8..b2a5bcf 100644 --- a/bow-ui/src/main/less/common/_tabs.less +++ b/bow-ui/src/main/less/common/_tabs.less @@ -7,8 +7,11 @@ justify-content: center; list-style: none; - padding-bottom: @default-marge--medium; + margin-bottom: @default-marge--large; padding-top: @default-marge--medium; + padding-bottom: 6px; + + border-bottom: 1px solid #eee; li { margin: 0 20px; @@ -22,13 +25,27 @@ line-height: 21px; color: @color-black; text-decoration: none; - padding-bottom: 5px; } } } section.tab { display: none; + + h2, h3 { + text-align: center; + } + h3 { + margin-bottom: @default-marge--small; + margin-top: @default-marge--medium; + } + ul { + list-style: none; + + li { + margin-bottom: @default-marge--small; + } + } } #tab-1:checked ~ section.tab-1, @@ -48,4 +65,25 @@ section.tab { #tab-6:checked ~ .tabs .tab-6 { color: @color-main; border-bottom: 3px solid @color-main; -} \ No newline at end of file +} + +@media screen and (max-width: @screen-desktop-large - 1) { + .tabs { + flex-direction: column; + + & li { + margin-bottom: @default-marge--small; + } + } +} + +@media screen and (min-width: @screen-desktop-large) { + .tabs { + + & li { + label { + padding-bottom: @default-marge--small / 2; + } + } + } +} diff --git a/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties b/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties index b14f615..49d7fa7 100644 --- a/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties +++ b/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties @@ -35,6 +35,7 @@ bow.bookmark.import.successful=The bookmarks were imported successfully bow.bookmark.remove.successful=The bookmark was removed successfully bow.bookmark.screenshot.updated.successful=Update screenshot successful bow.bookmark.tag.deleted=The tag was removed successfully +bow.bookmark.tag.selected=Tags selected bow.bookmark.tags=Tags bow.bookmark.update.successful=The bookmark was updated successfully bow.bookmarks.noBookmarks=No bookmarks @@ -158,6 +159,7 @@ bow.register.title=Register bow.requiredstring=${getText(fieldKey)} is required bow.rightMenu.addUrl.link=Add entry bow.rightMenu.admin=Admin +bow.rightMenu.bookmark=Bookmark bow.rightMenu.bookmark.addModify=Add / Modify bow.rightMenu.bookmark.alias=ALIAS bow.rightMenu.bookmark.link=URL @@ -179,6 +181,7 @@ bow.rightMenu.importBookmarks=Import bookmarks bow.rightMenu.logout=Logout bow.rightMenu.search=Search bow.rightMenu.search.tags=by tags +bow.rightMenu.token=Token bow.rightMenu.token.permanent=Permanent token id bow.rightMenu.token.temporary=Session token id bow.search.ascclick=Asc. clicks nb @@ -206,6 +209,7 @@ bow.sharedUserEdit.save=Save bow.sharedUserEdit.title=Shared user edition bow.sharedUserView.documentation=Add tag '\#<user name>' for this user to access the bookmark with this tag bow.sharedUserView.title=Your shared user +bow.temporary.link=Search URL bow.temporary.link.search=Temporary search URL bow.temporary.link.searchDescription=Temporary link (session) to use Bow as search engine in your browser bow.temporary.link.suggestion=Temporary suggest URL diff --git a/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties b/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties index ef73f4b..cd9df4c 100644 --- a/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties +++ b/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties @@ -35,6 +35,7 @@ bow.bookmark.import.successful=Les marque-pages ont été importés avec succès bow.bookmark.remove.successful=Le marque-page a été supprimé avec succès bow.bookmark.screenshot.updated.successful=Mise à jour de la capture d'écran réussi bow.bookmark.tag.deleted=Le tag a été supprimé avec succès +bow.bookmark.tag.selected=Tags sélectionnés bow.bookmark.tags=Tags bow.bookmark.update.successful=Le marque-page a été mis à jour avec succès bow.bookmarks.noBookmarks=Pas de marque-page @@ -158,6 +159,7 @@ bow.register.title=S'enregistrer bow.requiredstring=${getText(fieldKey)} est obligatoire bow.rightMenu.addUrl.link=Ajouter une entrée bow.rightMenu.admin=Admin +bow.rightMenu.bookmark=Bookmark bow.rightMenu.bookmark.addModify=Ajouter / Modifier bow.rightMenu.bookmark.alias=ALIAS bow.rightMenu.bookmark.link=URL @@ -179,6 +181,7 @@ bow.rightMenu.importBookmarks=Importer des marque-pages bow.rightMenu.logout=Déconnexion bow.rightMenu.search=Recherche bow.rightMenu.search.tags=par tags +bow.rightMenu.token=Token bow.rightMenu.token.permanent=Token permanent bow.rightMenu.token.temporary=Token session bow.search.ascclick=Nb clics asc. @@ -206,6 +209,7 @@ bow.sharedUserEdit.save=Save bow.sharedUserEdit.title=Edition d'un utilisateur de partage bow.sharedUserView.documentation=Ajouter le tag '\#<nom de l'utilisateur>' pour que cet utilisateur puisse accéder au bookmark ayant ce tag bow.sharedUserView.title=Tous vos utilisateurs de partage +bow.temporary.link=URL de recherche bow.temporary.link.search=URL de recherche temporaire bow.temporary.link.searchDescription=Lien temporaire (le temps de la session) pour utiliser Bow comme moteur de recherche dans votre navigateur bow.temporary.link.suggestion=URL de suggesion temporaire diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp index 53f4d34..f3fb4a4 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp @@ -57,7 +57,9 @@ <s:textfield name="publicAlias" labelSeparator=" " key="popup.addurl.alias.public" value="%{bookmark.publicAlias}" /> </div> - <s:submit cssClass="submit-button" key="popup.commons.submit" name="submit" /> + <div class="buttons-group"> + <s:submit cssClass="submit-button" key="popup.commons.submit" name="submit" /> + </div> </s:form> </div> </body> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp index fa4b762..85bb51f 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp @@ -79,32 +79,46 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. </head> <body onload="showAddedMembers()"> <div id="content"> - <div class="menu clearfix"> - <h2><s:text name="bow.groupEdit.title" /></h2> - </div> - <div class="formFrame fond"> - <s:form id="groupEditForm" cssClass="pretty-form" action="groupSave" + + <div class="bow-form-wrapper"> + <s:form id="groupEditForm" cssClass="bow-form" action="groupSave" method="post" onsubmit="prepareSendMembers()"> <s:hidden name="tagLine" value="%{tagLine}" /> <s:hidden name="fullTextLine" value="%{fullTextLine}" /> <s:hidden name="groupId" value="%{groupId}"/> - <s:if test="config.allowPublicGroup"> - <s:checkbox labelposition="left" name="public" labelSeparator=" " key="bow.groupEdit.public" - value="%{public}" /> - </s:if> - <s:textfield disabled="%{groupId != null}" name="group.name" labelSeparator=" " key="bow.groupEdit.name" - value="%{group.name}" /> - - <s:textfield name="group.description" labelSeparator=" " key="bow.groupEdit.description" - value="%{group.description}" /> - - <s:select id="members" - list="%{group.getMembers(false)}" listKey="wikittyId" listValue="getFqField('WikittyUser.login')" - multiple="true" size="10" - name="group.members" labelSeparator=" " key="bow.groupEdit.members" /> - <button type='button' name="-" onclick="removeUser()">-</button> - <div><s:textfield id="userLogin" onkeypress="return addUserEnter(event)"/> <button type='button' name="+" onclick="addUser()">+</button></div> + <h1><s:text name="bow.groupEdit.title" /></h1> + + + <div class="bow-form-row"> + <s:if test="config.allowPublicGroup"> + <s:checkbox labelposition="left" name="public" labelSeparator=" " key="bow.groupEdit.public" + value="%{public}" /> + </s:if> + </div> + + <div class="bow-form-row"> + <s:textfield disabled="%{groupId != null}" name="group.name" labelSeparator=" " key="bow.groupEdit.name" + value="%{group.name}" /> + </div> + + + <div class="bow-form-row"> + <s:textfield name="group.description" labelSeparator=" " key="bow.groupEdit.description" + value="%{group.description}" /> + </div> + + <div class="bow-form-row"> + <s:select id="members" + list="%{group.getMembers(false)}" listKey="wikittyId" listValue="getFqField('WikittyUser.login')" + multiple="true" size="10" + name="group.members" labelSeparator=" " key="bow.groupEdit.members" /> + <button type='button' name="-" onclick="removeUser()">-</button> + </div> + + <div class="bow-form-row"> + <s:textfield id="userLogin" onkeypress="return addUserEnter(event)"/> <button type='button' name="+" onclick="addUser()">+</button> + </div> <s:submit cssClass="submit-button" key="bow.groupEdit.save" name="submit" /> <s:submit cssClass="submit-button" key="bow.groupEdit.delete" name="delete" action="groupDelete"/> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp index ad639e3..3880709 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp @@ -32,13 +32,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <title><s:text name="bow.groupView.title"/></title> </head> <body> + <jsp:include page="inc/header.jsp" flush="true"/> + <div class="bow-form-wrapper"> <h1><s:text name="bow.groupView.title"/></h1> <s:actionerror/> - <div class="bow-form"> - <s:a action="groupEdit"><s:text name="bow.group.new" /></s:a> - <ul> + <div> + <ul class="items-list"> <s:iterator value="groups" var="group"> <s:set name="group" value="group"/> <li class="public-${u:isPublicGroup(group)}" title="${group.description}"> @@ -49,24 +50,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <s:url var="groupEdit" action="groupEdit" escapeAmp="true"> <s:param name="groupId" value="%{#group.wikittyId}" /> </s:url> - <a class="edit" href="${groupEdit}">edit</a> + <a class="button" href="${groupEdit}">edit</a> <s:url var="groupRemoveMe" action="groupRemoveMe" escapeAmp="true"> <s:param name="groupId" value="%{#group.wikittyId}" /> <s:param name="user" value="%{bowSession.user.wikittyId}" /> </s:url> - <a class="removeMe" href="${groupRemoveMe}">removeMe</a> + <a class="button" href="${groupRemoveMe}">removeMe</a> <s:url var="atom" action="atom" escapeAmp="true"> <s:param name="token" value="%{bowSession.permanentToken}" /> <s:param name="tagLine" value="%{'@' + #group.name}" /> <s:param name="notmine" value="true" /> </s:url> - <a class="atom" href="${atom}">atom</a> + <a class="button" href="${atom}">atom</a> </span> </li> </s:iterator> </ul> + <div class="buttons-group"> + <s:a action="groupEdit" cssClass="button"><s:text name="bow.group.new" /></s:a> + </div> </div> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp index a503745..3819bfe 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp @@ -27,6 +27,9 @@ <title><s:text name="bow.preferences.title"/></title> </head> <body> + +<jsp:include page="inc/header.jsp" flush="true"/> + <div class="bow-form-wrapper"> <h1><s:text name="bow.preferences.title"/></h1> <s:actionerror/> @@ -67,6 +70,9 @@ <s:set var="bowUrl" value="config.bowUrl" /> <s:set var="permanentToken" value="bowSession.getPermanentToken()" /> <s:set var="temporaryToken" value="bowSession.getTemporaryToken()" /> + + <h3><s:text name="bow.temporary.link"/></h3> + <ul> <li> <s:a title="%{getText('bow.temporary.link.searchDescription')}" @@ -92,6 +98,11 @@ <s:text name="bow.permanent.link.suggestion" /> </s:a> </li> + </ul> + + <h3><s:text name="bow.rightMenu.extensions"/> / <s:text name="bow.rightMenu.bookmark"/></h3> + + <ul> <li> <s:text name="bow.rightMenu.bookmark.temporaryLink" /> <a href="${u:scriptletAdd(bowUrl, temporaryToken)}">BowAddTemp</a> @@ -106,6 +117,11 @@ <s:text name="bow.rightMenu.chromiumExtension" /> </a> </li> + </ul> + + <h3><s:text name="bow.rightMenu.token.permanent"/></h3> + + <ul> <li> <strong><s:text name="bow.rightMenu.token.permanent"/> :</strong> <s:property value="%{#permanentToken}"/> @@ -154,7 +170,10 @@ labelposition="top"/> </div> <s:hidden name="update" value="user"/> - <s:submit key="bow.preferences.submit" name="submit"/> + + <div class="buttons-group"> + <s:submit type="button" key="bow.preferences.submit" name="submit" cssClass="submit-button"/> + </div> </s:form> </section> @@ -195,7 +214,10 @@ </div> <s:hidden name="update" value="authentication"/> - <s:submit key="bow.preferences.submit" name="submit"/> + + <div class="buttons-group"> + <s:submit type="button" key="bow.preferences.submit" name="submit" cssClass="submit-button"/> + </div> </s:form> <script type="text/javascript"> @@ -242,14 +264,17 @@ <td><s:textfield name="searchPrefix[%{#stat.index}].prefix" value="%{prefix}"/></td> <td><s:textfield name="searchPrefix[%{#stat.index}].search" value="%{search}"/></td> <td><s:textfield name="searchPrefix[%{#stat.index}].suggestion" value="%{suggestion}"/></td> - <td><s:submit action="removePrefix" value="X" onclick="return setRemoveIndex(%{#stat.index})"></s:submit></td> + <td><s:submit type="button" action="removePrefix" value="X" onclick="return setRemoveIndex(%{#stat.index})" cssClass="submit-button"></s:submit></td> </tr> </s:iterator> </table> - <s:submit action="addPrefix" value="add prefix"></s:submit> - <s:hidden name="update" value="site"/> - <s:submit key="bow.preferences.submit" name="submit"/> + <div class="buttons-group"> + <s:submit type="button" action="addPrefix" value="add prefix" cssClass="submit-button"></s:submit> + + <s:hidden name="update" value="site"/> + <s:submit type="button" key="bow.preferences.submit" name="submit" cssClass="submit-button"/> + </div> </s:form> </section> @@ -264,8 +289,8 @@ </div> <div class="action"> <s:text name="bow.preferences.labels.name.field"/><s:textfield name="newLabel" /> - <s:submit name="rename" key="bow.preferences.labels.rename.submit" /> - <s:submit name="delete" key="bow.preferences.labels.delete.submit" /> + <s:submit type="button" name="rename" key="bow.preferences.labels.rename.submit" cssClass="submit-button" /> + <s:submit type="button" name="delete" key="bow.preferences.labels.delete.submit" cssClass="submit-button" /> </div> </s:form> </section> @@ -280,7 +305,7 @@ <s:file name="upfile" labelSeparator=""/> <s:hidden name="tagLine" value="%{tagLine}"/> <s:hidden name="fullTextLine" value="%{fullTextLine}"/> - <s:submit key="bow.preferences.import.submit" name="submit"/> + <s:submit type="button" key="bow.preferences.import.submit" name="submit" cssClass="submit-button"/> </s:form> <s:if test="bookmarksImportDate != null"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

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 2a19c0fa740e3a36b79d0420d3e329228b37bf33 Author: kaufmann <kaufmann@codelutin.com> Date: Wed Feb 5 11:24:16 2020 +0100 Modifications générales d'affichage --- bow-ui/src/main/less/base/_footer.less | 25 +++++++- bow-ui/src/main/less/base/_header.less | 31 +++++++++- bow-ui/src/main/less/base/_layout.less | 2 + bow-ui/src/main/less/base/_sidebar.less | 14 ++++- bow-ui/src/main/less/common/_button.less | 71 +++++++++++++++++++++- bow-ui/src/main/less/common/_modal.less | 3 - bow-ui/src/main/less/variables/_colors.less | 21 +++++-- bow-ui/src/main/less/variables/_globals.less | 6 +- bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp | 2 + .../main/webapp/WEB-INF/jsp/inc/header-empty.jsp | 25 ++++++++ bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp | 65 +++++++++----------- bow-ui/src/main/webapp/WEB-INF/jsp/inc/sidebar.jsp | 51 +++------------- .../src/main/webapp/WEB-INF/jsp/sharedUserView.jsp | 2 + 13 files changed, 219 insertions(+), 99 deletions(-) diff --git a/bow-ui/src/main/less/base/_footer.less b/bow-ui/src/main/less/base/_footer.less index 806b396..f91efd6 100644 --- a/bow-ui/src/main/less/base/_footer.less +++ b/bow-ui/src/main/less/base/_footer.less @@ -1,11 +1,30 @@ #footer{ - margin-top: -@default-footer-height; height: @default-footer-height; + + padding: @default-marge--small; + margin-top: -@default-footer-height; + text-align: center; color: #CCC; - + + p { + margin-top: @default-marge--small; + } + a { - color: #BBB; + color: inherit; + + &:hover { + color: @color-link-hover; + } + } + + .icon { + margin-left: @default-marge--tiny; + margin-right: @default-marge--tiny; + } + .icon-lutin { + font-size: 140%; } } diff --git a/bow-ui/src/main/less/base/_header.less b/bow-ui/src/main/less/base/_header.less index 3fad4b5..5656a9a 100644 --- a/bow-ui/src/main/less/base/_header.less +++ b/bow-ui/src/main/less/base/_header.less @@ -8,17 +8,44 @@ & > a, & > div { flex: 1; + + height: 100%; + } + + &.empty { + height: @default-sidebar-width; + + background-color: @color-sidebar-background; } } .header-logo { + padding: @default-marge--medium; + text-align: left; } #header-search { - text-align: center; + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + + border-left: 1px solid #EEE; + border-right: 1px solid #EEE; + + & > * { + margin: @default-marge--small; + } } #header-user-infos { - text-align: right; + display: flex; + flex-direction: row; + align-items: center; + justify-content: right; + + & > * { + margin: @default-marge--small; + } } \ No newline at end of file diff --git a/bow-ui/src/main/less/base/_layout.less b/bow-ui/src/main/less/base/_layout.less index a203f09..0974156 100644 --- a/bow-ui/src/main/less/base/_layout.less +++ b/bow-ui/src/main/less/base/_layout.less @@ -16,7 +16,9 @@ body{ } #bow-main { + width: calc(100vw - @default-sidebar-width); min-height: 100vh; + padding-bottom: @default-footer-height; } diff --git a/bow-ui/src/main/less/base/_sidebar.less b/bow-ui/src/main/less/base/_sidebar.less index 64f12a2..2c66ca1 100644 --- a/bow-ui/src/main/less/base/_sidebar.less +++ b/bow-ui/src/main/less/base/_sidebar.less @@ -43,6 +43,7 @@ position: relative; flex: 1; + max-height: 150px; text-align: center; @@ -50,12 +51,19 @@ font-size: 30px; color: @color-menu-link; } - a { + a, + span { z-index: 10; width: 100%; } + a { + display: flex; + height: 100%; + align-items: center; + justify-content: center; + } &:hover .icon { - color: @color-menu-link-hover; + color: #FFF; } &:before{ content: ''; @@ -64,7 +72,7 @@ left: 0; height: 100%; width: 0; - background-color: #FFF2; + background-color: @color-menu-link-hover;// #FFF2; opacity: 0; transition: width 0.4s ease-in-out, opacity 0.4s ease-in-out; } diff --git a/bow-ui/src/main/less/common/_button.less b/bow-ui/src/main/less/common/_button.less index a100b91..b84d228 100644 --- a/bow-ui/src/main/less/common/_button.less +++ b/bow-ui/src/main/less/common/_button.less @@ -1,18 +1,83 @@ a { + position: relative; color: @color-link; text-decoration: none; + &::after { + content: ''; + position: absolute; + bottom: -3px; + left: 50%; + width: 0px; + height: 1px; + // border-radius: 50%; + background-color: @color-link-hover; + opacity: 0; + transform: translate3d(-50%, 0, 0); + transition: all 0.2s ease; + } + &:hover { color: @color-link-hover; + + &::after { + width: 50%; + opacity: 1; + } } } -.buttton, +button, +.button, .submit-button { + position: relative; + + padding: @default-marge--small / 2 @default-marge--small; + background-color: transparent; border: 2px solid @color-main; + border-right-color: @color-button-border-2; + border-top-color: @color-button-border-2; + border-radius: 2px; color: @color-main; + cursor: pointer; + // font-size: 110%; + outline: none; - - padding: @default-marge--small / 2 @default-marge--small; + + transition: color 0.3s ease , border 1s ease ; + + &::after { + content: ''; + position: absolute; + bottom: 0px; + left: 50%; + width: 50%; + height: 1px; + // border-radius: 50%; + background-color: @color-link-hover; + opacity: 0; + transform: translate3d(-50%, 0, 0); + transition: all 0.2s ease; + } + + &:hover { + border-color: @color-link-hover; + // border-style: dashed; + color: @color-link-hover; + &::after { + bottom: -6px; + width: 100%; + opacity: 1 + } + } +} + + +.buttons-group { + button, + .button, + .submit-button { + margin: @default-marge--small; + } } \ No newline at end of file diff --git a/bow-ui/src/main/less/common/_modal.less b/bow-ui/src/main/less/common/_modal.less index 7d4484d..e69de29 100644 --- a/bow-ui/src/main/less/common/_modal.less +++ b/bow-ui/src/main/less/common/_modal.less @@ -1,3 +0,0 @@ -.fullscreen-modal { - display: none; -} \ No newline at end of file diff --git a/bow-ui/src/main/less/variables/_colors.less b/bow-ui/src/main/less/variables/_colors.less index 68e21e8..ead63c1 100644 --- a/bow-ui/src/main/less/variables/_colors.less +++ b/bow-ui/src/main/less/variables/_colors.less @@ -1,37 +1,46 @@ @color-green : #079992; +@color-green-2 : #057974; @color-red : #b71540; @color-black : #1e2a2f; @color-grey : #999; +@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-blue-pale : #E9F2F5; @col-grey-medium : #DDD; @col-grey-pale : #f9f5f7; @color-background : #FFF; -@color-background-tag-cloud : @color-main; +@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 : @color-grey; +@color-menu-link : #FFF;//@color-grey; @color-menu-link-hover : @color-red; -@color-link : @color-green; -@color-link-hover : darken(@color-green, 25%); +@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-form-label : @color-black; @color-separation-border : @color-grey; +@color-text : @color-black; @color-text-on-color : #FFF; -@color-bookmark-header-background : mix(#FFF, @color-main, 90%); +@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/less/variables/_globals.less b/bow-ui/src/main/less/variables/_globals.less index 74eb9d0..1a30234 100644 --- a/bow-ui/src/main/less/variables/_globals.less +++ b/bow-ui/src/main/less/variables/_globals.less @@ -1,6 +1,7 @@ @default-footer-height: 100px; @default-sidebar-width: 75px; +@default-marge--tiny: 5px; @default-marge--small: 10px; @default-marge--medium: 30px; @default-marge--large: 50px; @@ -8,4 +9,7 @@ @default-font: Titillium; @defaut-font-size: 16px; -@default-bookmark-radius: 3px; \ No newline at end of file +@default-bookmark-radius: 3px; + +@screen-desktop-low : 984px; +@screen-desktop-large : 1200px; \ No newline at end of file diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp index 115e216..a388f76 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp @@ -28,6 +28,8 @@ <head> </head> <body> + <jsp:include page="inc/header.jsp" flush="true"/> + <div class="bow-form-wrapper"> <h1><s:text name="bow.admin.panel" /></h1> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header-empty.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header-empty.jsp new file mode 100644 index 0000000..005524e --- /dev/null +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header-empty.jsp @@ -0,0 +1,25 @@ +<%-- +#%L + BOW UI + %% + Copyright (C) 2010 - 2011 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + 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 contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> + +<div id="header" class="empty"> +</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 9b74131..eedde19 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 @@ -25,56 +25,51 @@ xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> - <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="header-logo" action="home"> - <img src="img/logos/bow-text.svg" alt="Bow" /> - </s:a> - </s:if> - <s:else> - <s:a cssClass="header-logo" action="home"> - <img src="img/logos/bow-text.svg" alt="Bow" /> - </s:a> - </s:else> + <div class="header-logo"> + <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 action="home"> + <img src="img/logos/bow-text.svg" alt="Bow" /> + </s:a> + </s:if> + <s:else> + <s:a action="home"> + <img src="img/logos/bow-text.svg" alt="Bow" /> + </s:a> + </s:else> + </div> <div id="header-search"> <span class="header-search-label"> - <i class="icon-search icon"></i> Recherche + <i class="icon-search icon"></i> </span> - <select> - <option value="tag">Par tag</option> - <option value="fulltext">Full text</option> + + <select id="searchType"> + <option value="tagLine">Par tag</option> + <option value="fullTextLine">Full text</option> + <option value="q">Web</option> </select> - <s:form action="home" theme="simple"> - <s:textfield name="tagLine" labelSeparator="" /> + + <s:form id="searchForm" action="home" theme="simple"> + <s:textfield name="searchInput" labelSeparator="" /> + <s:hidden name="tagLine" value=""/> + <s:hidden name="fullTextLine" value=""/> + <s:hidden name="q" value=""/> <s:hidden name="order" value="%{order}"/> <s:hidden name="token" value="%{#session.BowSession.getPermanentToken()}"/> </s:form> - <!-- <s:form action="home" theme="simple"> - <s:textfield name="fullTextLine" labelSeparator="" /> - <s:hidden name="order" value="%{order}"/> - <s:hidden name="token" value="%{#session.BowSession.getPermanentToken()}"/> - </s:form> --> - <!--div class="search-tag"> - <s:form action="openSearchResult" theme="simple"> - <s:hidden name="token" value="%{#session.BowSession.getPermanentToken()}"/> - <s:textfield name="q" labelSeparator="" /> - <s:submit key="bow.rightMenu.externSearchEngine" name="submit" /> - </s:form> - </div--> + + <s:a href="#" type="button" onclick="searchBookmarks()" cssClass="button">Rechercher</s:a> </div> <s:if test="%{#session.BowSession.user != null}"> <div id="header-user-infos"> <s:if test="!bowSession.user.extensionNames.contains('BowSharedUser')"> <s:a action="preferences" cssClass="header-link">${bowSession.user.login}</s:a> - <s:form action="logout" theme="simple" class="logout"> - <s:submit key="bow.rightMenu.logout" name="submit" cssClass="icon-logout" /> - </s:form> - <s:a href="" class="header-link"> + <s:a action="logout" class="header-link"> <i class="icon-logout icon"></i> </s:a> </s:if> 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 a59ff6a..1cd71e9 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 @@ -46,73 +46,47 @@ </s:url> <s:text var="addUrlLabel" name="bow.rightMenu.addUrl.link" /> <s:a href="%{editBookmark}" class="sidebar-menu-link" title="%{addUrlLabel}"> - <span class="icon icon-bookmark-plus"></span> + <span class="icon icon-square-plus"></span> </s:a> - <div class="sidebar-menu-link"> - <span class="header-search-label" title="Recherche"> - <i class="icon-search icon"></i> - </span> - - <div class="fullscreen-modal"> - <s:form action="home" theme="simple"> - <s:textfield name="tagLine" labelSeparator="" /> - <s:hidden name="order" value="%{order}"/> - <s:hidden name="token" value="%{#session.BowSession.getPermanentToken()}"/> - </s:form> - - <s:form action="home" theme="simple"> - <s:textfield name="fullTextLine" labelSeparator="" /> - <s:hidden name="order" value="%{order}"/> - <s:hidden name="token" value="%{#session.BowSession.getPermanentToken()}"/> - </s:form> - - <s:form action="openSearchResult" theme="simple"> - <s:hidden name="token" value="%{#session.BowSession.getPermanentToken()}"/> - <s:textfield name="q" labelSeparator="" /> - <s:submit key="bow.rightMenu.externSearchEngine" name="submit" /> - </s:form> - </div> - </div> - <div class="sidebar-menu-link"> <s:text var="groupLabel" name="bow.groupView.title" /> <s:a action="groupView" title="%{groupLabel}"> - <i class="icon-bookmark-group icon"></i> + <i class="icon-user-group icon"></i> </s:a> </div> <div class="sidebar-menu-link"> <s:text var="sharedUserLabel" name="bow.sharedUserView.title" /> <s:a action="sharedUserView" title="%{sharedUserLabel}"> - <i class="icon-group icon"></i> + <i class="icon-share icon"></i> </s:a> </div> </s:if> <div class="sidebar-menu-link"> <a href="http://maven-site.chorem.org/bow/" class="help" target="_blank" title="<s:text name='bow.rightMenu.help' />"> - <i class="icon-signs icon"></i> + <i class="icon-help icon"></i> </a> </div> <s:if test="!bowSession.user.extensionNames.contains('BowSharedUser')"> <div class="sidebar-menu-link"> <s:a action="preferences"> - <i class="icon-settings icon"></i> + <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"> - <i class="icon-stats icon"></i> + <i class="icon-graph icon"></i> </s:a> </div> <div class="sidebar-menu-link"> <s:text var="adminLabel" name="bow.rightMenu.admin" /> <s:a action="admin" title="%{adminLabel}"> - <i class="icon-admin icon"></i> + <i class="icon-settings icon"></i> </s:a> </div> </s:if> @@ -120,18 +94,9 @@ <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-exit"></span> + <span class="icon icon-logout"></span> </s:a> </div> </s:if> </div> - - <div id="msg"> - <span id="actionmessageHeader"> - <s:actionmessage /> - </span> - <span id="actionerrorHeader"> - <s:actionerror /> - </span> - </div> </div> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp index 44e9638..0629c50 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp @@ -33,6 +33,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <title><s:text name="bow.sharedUserView.title"/></title> </head> <body> + <jsp:include page="inc/header.jsp" flush="true"/> + <div class="bow-form-wrapper"> <h1><s:text name="bow.sharedUserView.title"/></h1> <s:actionerror/> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

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 56f6617d635f7b4c09f400070e8ddeac9640fb76 Author: kaufmann <kaufmann@codelutin.com> Date: Wed Feb 5 15:41:42 2020 +0100 Changement de police principale pour Fira Sans --- bow-ui/src/main/less/common/_button.less | 1 + bow-ui/src/main/less/common/_font.less | 14 +++++++------- bow-ui/src/main/less/variables/_globals.less | 5 +++-- bow-ui/src/main/webapp/font/FiraSans-Light.otf | Bin 0 -> 359048 bytes bow-ui/src/main/webapp/font/FiraSans-Medium.otf | Bin 0 -> 366052 bytes bow-ui/src/main/webapp/font/FiraSans-Regular.otf | Bin 0 -> 357996 bytes bow-ui/src/main/webapp/font/Titillium-Bold.otf | Bin 55568 -> 0 bytes bow-ui/src/main/webapp/font/Titillium-Light.otf | Bin 57068 -> 0 bytes bow-ui/src/main/webapp/font/Titillium-Regular.otf | Bin 57460 -> 0 bytes 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bow-ui/src/main/less/common/_button.less b/bow-ui/src/main/less/common/_button.less index b84d228..e999537 100644 --- a/bow-ui/src/main/less/common/_button.less +++ b/bow-ui/src/main/less/common/_button.less @@ -41,6 +41,7 @@ button, border-radius: 2px; color: @color-main; cursor: pointer; + font-family: @default-font; // font-size: 110%; outline: none; diff --git a/bow-ui/src/main/less/common/_font.less b/bow-ui/src/main/less/common/_font.less index 47edd76..d719a82 100644 --- a/bow-ui/src/main/less/common/_font.less +++ b/bow-ui/src/main/less/common/_font.less @@ -1,20 +1,20 @@ @font-face { - font-family: 'Titillium'; - src: url('../font/Titillium-Regular.otf'); + font-family: 'Fira Sans'; + src: url('../font/FiraSans-Regular.otf'); font-weight: normal; font-style: normal; } @font-face { - font-family: 'Titillium'; - src: url('../font/Titillium-Bold.otf'); - font-weight: bold; + font-family: 'Fira Sans'; + src: url('../font/FiraSans-Medium.otf'); + font-weight: 600; font-style: normal; } @font-face { - font-family: 'Titillium'; - src: url('../font/Titillium-Light.otf'); + font-family: 'Fira Sans'; + src: url('../font/FiraSans-Light.otf'); font-weight: lighter; font-style: normal; } \ No newline at end of file diff --git a/bow-ui/src/main/less/variables/_globals.less b/bow-ui/src/main/less/variables/_globals.less index 1a30234..b5f8767 100644 --- a/bow-ui/src/main/less/variables/_globals.less +++ b/bow-ui/src/main/less/variables/_globals.less @@ -1,12 +1,13 @@ -@default-footer-height: 100px; @default-sidebar-width: 75px; +@default-header-height: @default-sidebar-width; +@default-footer-height: 100px; @default-marge--tiny: 5px; @default-marge--small: 10px; @default-marge--medium: 30px; @default-marge--large: 50px; -@default-font: Titillium; +@default-font: 'Fira Sans'; @defaut-font-size: 16px; @default-bookmark-radius: 3px; diff --git a/bow-ui/src/main/webapp/font/FiraSans-Light.otf b/bow-ui/src/main/webapp/font/FiraSans-Light.otf new file mode 100644 index 0000000..1445a4a Binary files /dev/null and b/bow-ui/src/main/webapp/font/FiraSans-Light.otf differ diff --git a/bow-ui/src/main/webapp/font/FiraSans-Medium.otf b/bow-ui/src/main/webapp/font/FiraSans-Medium.otf new file mode 100644 index 0000000..557eded Binary files /dev/null and b/bow-ui/src/main/webapp/font/FiraSans-Medium.otf differ diff --git a/bow-ui/src/main/webapp/font/FiraSans-Regular.otf b/bow-ui/src/main/webapp/font/FiraSans-Regular.otf new file mode 100644 index 0000000..98ef98c Binary files /dev/null and b/bow-ui/src/main/webapp/font/FiraSans-Regular.otf differ diff --git a/bow-ui/src/main/webapp/font/Titillium-Bold.otf b/bow-ui/src/main/webapp/font/Titillium-Bold.otf deleted file mode 100755 index a92497b..0000000 Binary files a/bow-ui/src/main/webapp/font/Titillium-Bold.otf and /dev/null differ diff --git a/bow-ui/src/main/webapp/font/Titillium-Light.otf b/bow-ui/src/main/webapp/font/Titillium-Light.otf deleted file mode 100755 index 79f6929..0000000 Binary files a/bow-ui/src/main/webapp/font/Titillium-Light.otf and /dev/null differ diff --git a/bow-ui/src/main/webapp/font/Titillium-Regular.otf b/bow-ui/src/main/webapp/font/Titillium-Regular.otf deleted file mode 100755 index 3243bc1..0000000 Binary files a/bow-ui/src/main/webapp/font/Titillium-Regular.otf and /dev/null differ -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

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>.