diff --git a/packages/component-faraday-ui/src/IconButton.js b/packages/component-faraday-ui/src/IconButton.js index 15669662f6ed6f2b16b51804cb17b2372c1696ee..7312f229ff973089910c9364365e051eab8f4846 100644 --- a/packages/component-faraday-ui/src/IconButton.js +++ b/packages/component-faraday-ui/src/IconButton.js @@ -28,7 +28,7 @@ export default ({ icon, fontIcon, onClick, - iconSize = 3, + // iconSize = 3, disabled, ...props }) => ( @@ -37,15 +37,11 @@ export default ({ onClick={!disabled ? onClick : null} {...props} > - {icon && ( - <Icon size={iconSize} {...props}> - {icon} - </Icon> - )} + {icon && <Icon {...props}>{icon}</Icon>} {fontIcon && ( <FontIconButton className={`${fontIcon} fontIconStyle`} - size={iconSize} + // size={iconSize} {...props} /> )} diff --git a/packages/hindawi-theme/src/fonts/hindawi-icons.svg b/packages/hindawi-theme/src/fonts/hindawi-icons.svg deleted file mode 100755 index edab958c2a613e9f0aed23844762b9ffd0d82392..0000000000000000000000000000000000000000 --- a/packages/hindawi-theme/src/fonts/hindawi-icons.svg +++ /dev/null @@ -1,17 +0,0 @@ -<?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="hindawi-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="icn_save" d="M920.845 735.885c9.507-1.812 18.283-7.457 23.868-16.289 127.962-202.73 98.84-463.635-71.482-633.752-99.722-99.602-231.214-149.844-361.824-149.844s-262.102 50.242-361.824 149.844c-199.444 199.204-199.444 524.454 0 723.658 169.439 169.236 429.776 199.204 632.75 72.278 16.767-10.577 22.062-32.613 11.472-49.36s-32.652-22.036-49.42-11.459c-174.734 108.417-398.006 82.855-544.501-62.582-171.204-170.998-171.204-450.413 0-621.412s450.956-170.998 622.16 0c146.494 146.318 172.087 370.203 61.775 544.727-0.957 1.513-1.784 3.070-2.485 4.657l-409.513-511.566c-7.567-8.871-17.972-13.8-28.377-14.786-0.946 0-0.946 0-1.892 0-10.405 0-19.864 3.943-27.431 11.829l-178.773 186.301c-15.134 15.771-15.134 41.4 0 57.172s39.727 15.771 54.862 0l148.505-154.758 420.921 525.388c14.188 16.757 38.781 18.729 54.862 4.929 15.392-14.153 17.784-38.242 6.346-54.974z" /> -<glyph unicode="" glyph-name="icn_delete" d="M320 800v93.794c0 36.507 29.098 66.206 64.864 66.206h254.271c35.767 0 64.864-29.7 64.864-66.206v-93.794h256v-64h-96l-64.503-763.662c-1.693-20.559-17.982-36.338-37.497-36.338h-498c-19.512 0-35.79 15.768-37.497 36.325l-67.503 763.675h-95v64h256zM384.864 800h254.271v80.553h-254.271v-80.553zM736 0l64 736h-576l64-736h448zM704 608l-32-477.057h-64l32 477.057h64zM480 576h64v-480h-64v480zM417 130.955h-66l-31 477.045h64l33-477.045z" /> -<glyph unicode="" glyph-name="icn_move" d="M864.026 576c53.060 0 96.121-57.342 96.124-128 0-70.655-43.064-128-96.124-128h-703.902c-53.013 0-96.124 57.345-96.124 128s43.111 128 96.124 128h703.902zM855.014 512h-686.027c-21.111 0-40.986-27.148-40.986-64s19.876-64 40.986-64h686.027c21.136 0 40.986 27.122 40.986 64-0.001 36.88-19.85 64-40.986 64zM556 852.745v-194.745c0-17.673-14.327-32-32-32s-32 14.327-32 32v190.745l-117.373-117.373c-12.497-12.497-32.758-12.497-45.255 0s-12.497 32.758 0 45.255l174 174c12.497 12.497 32.758 12.497 45.255 0l174-174c12.497-12.497 12.497-32.758 0-45.255s-32.758-12.497-45.255 0l-121.373 121.373zM496 50.255v205.745c0 17.673 14.327 32 32 32s32-14.327 32-32v-201.745l117.373 117.373c12.497 12.497 32.758 12.497 45.255 0s12.497-32.758 0-45.255l-174-174c-12.497-12.497-32.758-12.497-45.255 0l-174 174c-12.497 12.497-12.497 32.758 0 45.255s32.758 12.497 45.255 0l121.373-121.373z" /> -<glyph unicode="" glyph-name="icn_link" d="M927.851 821.574l-454.489-454.489c-12.497-12.497-32.758-12.497-45.255 0s-12.497 32.758 0 45.255l451.661 451.661h-211.245c-17.673 0-32 14.327-32 32s14.327 32 32 32h291.328c17.673 0 32-14.327 32-32v-291.328c0-17.673-14.327-32-32-32s-32 14.327-32 32v216.902zM468.996 808.149c17.673 0 32-14.327 32-32s-14.327-32-32-32h-308.996c-35.346 0-64-28.654-64-64v-586c0-35.346 28.654-64 64-64h580c35.346 0 64 28.654 64 64v321c0 17.673 14.327 32 32 32s32-14.327 32-32v-321c0-70.692-57.308-128-128-128h-580c-70.692 0-128 57.308-128 128v586c0 70.692 57.308 128 128 128h308.996z" /> -<glyph unicode="" glyph-name="icn_edit" d="M929.818 865.862c-82.637 82.851-217.024 82.851-299.661 0l-549.412-549.273c-4.295-4.296-6.955-9.819-7.773-15.752l-40.705-301.537c-1.227-8.592 1.841-17.184 7.773-23.117 5.114-5.114 12.273-8.183 19.432-8.183 1.227 0 2.455 0 3.682 0.205l181.637 24.549c15.136 2.046 25.773 15.957 23.727 31.095s-15.955 25.776-31.091 23.73l-145.637-19.639 28.432 210.299 221.319-221.346c5.114-5.114 12.273-8.183 19.432-8.183s14.318 2.864 19.432 8.183l549.412 549.273c40.091 40.096 62.182 93.284 62.182 149.95s-22.091 109.855-62.182 149.746zM640.793 798.353l92.251-92.261-501.344-501.403-92.251 92.261 501.344 501.403zM361.178 75.4l-90.205 90.216 501.344 501.403 90.205-90.216-501.344-501.403zM900.977 616.285l-220.706 220.732c28.023 23.117 63 35.8 99.819 35.8 41.932 0 81.205-16.366 110.864-45.824s45.818-68.94 45.818-110.877c0-37.027-12.682-71.804-35.796-99.831z" /> -<glyph unicode="" glyph-name="icn_download" d="M480 285.255v642.745c0 17.673 14.327 32 32 32s32-14.327 32-32v-638.745l149.373 149.373c12.497 12.497 32.758 12.497 45.255 0s12.497-32.758 0-45.255l-206-206c-12.497-12.497-32.758-12.497-45.255 0l-206 206c-12.497 12.497-12.497 32.758 0 45.255s32.758 12.497 45.255 0l153.373-153.373zM320 700.008c17.673 0 32-14.327 32-32s-14.327-32-32-32h-192c-35.346 0-64-28.654-64-64v-504c0-35.346 28.654-64 64-64h768c35.346 0 64 28.654 64 64v504c0 35.346-28.654 64-64 64h-210c-17.673 0-32 14.327-32 32s14.327 32 32 32h210c70.692 0 128-57.308 128-128v-504c0-70.692-57.308-128-128-128h-768c-70.692 0-128 57.308-128 128v504c0 70.692 57.308 128 128 128h192z" /> -<glyph unicode="" glyph-name="icn_preview" d="M1017.493 461.587c8.676-11.86 8.676-27.974 0-39.844-9.148-12.502-227.115-306.403-505.497-306.403s-496.359 293.899-505.497 306.413c-8.664 11.872-8.664 27.974 0 39.846 9.138 12.502 227.115 306.401 505.497 306.401s496.349-293.899 505.497-306.413zM511.996 182.856c205.499 0 382.729 194.967 435.235 258.791-52.596 63.804-230.187 258.837-435.235 258.837-205.499 0-382.729-194.965-435.235-258.791 52.574-63.77 230.177-258.837 435.235-258.837zM511.996 644.22c111.684 0 202.551-90.866 202.551-202.551s-90.866-202.551-202.551-202.551c-111.684 0-202.551 90.866-202.551 202.551s90.866 202.551 202.551 202.551zM511.996 306.637c74.46 0 135.032 60.574 135.032 135.032s-60.574 135.032-135.032 135.032c-74.458 0-135.032-60.574-135.032-135.032s60.572-135.032 135.032-135.032z" /> -</font></defs></svg> \ No newline at end of file diff --git a/packages/hindawi-theme/src/fonts/index.css b/packages/hindawi-theme/src/fonts/index.css index c16d138eb8090f8013a5d6fdd413fb89938de209..9aa269915d9033b3a803f8ad83e72584d286ab25 100644 --- a/packages/hindawi-theme/src/fonts/index.css +++ b/packages/hindawi-theme/src/fonts/index.css @@ -31,7 +31,6 @@ font-style: normal; font-weight: normal; src: - url('./hindawi-icons.svg') format('svg'), url('./hindawi-icons.woff') format('woff'), url('./hindawi-icons.ttf') format('truetype'), url('./hindawi-icons.eot') format('embedded-opentype'); diff --git a/packages/xpub-faraday/app/app.js b/packages/xpub-faraday/app/app.js index cb06d2db313f46140f0765768a1b5cc67aae7d5e..0988df482437853ff3bbe0ee9f20354238071b85 100644 --- a/packages/xpub-faraday/app/app.js +++ b/packages/xpub-faraday/app/app.js @@ -2,9 +2,6 @@ import React from 'react' import ReactDOM from 'react-dom' import { AppContainer } from 'react-hot-loader' import createHistory from 'history/createBrowserHistory' -import { library } from '@fortawesome/fontawesome-svg-core' -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' -import { fas } from '@fortawesome/free-solid-svg-icons' import { JournalProvider } from 'xpub-journal' import { configureStore, Root } from 'pubsweet-client' @@ -39,5 +36,3 @@ if (module.hot) { render() }) } - -library.add(fas, FontAwesomeIcon)