diff --git a/src/static/css/pad/icons.css b/src/static/css/pad/icons.css index 08bc64267..bd657896a 100644 --- a/src/static/css/pad/icons.css +++ b/src/static/css/pad/icons.css @@ -1,30 +1,16 @@ @font-face { font-family: "fontawesome-etherpad"; - src:url("../../../static/font/fontawesome-etherpad.eot"); - src:url("../../../static/font/fontawesome-etherpad.eot?#iefix") format("embedded-opentype"), - url("../../../static/font/fontawesome-etherpad.woff") format("woff"), - url("../../../static/font/fontawesome-etherpad.ttf") format("truetype"), + src:url("../../../static/font/fontawesome-etherpad.eot?2"); + src:url("../../../static/font/fontawesome-etherpad.eot?2#iefix") format("embedded-opentype"), + url("../../../static/font/fontawesome-etherpad.woff?2") format("woff"), + url("../../../static/font/fontawesome-etherpad.ttf?2") format("truetype"), url("../../../static/font/fontawesome-etherpad.svg#fontawesome-etherpad") format("svg"); font-weight: normal; font-style: normal; } -[data-icon]:before, -[class^="icon-"]:before, -[class*=" icon-"]:before { - font-family: "fontawesome-etherpad" !important; - font-style: normal !important; - font-weight: normal !important; - font-variant: normal !important; - text-transform: none !important; - speak: none; - line-height: 1; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.buttonicon { +.buttonicon{ width: 16px; height: 16px; display: inline-block; @@ -34,33 +20,45 @@ background: none; font-family: "fontawesome-etherpad"; font-size: 15px; + text-align: center; font-style: normal; font-weight: normal; color: #666; cursor: pointer; + + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + display: inline-block; + font-style: normal; + font-variant: normal; + text-rendering: auto; } -.buttonicon::-moz-focus-inner { - padding: 0; - border: 0 -} - -.buttonicon:before { +[class^="buttonicon-"]:before, [class*=" buttonicon-"]:before { font-family: "fontawesome-etherpad"; + font-style: normal; + font-weight: normal; + speak: none; + + display: inline-block; + text-decoration: inherit; + width: 1em; + margin-right: .2em; + text-align: center; + + /* For safety - reset parent styles, that can break glyph codes*/ + font-variant: normal; + text-transform: none; + + /* fix buttons height, for twitter bootstrap */ + line-height: 1em; + + /* Font smoothing. That was taken from TWBS */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } -.buttonicon:focus{ - border: 1px solid #666; -} -.buttonicon-bold:before { - content: "\e81c"; -} -.buttonicon-italic:before { - content: "\e81d"; -} -.buttonicon-underline:before { - content: "\e817"; -} + .buttonicon-strikethrough:before { content: "\e818"; } @@ -105,4 +103,104 @@ } .buttonicon-savedRevision:before { content: "\e835"; +} + + +.buttonicon-align-left:before { content: '\e800'; } /* '' */ +.buttonicon-print:before { content: '\e801'; } /* '' */ +.buttonicon-doc:before { content: '\e802'; } /* '' */ +.buttonicon-file-pdf:before { content: '\e803'; } /* '' */ +.buttonicon-file-word:before { content: '\e804'; } /* '' */ +.buttonicon-file-excel:before { content: '\e805'; } /* '' */ +.buttonicon-file-powerpoint:before { content: '\e806'; } /* '' */ +.buttonicon-file-image:before { content: '\e807'; } /* '' */ +.buttonicon-users:before { content: '\e808'; } /* '' */ +.buttonicon-user:before { content: '\e809'; } /* '' */ +.buttonicon-mail:before { content: '\e80a'; } /* '' */ +.buttonicon-videocam:before { content: '\e80b'; } /* '' */ +.buttonicon-picture:before { content: '\e80c'; } /* '' */ +.buttonicon-eye-off:before { content: '\e80d'; } /* '' */ +.buttonicon-align-center:before { content: '\e80f'; } /* '' */ +.buttonicon-align-right:before { content: '\e810'; } /* '' */ +.buttonicon-align-justify:before { content: '\e811'; } /* '' */ +.buttonicon-list:before { content: '\e812'; } /* '' */ +.buttonicon-indent-left:before { content: '\e813'; } /* '' */ +.buttonicon-indent-right:before { content: '\e814'; } /* '' */ +.buttonicon-list-bullet:before { content: '\e815'; } /* '' */ +.buttonicon-list-numbered:before { content: '\e816'; } /* '' */ +.buttonicon-underline:before { content: '\e817'; } /* '' */ +.buttonicon-strike:before { content: '\e818'; } /* '' */ +.buttonicon-superscript:before { content: '\e819'; } /* '' */ +.buttonicon-subscript:before { content: '\e81a'; } /* '' */ +.buttonicon-font:before { content: '\e81b'; } /* '' */ +.buttonicon-bold:before { content: '\e81c'; } /* '' */ +.buttonicon-italic:before { content: '\e81d'; } /* '' */ +.buttonicon-header:before { content: '\e81e'; } /* '' */ +.buttonicon-text-height:before { content: '\e81f'; } /* '' */ +.buttonicon-text-width:before { content: '\e820'; } /* '' */ +.buttonicon-to-start:before { content: '\e821'; } /* '' */ +.buttonicon-to-end:before { content: '\e822'; } /* '' */ +.buttonicon-ccw:before { content: '\e823'; } /* '' */ +.buttonicon-cw:before { content: '\e824'; } /* '' */ +.buttonicon-arrows-cw:before { content: '\e825'; } /* '' */ +.buttonicon-file-code:before { content: '\e826'; } /* '' */ +.buttonicon-code:before { content: '\e827'; } /* '' */ +.buttonicon-chat:before { content: '\e828'; } /* '' */ +.buttonicon-comment-empty:before { content: '\e829'; } /* '' */ +.buttonicon-trash-empty:before { content: '\e82a'; } /* '' */ +.buttonicon-mic:before { content: '\e82b'; } /* '' */ +.buttonicon-play:before { content: '\e82c'; } /* '' */ +.buttonicon-stop:before { content: '\e82d'; } /* '' */ +.buttonicon-pause:before { content: '\e82e'; } /* '' */ +.buttonicon-gauge:before { content: '\e82f'; } /* '' */ +.buttonicon-brush:before { content: '\e830'; } /* '' */ +.buttonicon-slideshare:before { content: '\e831'; } /* '' */ +.buttonicon-tasks:before { content: '\e832'; } /* '' */ +.buttonicon-cog:before { content: '\e833'; } /* '' */ +.buttonicon-exchange:before { content: '\e834'; } /* '' */ +.buttonicon-star-empty:before { content: '\e835'; } /* '' */ +.buttonicon-star:before { content: '\e836'; } /* '' */ +.buttonicon-clock:before { content: '\e837'; } /* '' */ +.buttonicon-comment:before { content: '\e838'; } /* '' */ +.buttonicon-pencil:before { content: '\e839'; } /* '' */ +.buttonicon-link:before { content: '\e83a'; } /* '' */ +.buttonicon-video:before { content: '\e83b'; } /* '' */ +.buttonicon-video-slash:before { content: '\e83c'; } /* '' */ +.buttonicon-microphone-alt:before { content: '\e83d'; } /* '' */ +.buttonicon-microphone-alt-slash:before { content: '\e83e'; } /* '' */ +.buttonicon-compress:before { content: '\e83f'; } /* '' */ +.buttonicon-expand:before { content: '\e840'; } /* '' */ +.buttonicon-spin5:before { content: '\e841'; } /* '' */ +.buttonicon-cancel:before { content: '\e842'; } /* '' */ +.buttonicon-table:before { content: '\f0ce'; } /* '' */ + +.icon-spin { + -webkit-animation: spinAnimation 2s infinite linear; + animation: spinAnimation 2s infinite linear; + font-family: "fontawesome-etherpad"; + font-size:22px; + z-index:150; + width:22px; + height:22px; +} + +@-webkit-keyframes spinAnimation { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +@keyframes spinAnimation { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } } \ No newline at end of file diff --git a/src/static/css/pad/loadingbox.css b/src/static/css/pad/loadingbox.css index e7499a7cc..5e990cd72 100644 --- a/src/static/css/pad/loadingbox.css +++ b/src/static/css/pad/loadingbox.css @@ -22,41 +22,6 @@ padding:10px; } -.loadingAnimation{ - -webkit-animation: loadingAnimation 2s infinite linear; - animation: loadingAnimation 2s infinite linear; - font-family: "fontawesome-etherpad"; - font-size:24px; - z-index:150; - width:25px; - height:25px; -} - -.loadingAnimation:before{ - content: "\e80e"; -} - -@-webkit-keyframes loadingAnimation { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} -@keyframes loadingAnimation { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} - #passwordRequired, #permissionDenied, #wrongPassword, #noCookie { display:none; } \ No newline at end of file diff --git a/src/static/font/config.json b/src/static/font/config.json index 1c636281d..5de25a778 100644 --- a/src/static/font/config.json +++ b/src/static/font/config.json @@ -1,6 +1,6 @@ { "name": "fontawesome-etherpad", - "css_prefix_text": "icon-", + "css_prefix_text": "buttonicon-", "css_use_suffix": false, "hinting": true, "units_per_em": 1000, @@ -138,12 +138,6 @@ "code": 59443, "src": "fontawesome" }, - { - "uid": "19c50c52858a81de58f9db488aba77bc", - "css": "mic", - "code": 59435, - "src": "fontawesome" - }, { "uid": "598a5f2bcf3521d1615de8e1881ccd17", "css": "clock", @@ -330,12 +324,6 @@ "code": 59439, "src": "fontawesome" }, - { - "uid": "cda0cdcfd38f5f1d9255e722dad42012", - "css": "spinner", - "code": 59406, - "src": "fontawesome" - }, { "uid": "fa9a0b7e788c2d78e24cef1de6b70e80", "css": "brush", @@ -365,6 +353,108 @@ "css": "table", "code": 61646, "src": "fontawesome" + }, + { + "uid": "1569a5b2bebe7e28bb0d26ddeca34fc8", + "css": "video", + "code": 59451, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M656.6 125H93.4C41.8 125 0 166.8 0 218.4V781.6C0 833.2 41.8 875 93.4 875H656.6C708.2 875 750 833.2 750 781.6V218.4C750 166.8 708.2 125 656.6 125ZM1026.6 198.6L812.5 346.3V653.7L1026.6 801.2C1068 829.7 1125 800.6 1125 750.8V249C1125 199.4 1068.2 170.1 1026.6 198.6Z", + "width": 1125 + }, + "search": [ + "video" + ] + }, + { + "uid": "8fe2c571b78d019e24cab0b780cb61d6", + "css": "video-slash", + "code": 59452, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M1237.9 894.7L1130.5 811.7C1160.5 809 1187.5 785 1187.5 751V249C1187.5 199.2 1130.7 170.1 1089.1 198.6L875 346.3V614.3L812.5 566V218.4C812.5 166.8 770.7 125 719.1 125H242L88.9 6.6C75.2-3.9 55.7-1.6 44.9 12.1L6.6 61.3C-3.9 75-1.6 94.5 12.1 105.1L83.4 160.2 812.5 723.8 1161.1 993.4C1174.8 1003.9 1194.3 1001.6 1205.1 987.9L1243.4 938.5C1254.1 925 1251.6 905.3 1237.9 894.7ZM62.5 781.6C62.5 833.2 104.3 875 155.9 875H719.1C741 875 760.9 867.2 777 854.5L62.5 302.1V781.6Z", + "width": 1250 + }, + "search": [ + "video-slash" + ] + }, + { + "uid": "d8020fccc088a524f7cc6db1f329cb3e", + "css": "microphone-alt", + "code": 59453, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M656.3 375H625C607.7 375 593.8 389 593.8 406.3V500C593.8 646.1 467.8 763.3 318.8 748.8 188.9 736.1 93.8 619.4 93.8 488.9V406.3C93.8 389 79.8 375 62.5 375H31.3C14 375 0 389 0 406.3V484.7C0 659.8 124.9 815.8 296.9 839.6V906.3H187.5C170.2 906.3 156.3 920.2 156.3 937.5V968.8C156.3 986 170.2 1000 187.5 1000H500C517.3 1000 531.3 986 531.3 968.8V937.5C531.3 920.2 517.3 906.3 500 906.3H390.6V840.3C558 817.3 687.5 673.6 687.5 500V406.3C687.5 389 673.5 375 656.3 375ZM343.8 687.5C447.3 687.5 531.3 603.6 531.3 500H364.6C353.1 500 343.8 493 343.8 484.4V453.1C343.8 444.5 353.1 437.5 364.6 437.5H531.3V375H364.6C353.1 375 343.8 368 343.8 359.4V328.1C343.8 319.5 353.1 312.5 364.6 312.5H531.3V250H364.6C353.1 250 343.8 243 343.8 234.4V203.1C343.8 194.5 353.1 187.5 364.6 187.5H531.3C531.3 83.9 447.3 0 343.8 0S156.3 83.9 156.3 187.5V500C156.3 603.6 240.2 687.5 343.8 687.5Z", + "width": 688 + }, + "search": [ + "microphone-alt" + ] + }, + { + "uid": "7d9dd931e0e6305cc5eed55efa435d7c", + "css": "microphone-alt-slash", + "code": 59454, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M1237.9 894.7L930.2 656.9C954.6 609.8 968.8 556.6 968.8 500V406.3C968.8 389 954.8 375 937.5 375H906.3C889 375 875 389 875 406.3V500C875 535 867.3 568 854.1 598L802.2 558C808.3 539.6 812.5 520.4 812.5 500H727.2L646.4 437.5H812.5V375H645.8C634.3 375 625 368 625 359.4V328.1C625 319.5 634.3 312.5 645.8 312.5H812.5V250H645.8C634.3 250 625 243 625 234.4V203.1C625 194.5 634.3 187.5 645.8 187.5H812.5C812.5 84 728.6 0 625 0S437.5 84 437.5 187.5V276.1L88.8 6.6C75.2-4 55.5-1.6 44.9 12.1L6.6 61.4C-4 75-1.6 94.7 12.1 105.3L1161.2 993.4C1174.8 1004 1194.5 1001.6 1205.1 987.9L1243.4 938.6C1254 925 1251.6 905.3 1237.9 894.7ZM781.3 906.3H671.9V840.3C694.7 837.1 717 831.9 738.2 824.5L639.8 748.4C626.7 749.2 613.6 750.1 600 748.8 490.9 738.1 407.2 653.8 382.9 549.9L281.3 471.3V484.7C281.3 659.8 406.2 815.8 578.1 839.6V906.3H468.8C451.5 906.3 437.5 920.2 437.5 937.5V968.8C437.5 986 451.5 1000 468.8 1000H781.3C798.5 1000 812.5 986 812.5 968.8V937.5C812.5 920.2 798.5 906.3 781.3 906.3Z", + "width": 1250 + }, + "search": [ + "microphone-alt-slash" + ] + }, + { + "uid": "63aa8ba99d3f31973dd2ef65274a03bd", + "css": "compress", + "code": 59455, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M851.6 375H609.4C583.4 375 562.5 354.1 562.5 328.1V85.9C562.5 73 573 62.5 585.9 62.5H664.1C677 62.5 687.5 73 687.5 85.9V250H851.6C864.5 250 875 260.5 875 273.4V351.6C875 364.5 864.5 375 851.6 375ZM312.5 328.1V85.9C312.5 73 302 62.5 289.1 62.5H210.9C198 62.5 187.5 73 187.5 85.9V250H23.4C10.5 250 0 260.5 0 273.4V351.6C0 364.5 10.5 375 23.4 375H265.6C291.6 375 312.5 354.1 312.5 328.1ZM312.5 914.1V671.9C312.5 645.9 291.6 625 265.6 625H23.4C10.5 625 0 635.5 0 648.4V726.6C0 739.5 10.5 750 23.4 750H187.5V914.1C187.5 927 198 937.5 210.9 937.5H289.1C302 937.5 312.5 927 312.5 914.1ZM687.5 914.1V750H851.6C864.5 750 875 739.5 875 726.6V648.4C875 635.5 864.5 625 851.6 625H609.4C583.4 625 562.5 645.9 562.5 671.9V914.1C562.5 927 573 937.5 585.9 937.5H664.1C677 937.5 687.5 927 687.5 914.1Z", + "width": 875 + }, + "search": [ + "compress" + ] + }, + { + "uid": "d71c270fcbdffa89ee7b646e9d5a2667", + "css": "expand", + "code": 59456, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M0 351.6V109.4C0 83.4 20.9 62.5 46.9 62.5H289.1C302 62.5 312.5 73 312.5 85.9V164.1C312.5 177 302 187.5 289.1 187.5H125V351.6C125 364.5 114.5 375 101.6 375H23.4C10.5 375 0 364.5 0 351.6ZM562.5 85.9V164.1C562.5 177 573 187.5 585.9 187.5H750V351.6C750 364.5 760.5 375 773.4 375H851.6C864.5 375 875 364.5 875 351.6V109.4C875 83.4 854.1 62.5 828.1 62.5H585.9C573 62.5 562.5 73 562.5 85.9ZM851.6 625H773.4C760.5 625 750 635.5 750 648.4V812.5H585.9C573 812.5 562.5 823 562.5 835.9V914.1C562.5 927 573 937.5 585.9 937.5H828.1C854.1 937.5 875 916.6 875 890.6V648.4C875 635.5 864.5 625 851.6 625ZM312.5 914.1V835.9C312.5 823 302 812.5 289.1 812.5H125V648.4C125 635.5 114.5 625 101.6 625H23.4C10.5 625 0 635.5 0 648.4V890.6C0 916.6 20.9 937.5 46.9 937.5H289.1C302 937.5 312.5 927 312.5 914.1Z", + "width": 875 + }, + "search": [ + "expand" + ] + }, + { + "uid": "19c50c52858a81de58f9db488aba77bc", + "css": "mic", + "code": 59435, + "src": "fontawesome" + }, + { + "uid": "5d2d07f112b8de19f2c0dbfec3e42c05", + "css": "spin5", + "code": 59457, + "src": "fontelico" + }, + { + "uid": "5211af474d3a9848f67f945e2ccaf143", + "css": "cancel", + "code": 59458, + "src": "fontawesome" } ] } \ No newline at end of file diff --git a/src/static/font/fontawesome-etherpad.eot b/src/static/font/fontawesome-etherpad.eot index 35a002de2..ce02eb353 100644 Binary files a/src/static/font/fontawesome-etherpad.eot and b/src/static/font/fontawesome-etherpad.eot differ diff --git a/src/static/font/fontawesome-etherpad.svg b/src/static/font/fontawesome-etherpad.svg index b69d0d974..d68f50aab 100644 --- a/src/static/font/fontawesome-etherpad.svg +++ b/src/static/font/fontawesome-etherpad.svg @@ -1,7 +1,7 @@ -Copyright (C) 2018 by original authors @ fontello.com +Copyright (C) 2020 by original authors @ fontello.com @@ -34,8 +34,6 @@ - - @@ -124,6 +122,22 @@ + + + + + + + + + + + + + + + + diff --git a/src/static/font/fontawesome-etherpad.ttf b/src/static/font/fontawesome-etherpad.ttf index 280a3d460..01964abef 100644 Binary files a/src/static/font/fontawesome-etherpad.ttf and b/src/static/font/fontawesome-etherpad.ttf differ diff --git a/src/static/font/fontawesome-etherpad.woff b/src/static/font/fontawesome-etherpad.woff index c66051390..5d6d91917 100644 Binary files a/src/static/font/fontawesome-etherpad.woff and b/src/static/font/fontawesome-etherpad.woff differ diff --git a/src/static/font/fontawesome-etherpad.woff2 b/src/static/font/fontawesome-etherpad.woff2 new file mode 100644 index 000000000..ff2560353 Binary files /dev/null and b/src/static/font/fontawesome-etherpad.woff2 differ diff --git a/src/templates/pad.html b/src/templates/pad.html index fdfc419cf..3c8b21c18 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -244,7 +244,7 @@

-

+