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 8d16da1e5590aa852dbfaaede7474eebd9fdf5b2 Author: kaufmann <kaufmann@codelutin.com> Date: Tue Dec 19 17:38:23 2017 +0100 Refonte de l'UI: Utilisation d'une police pour gérer les icones --- bow-ui/src/main/less/common/_icons.less | 127 ++++++++++++++-------- bow-ui/src/main/webapp/font/Titillium-Bold.otf | Bin 0 -> 55568 bytes bow-ui/src/main/webapp/font/Titillium-Light.otf | Bin 0 -> 57068 bytes bow-ui/src/main/webapp/font/Titillium-Regular.otf | Bin 0 -> 57460 bytes bow-ui/src/main/webapp/font/bow-icons.eot | Bin 0 -> 8200 bytes bow-ui/src/main/webapp/font/bow-icons.svg | 41 +++++++ bow-ui/src/main/webapp/font/bow-icons.ttf | Bin 0 -> 8028 bytes bow-ui/src/main/webapp/font/bow-icons.woff | Bin 0 -> 8104 bytes bow-ui/src/main/webapp/font/icomoon.woff | Bin 2836 -> 0 bytes 9 files changed, 122 insertions(+), 46 deletions(-) diff --git a/bow-ui/src/main/less/common/_icons.less b/bow-ui/src/main/less/common/_icons.less index d023878..1be8c4b 100644 --- a/bow-ui/src/main/less/common/_icons.less +++ b/bow-ui/src/main/less/common/_icons.less @@ -1,19 +1,18 @@ @font-face { - font-family: 'icomoon'; - src: url('../font/icomoon.eot?7t5stk'); - src: url('../font/icomoon.eot?7t5stk#iefix') format('embedded-opentype'), - url('../font/icomoon.ttf?7t5stk') format('truetype'), - url('../font/icomoon.woff?7t5stk') format('woff'), - url('../font/icomoon.svg?7t5stk#icomoon') format('svg'); + 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-weight: normal; font-style: normal; } -[class^="icon-"], [class*=" icon-"] { +.icon { /* use !important to prevent issues with browser extensions that change fonts */ - font-family: 'icomoon' !important; + font-family: 'bow-icons' !important; speak: none; - font-size: 21px; font-style: normal; font-weight: normal; font-variant: normal; @@ -25,63 +24,99 @@ -moz-osx-font-smoothing: grayscale; } -.icon--huge { - font-size: 60px; +.icon-lock:before { + content: "\e91c"; } - -.icon--large { - font-size: 26px; +.icon-trashcan:before { + content: "\e91d"; } - -.icon--small { - font-size: 16px; +.icon-pencil:before { + content: "\e91e"; } - -.icon--mini { - font-size: 12px; +.icon-lutin:before { + content: "\e919"; } - -.icon-logout:before { - content: "\e907"; - //color: #979797; +.icon-menu:before { + content: "\e91a"; } -.icon-settings:before { - content: "\e908"; - //color: #979797; +.icon-heart:before { + content: "\e91b"; } .icon-grid:before { - content: "\e909"; - //color: #157efb; + content: "\e917"; } .icon-list:before { - content: "\e90a"; - //color: #157efb; + content: "\e918"; } -.icon-add:before { +.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: #929292; + //color: #804561; } -.icon-click:before { +.icon-bow_letter_o:before { content: "\e901"; - //color: #157efb; + //color: #7dbed2; } -.icon-lock:before { +.icon-bow_letter_w:before { content: "\e902"; - //color: #157efb; + //color: #7dbed2; } -.icon-search:before { +.icon-exit:before { content: "\e903"; - //color: #929292; } -.icon-star:before { +.icon-search:before { + content: "\e90d"; +} +.icon-bookmark:before { content: "\e904"; - //color: #157efb; } -.icon-tag:before { +.icon-bookmark-check:before { content: "\e905"; - //color: #157efb; } -.icon-trash:before { +.icon-bookmark-minus:before { content: "\e906"; - //color: #929292; -} \ No newline at end of file +} +.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"; +} diff --git a/bow-ui/src/main/webapp/font/Titillium-Bold.otf b/bow-ui/src/main/webapp/font/Titillium-Bold.otf new file mode 100755 index 0000000..a92497b Binary files /dev/null and b/bow-ui/src/main/webapp/font/Titillium-Bold.otf differ diff --git a/bow-ui/src/main/webapp/font/Titillium-Light.otf b/bow-ui/src/main/webapp/font/Titillium-Light.otf new file mode 100755 index 0000000..79f6929 Binary files /dev/null and b/bow-ui/src/main/webapp/font/Titillium-Light.otf differ diff --git a/bow-ui/src/main/webapp/font/Titillium-Regular.otf b/bow-ui/src/main/webapp/font/Titillium-Regular.otf new file mode 100755 index 0000000..3243bc1 Binary files /dev/null and b/bow-ui/src/main/webapp/font/Titillium-Regular.otf differ diff --git a/bow-ui/src/main/webapp/font/bow-icons.eot b/bow-ui/src/main/webapp/font/bow-icons.eot new file mode 100644 index 0000000..293ce19 Binary files /dev/null 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 new file mode 100644 index 0000000..1f7ba06 --- /dev/null +++ b/bow-ui/src/main/webapp/font/bow-icons.svg @@ -0,0 +1,41 @@ +<?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" > +<svg xmlns="http://www.w3.org/2000/svg"> +<metadata>Generated by IcoMoon</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 diff --git a/bow-ui/src/main/webapp/font/bow-icons.ttf b/bow-ui/src/main/webapp/font/bow-icons.ttf new file mode 100644 index 0000000..12149d4 Binary files /dev/null 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 new file mode 100644 index 0000000..93abdef Binary files /dev/null and b/bow-ui/src/main/webapp/font/bow-icons.woff differ diff --git a/bow-ui/src/main/webapp/font/icomoon.woff b/bow-ui/src/main/webapp/font/icomoon.woff deleted file mode 100644 index ab5b1dc..0000000 Binary files a/bow-ui/src/main/webapp/font/icomoon.woff and /dev/null differ -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.