diff options
-rw-r--r-- | src/assets/images/ferdium-icon.svg | 111 | ||||
-rw-r--r-- | src/assets/images/logo-beard-only.svg | 12 | ||||
-rw-r--r-- | src/assets/images/logo.svg | 15 | ||||
-rw-r--r-- | src/assets/images/moustache.svg | 1 | ||||
-rw-r--r-- | src/assets/images/tray/win32/tray-indirect.ico | bin | 41109 -> 16958 bytes | |||
-rw-r--r-- | src/assets/images/tray/win32/tray-unread.ico | bin | 41805 -> 16958 bytes | |||
-rw-r--r-- | src/assets/images/tray/win32/tray.ico | bin | 38281 -> 16958 bytes | |||
-rw-r--r-- | src/components/auth/AuthLayout.js | 2 | ||||
-rw-r--r-- | src/components/auth/ChangeServer.js | 2 | ||||
-rw-r--r-- | src/components/auth/Import.js | 2 | ||||
-rw-r--r-- | src/components/auth/Invite.js | 2 | ||||
-rw-r--r-- | src/components/auth/Locked.js | 2 | ||||
-rw-r--r-- | src/components/auth/Login.js | 2 | ||||
-rw-r--r-- | src/components/auth/Password.js | 2 | ||||
-rw-r--r-- | src/components/auth/SetupAssistant.js | 2 | ||||
-rw-r--r-- | src/components/auth/Signup.js | 2 | ||||
-rw-r--r-- | src/components/auth/Welcome.js | 2 | ||||
-rw-r--r-- | src/components/layout/AppLayout.js | 2 | ||||
-rw-r--r-- | src/components/services/content/Services.js | 2 | ||||
-rw-r--r-- | src/components/settings/account/AccountDashboard.js | 2 |
20 files changed, 125 insertions, 40 deletions
diff --git a/src/assets/images/ferdium-icon.svg b/src/assets/images/ferdium-icon.svg new file mode 100644 index 000000000..c44a8ddcd --- /dev/null +++ b/src/assets/images/ferdium-icon.svg | |||
@@ -0,0 +1,111 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> | ||
3 | <svg version="1.1" | ||
4 | id="svg9" inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)" sodipodi:docname="Ferdium.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:serif="http://www.serif.com/" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" | ||
5 | xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" | ||
6 | style="enable-background:new 0 0 512 512;" xml:space="preserve"> | ||
7 | <style type="text/css"> | ||
8 | .st0{display:none;} | ||
9 | .st1{display:inline;fill-rule:evenodd;clip-rule:evenodd;fill:#7E7E7E;} | ||
10 | .st2{display:inline;} | ||
11 | |||
12 | .st3{fill-rule:evenodd;clip-rule:evenodd;fill:url(#path870_00000026158774974550782500000010219097466067674007_);stroke:#FFFFFF;stroke-width:12.8;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.024;} | ||
13 | .st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;} | ||
14 | |||
15 | .st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#circle1113_00000057135151969643970020000002309479894307053982_);stroke:#FFFFFF;stroke-width:12.8;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.024;} | ||
16 | |||
17 | .st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#circle3889_00000147188186079077258540000000774080630942378425_);stroke:#FFFFFF;stroke-width:12.8;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.024;} | ||
18 | .st7{fill-rule:evenodd;clip-rule:evenodd;fill:url(#circle1016_00000073686331057464903120000009921045060015362991_);} | ||
19 | .st8{display:none;opacity:0.3775;} | ||
20 | .st9{fill-rule:evenodd;clip-rule:evenodd;} | ||
21 | </style> | ||
22 | <sodipodi:namedview bordercolor="#666666" borderopacity="1.0" id="namedview11" inkscape:current-layer="g1018" inkscape:guide-bbox="true" inkscape:pagecheckerboard="0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" pagecolor="#ffffff" showgrid="false" showguides="true"> | ||
23 | </sodipodi:namedview> | ||
24 | <g id="layer5" inkscape:groupmode="layer" inkscape:label="FakeDocumentBack" sodipodi:insensitive="true" class="st0"> | ||
25 | <rect id="rect1659" x="0" y="0" class="st1" width="512" height="512"/> | ||
26 | </g> | ||
27 | <g id="layer2" inkscape:groupmode="layer" inkscape:label="New" class="st0"> | ||
28 | <g id="layer3" inkscape:groupmode="layer" inkscape:label="Back" class="st2"> | ||
29 | |||
30 | <linearGradient id="path870_00000029029543165683984250000003394365670209864331_" gradientUnits="userSpaceOnUse" x1="500.3292" y1="503.4597" x2="500.3292" y2="-473.7948" gradientTransform="matrix(0.512 0 0 -0.512 0 262.144)"> | ||
31 | <stop offset="0" style="stop-color:#002239"/> | ||
32 | <stop offset="0.4981" style="stop-color:#0062A3"/> | ||
33 | <stop offset="1" style="stop-color:#002239"/> | ||
34 | </linearGradient> | ||
35 | |||
36 | <circle id="path870" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#path870_00000029029543165683984250000003394365670209864331_);stroke:#FFFFFF;stroke-width:12.8;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.024;" cx="256.2" cy="255.6" r="246.1"/> | ||
37 | </g> | ||
38 | <g id="layer4" inkscape:groupmode="layer" inkscape:label="Moustache" class="st2"> | ||
39 | <path id="path1148" class="st4" d="M256.6,200.3l-100,53.3L45.3,212.3l116.1,114.5l95.2-46.1l95.2,46.1l116.1-114.5l-111.3,41.3 | ||
40 | L256.6,200.3z"/> | ||
41 | </g> | ||
42 | </g> | ||
43 | <g id="g1121" inkscape:groupmode="layer" inkscape:label="New 2" class="st0"> | ||
44 | <g id="g1115" inkscape:groupmode="layer" inkscape:label="Back" class="st2"> | ||
45 | |||
46 | <linearGradient id="circle1113_00000058552157840355405800000005237476222601646470_" gradientUnits="userSpaceOnUse" x1="500.3292" y1="503.4597" x2="500.3292" y2="-473.7948" gradientTransform="matrix(0.512 0 0 -0.512 0 262.144)"> | ||
47 | <stop offset="0" style="stop-color:#002239"/> | ||
48 | <stop offset="0.4981" style="stop-color:#0062A3"/> | ||
49 | <stop offset="1" style="stop-color:#002239"/> | ||
50 | </linearGradient> | ||
51 | |||
52 | <circle id="circle1113" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#circle1113_00000058552157840355405800000005237476222601646470_);stroke:#FFFFFF;stroke-width:12.8;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.024;" cx="256.2" cy="255.6" r="246.1"/> | ||
53 | </g> | ||
54 | <g id="g1119" inkscape:groupmode="layer" inkscape:label="Moustache" class="st2"> | ||
55 | <path id="path1117" sodipodi:nodetypes="zscszscsz" class="st4" d="M256.6,200.3c-14.3,0-82.7,53.3-94.4,53.3 | ||
56 | c-12.6,0-107.7-47.5-116.9-41.3c-5.1,11,93.5,114.5,116.1,114.5c22.1,0,87.6-46.1,95.2-46.1s73.1,46.1,95.2,46.1 | ||
57 | c22.5,0,121.2-103.5,116.1-114.5c-9.1-6.2-104.3,41.3-116.9,41.3C339.3,253.6,270.9,200.3,256.6,200.3z"/> | ||
58 | |||
59 | <image style="overflow:visible;enable-background:new ;" width="986" height="986" id="image3869" xlink:href="4B686C2A7ED303A7.png" transform="matrix(0.512 0 0 0.512 3.584 3.072)"> | ||
60 | </image> | ||
61 | </g> | ||
62 | </g> | ||
63 | <g id="g3899" inkscape:groupmode="layer" inkscape:label="New 3" class="st0"> | ||
64 | <g id="g3891" inkscape:groupmode="layer" inkscape:label="Back" class="st2"> | ||
65 | |||
66 | <linearGradient id="circle3889_00000124850289037158365280000004516040718105150600_" gradientUnits="userSpaceOnUse" x1="500.3292" y1="503.4597" x2="500.3292" y2="-473.7948" gradientTransform="matrix(0.512 0 0 -0.512 0 262.144)"> | ||
67 | <stop offset="0" style="stop-color:#002239"/> | ||
68 | <stop offset="0.4981" style="stop-color:#0062A3"/> | ||
69 | <stop offset="1" style="stop-color:#002239"/> | ||
70 | </linearGradient> | ||
71 | |||
72 | <circle id="circle3889" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#circle3889_00000124850289037158365280000004516040718105150600_);stroke:#FFFFFF;stroke-width:12.8;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:1.024;" cx="256.2" cy="255.6" r="246.1"/> | ||
73 | </g> | ||
74 | <g id="g3897" inkscape:groupmode="layer" inkscape:label="Moustache" class="st2"> | ||
75 | <path id="path3893" sodipodi:nodetypes="zscszscsz" class="st4" d="M256.6,200.3c-14.3,0-82.7,53.3-94.4,53.3 | ||
76 | c-12.6,0-91.8-30.6-100.9-24.5c-5.1,11,77.6,97.6,100.1,97.6c22.1,0,87.6-46.1,95.2-46.1s73.1,46.1,95.2,46.1 | ||
77 | c22.5,0,105.2-86.6,100.1-97.6c-9.1-6.2-88.3,24.5-100.9,24.5C339.3,253.6,270.9,200.3,256.6,200.3z"/> | ||
78 | </g> | ||
79 | </g> | ||
80 | <g id="g1024" inkscape:groupmode="layer" inkscape:label="New 4"> | ||
81 | <g id="g1018" inkscape:groupmode="layer" inkscape:label="Back"> | ||
82 | |||
83 | <linearGradient id="circle1016_00000137847432078275244850000011627749736657852824_" gradientUnits="userSpaceOnUse" x1="82.1763" y1="429.5947" x2="430.1607" y2="81.6103"> | ||
84 | <stop offset="0" style="stop-color:#7266F0"/> | ||
85 | <stop offset="1" style="stop-color:#734ED3"/> | ||
86 | </linearGradient> | ||
87 | |||
88 | <circle id="circle1016" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#circle1016_00000137847432078275244850000011627749736657852824_);" cx="256.2" cy="255.6" r="246.1"/> | ||
89 | </g> | ||
90 | <g id="g1022" inkscape:groupmode="layer" inkscape:label="Moustache"> | ||
91 | <path id="path1020" sodipodi:nodetypes="zscszscsz" class="st4" d="M256.6,200.3c-14.3,0-82.7,53.3-94.4,53.3 | ||
92 | c-12.6,0-91.8-30.6-100.9-24.5c-5.1,11,77.6,97.6,100.1,97.6c22.1,0,87.6-46.1,95.2-46.1s73.1,46.1,95.2,46.1 | ||
93 | c22.5,0,105.2-86.6,100.1-97.6c-9.1-6.2-88.3,24.5-100.9,24.5C339.3,253.6,270.9,200.3,256.6,200.3z"/> | ||
94 | </g> | ||
95 | </g> | ||
96 | <g id="layer1" inkscape:groupmode="layer" inkscape:label="Original" sodipodi:insensitive="true" class="st8"> | ||
97 | <g id="Lower-beard" transform="translate(-7.7184e-5,7.9042e-5)" serif:id="Lower beard" class="st2"> | ||
98 | <path id="path2" class="st9" d="M257.9,322.4c12.2,0.1,37.5,1.1,39.6,5.3c6.9,13.8-25.4,94.9-39.8,103.2l0,0.7 | ||
99 | c-0.4,0-0.7-0.1-1.1-0.2c-0.4,0.1-0.7,0.2-1.1,0.2l0-0.7c-14.6-8.3-47.5-89.5-40.6-103.2c2.1-4.1,28-5.1,40.4-5.3v0 | ||
100 | c0.4,0,0.8,0,1.3,0C257,322.4,257.5,322.4,257.9,322.4L257.9,322.4z"/> | ||
101 | </g> | ||
102 | <g id="Upper-beard" transform="translate(-7.7184e-5,7.9042e-5)" serif:id="Upper beard" class="st2"> | ||
103 | <path id="path5" d="M255.4,182.9c25-0.7,38.9-22.5,65.8-10.8c37.4,16.3,49.2,61.6,92,70.8c16.1,3.5,25.8-9.3,35.9-18.8 | ||
104 | c3.3-3.1,8.2-9.7,10.1-9.1c1.9,0.6,1.8,7.2,1,10.7c-1.4,6.7-3.3,13.7-7.3,19.3c-5.4,7.6-12.6,14-20.2,19.4 | ||
105 | c-22.1,15.6-53.6,21.8-80.2,21.2c-18.3-0.4-38.7-5.6-55.6-12c-15.4-5.8-23.9-26.1-41.8-26.3c-18,0.3-26.5,20.6-41.9,26.3 | ||
106 | c-17,6.3-37.4,11.6-55.8,12c-26.7,0.6-58.2-5.6-80.4-21.2c-7.6-5.4-14.8-11.8-20.2-19.4c-4-5.6-5.9-12.6-7.3-19.3 | ||
107 | c-0.7-3.5-0.8-10.1,1-10.7c1.9-0.6,6.8,6,10.1,9.1c10.1,9.6,19.8,22.3,36,18.8c42.9-9.2,54.7-54.5,92.2-70.8 | ||
108 | C215.9,160.4,230.3,182.2,255.4,182.9L255.4,182.9z"/> | ||
109 | </g> | ||
110 | </g> | ||
111 | </svg> | ||
diff --git a/src/assets/images/logo-beard-only.svg b/src/assets/images/logo-beard-only.svg deleted file mode 100644 index bb6e47939..000000000 --- a/src/assets/images/logo-beard-only.svg +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
2 | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> | ||
3 | <svg width="100%" height="100%" viewBox="0 0 1000 1000" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"> | ||
4 | <g id="Logo" transform="matrix(13.3662,0,0,13.3662,20.0535,18.5803)"> | ||
5 | <g id="Lower-beard" serif:id="Lower beard" transform="matrix(0.0748156,0,0,0.0748156,-1.50032,-1.39009)"> | ||
6 | <path d="M503.642,629.673C527.496,629.947 576.943,631.918 581,640C594.482,666.859 531.448,825.299 503.284,841.639L503.282,843C502.598,843 501.881,842.874 501.133,842.629C500.391,842.874 499.679,843 499,843L498.998,841.659C470.575,825.433 406.168,666.87 419.745,640C423.831,631.913 474.528,629.944 498.642,629.673L498.642,629.638C499.424,629.64 500.255,629.644 501.132,629.65C502.017,629.644 502.855,629.64 503.642,629.638L503.642,629.673Z" style="fill:white;"/> | ||
7 | </g> | ||
8 | <g id="Upper-beard" serif:id="Upper beard" transform="matrix(0.0748156,0,0,0.0748156,-1.50032,-1.39009)"> | ||
9 | <path d="M498.733,357.203C547.473,355.78 574.716,313.221 627.233,336.042C700.337,367.808 723.258,456.308 806.959,474.341C838.428,481.121 857.323,456.253 877.092,437.581C883.524,431.506 893.049,418.562 896.807,419.813C900.441,421.022 900.267,433.842 898.85,440.69C896.129,453.836 892.451,467.441 884.685,478.393C874.137,493.269 860.132,505.776 845.238,516.299C802.136,546.753 740.569,558.817 688.631,557.703C652.806,556.934 612.989,546.685 579.942,534.342C549.791,523.08 533.28,483.381 498.234,482.887C463.111,483.381 446.563,523.08 416.345,534.342C383.226,546.685 343.32,556.934 307.416,557.703C255.363,558.817 193.659,546.753 150.461,516.299C135.535,505.776 121.498,493.269 110.927,478.393C103.144,467.441 99.458,453.836 96.731,440.69C95.311,433.842 95.136,421.022 98.778,419.813C102.545,418.562 112.091,431.506 118.537,437.581C138.35,456.253 157.286,481.121 188.826,474.341C272.712,456.308 295.684,367.808 368.949,336.042C421.583,313.221 449.854,355.78 498.733,357.203Z" style="fill:rgb(254,254,254);fill-rule:nonzero;"/> | ||
10 | </g> | ||
11 | </g> | ||
12 | </svg> | ||
diff --git a/src/assets/images/logo.svg b/src/assets/images/logo.svg deleted file mode 100644 index 93c66c97a..000000000 --- a/src/assets/images/logo.svg +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
2 | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> | ||
3 | <svg width="100%" height="100%" viewBox="0 0 1000 1000" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"> | ||
4 | <g id="Logo" transform="matrix(13.3662,0,0,13.3662,20.0535,18.5803)"> | ||
5 | <g id="Background-Circle" serif:id="Background Circle" transform="matrix(0.707107,0.707107,-0.707107,0.707107,36.0061,-14.8263)"> | ||
6 | <path d="M35.9,71.5C16.3,71.5 0.4,55.6 0.4,36C0.4,16.4 16.3,0.6 35.9,0.6C55.5,0.6 71.4,16.5 71.4,36.1C71.4,55.7 55.5,71.5 35.9,71.5Z" style="fill:rgb(114,102,240);fill-rule:nonzero;"/> | ||
7 | </g> | ||
8 | <g id="Lower-beard" serif:id="Lower beard" transform="matrix(0.0748156,0,0,0.0748156,-1.50032,-1.39009)"> | ||
9 | <path d="M503.642,629.673C527.496,629.947 576.943,631.918 581,640C594.482,666.859 531.448,825.299 503.284,841.639L503.282,843C502.598,843 501.881,842.874 501.133,842.629C500.391,842.874 499.679,843 499,843L498.998,841.659C470.575,825.433 406.168,666.87 419.745,640C423.831,631.913 474.528,629.944 498.642,629.673L498.642,629.638C499.424,629.64 500.255,629.644 501.132,629.65C502.017,629.644 502.855,629.64 503.642,629.638L503.642,629.673Z" style="fill:white;"/> | ||
10 | </g> | ||
11 | <g id="Upper-beard" serif:id="Upper beard" transform="matrix(0.0748156,0,0,0.0748156,-1.50032,-1.39009)"> | ||
12 | <path d="M498.733,357.203C547.473,355.78 574.716,313.221 627.233,336.042C700.337,367.808 723.258,456.308 806.959,474.341C838.428,481.121 857.323,456.253 877.092,437.581C883.524,431.506 893.049,418.562 896.807,419.813C900.441,421.022 900.267,433.842 898.85,440.69C896.129,453.836 892.451,467.441 884.685,478.393C874.137,493.269 860.132,505.776 845.238,516.299C802.136,546.753 740.569,558.817 688.631,557.703C652.806,556.934 612.989,546.685 579.942,534.342C549.791,523.08 533.28,483.381 498.234,482.887C463.111,483.381 446.563,523.08 416.345,534.342C383.226,546.685 343.32,556.934 307.416,557.703C255.363,558.817 193.659,546.753 150.461,516.299C135.535,505.776 121.498,493.269 110.927,478.393C103.144,467.441 99.458,453.836 96.731,440.69C95.311,433.842 95.136,421.022 98.778,419.813C102.545,418.562 112.091,431.506 118.537,437.581C138.35,456.253 157.286,481.121 188.826,474.341C272.712,456.308 295.684,367.808 368.949,336.042C421.583,313.221 449.854,355.78 498.733,357.203Z" style="fill:rgb(254,254,254);fill-rule:nonzero;"/> | ||
13 | </g> | ||
14 | </g> | ||
15 | </svg> | ||
diff --git a/src/assets/images/moustache.svg b/src/assets/images/moustache.svg new file mode 100644 index 000000000..9fed27843 --- /dev/null +++ b/src/assets/images/moustache.svg | |||
@@ -0,0 +1 @@ | |||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 391.05 126.4"><defs><style>.a{fill:#fff;fill-rule:evenodd;}</style></defs><path class="a" d="M256.6,200.3c-14.3,0-82.7,53.3-94.4,53.3-12.6,0-91.8-30.6-100.9-24.5-5.1,11,77.6,97.6,100.1,97.6,22.1,0,87.6-46.1,95.2-46.1s73.1,46.1,95.2,46.1c22.5,0,105.2-86.6,100.1-97.6-9.1-6.2-88.3,24.5-100.9,24.5C339.3,253.6,270.9,200.3,256.6,200.3Z" transform="translate(-61.07 -200.3)"/></svg> \ No newline at end of file | |||
diff --git a/src/assets/images/tray/win32/tray-indirect.ico b/src/assets/images/tray/win32/tray-indirect.ico index bc48a4eef..bece9c556 100644 --- a/src/assets/images/tray/win32/tray-indirect.ico +++ b/src/assets/images/tray/win32/tray-indirect.ico | |||
Binary files differ | |||
diff --git a/src/assets/images/tray/win32/tray-unread.ico b/src/assets/images/tray/win32/tray-unread.ico index 34d21f185..a2c04a124 100644 --- a/src/assets/images/tray/win32/tray-unread.ico +++ b/src/assets/images/tray/win32/tray-unread.ico | |||
Binary files differ | |||
diff --git a/src/assets/images/tray/win32/tray.ico b/src/assets/images/tray/win32/tray.ico index e3b7edf60..aee9c17a3 100644 --- a/src/assets/images/tray/win32/tray.ico +++ b/src/assets/images/tray/win32/tray.ico | |||
Binary files differ | |||
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index 21c874c0f..2d13d0bf8 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js | |||
@@ -58,7 +58,7 @@ class AuthLayout extends Component { | |||
58 | {isWindows && !isFullScreen && ( | 58 | {isWindows && !isFullScreen && ( |
59 | <TitleBar | 59 | <TitleBar |
60 | menu={window['ferdium'].menu.template} | 60 | menu={window['ferdium'].menu.template} |
61 | icon="assets/images/logo.svg" | 61 | icon="assets/images/ferdium-icon.svg" |
62 | /> | 62 | /> |
63 | )} | 63 | )} |
64 | <div className="auth"> | 64 | <div className="auth"> |
diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js index 682f6512c..4f6bf3bb6 100644 --- a/src/components/auth/ChangeServer.js +++ b/src/components/auth/ChangeServer.js | |||
@@ -106,7 +106,7 @@ class ChangeServer extends Component { | |||
106 | return ( | 106 | return ( |
107 | <div className="auth__container"> | 107 | <div className="auth__container"> |
108 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 108 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
109 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> | 109 | <Link to='/auth/welcome'><img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /></Link> |
110 | <h1>{intl.formatMessage(messages.headline)}</h1> | 110 | <h1>{intl.formatMessage(messages.headline)}</h1> |
111 | {form.$('server').value === this.franzServer && ( | 111 | {form.$('server').value === this.franzServer && ( |
112 | <Infobox type="warning"> | 112 | <Infobox type="warning"> |
diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js index 281ceda97..4f3d44049 100644 --- a/src/components/auth/Import.js +++ b/src/components/auth/Import.js | |||
@@ -89,7 +89,7 @@ class Import extends Component { | |||
89 | className="franz-form auth__form" | 89 | className="franz-form auth__form" |
90 | onSubmit={e => this.submit(e)} | 90 | onSubmit={e => this.submit(e)} |
91 | > | 91 | > |
92 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> | 92 | <img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /> |
93 | <h1>{intl.formatMessage(messages.headline)}</h1> | 93 | <h1>{intl.formatMessage(messages.headline)}</h1> |
94 | <table className="service-table available-services"> | 94 | <table className="service-table available-services"> |
95 | <tbody> | 95 | <tbody> |
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js index a23af7c6b..aee8b1362 100644 --- a/src/components/auth/Invite.js +++ b/src/components/auth/Invite.js | |||
@@ -144,7 +144,7 @@ class Invite extends Component { | |||
144 | 144 | ||
145 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 145 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
146 | {!embed && ( | 146 | {!embed && ( |
147 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> | 147 | <img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /> |
148 | )} | 148 | )} |
149 | <h1 className={embed && 'invite__embed'}> | 149 | <h1 className={embed && 'invite__embed'}> |
150 | {intl.formatMessage(messages.headline)} | 150 | {intl.formatMessage(messages.headline)} |
diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js index ac1bc4e8c..11ce1272a 100644 --- a/src/components/auth/Locked.js +++ b/src/components/auth/Locked.js | |||
@@ -99,7 +99,7 @@ class Locked extends Component { | |||
99 | return ( | 99 | return ( |
100 | <div className="auth__container"> | 100 | <div className="auth__container"> |
101 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 101 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
102 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> | 102 | <img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /> |
103 | <h1>{intl.formatMessage(messages.headline)}</h1> | 103 | <h1>{intl.formatMessage(messages.headline)}</h1> |
104 | 104 | ||
105 | {touchIdEnabled && ( | 105 | {touchIdEnabled && ( |
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index 3c9c07f0d..7f2cc91a7 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js | |||
@@ -116,7 +116,7 @@ class Login extends Component { | |||
116 | return ( | 116 | return ( |
117 | <div className="auth__container"> | 117 | <div className="auth__container"> |
118 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 118 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
119 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> | 119 | <Link to='/auth/welcome'><img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /></Link> |
120 | <h1>{intl.formatMessage(messages.headline)}</h1> | 120 | <h1>{intl.formatMessage(messages.headline)}</h1> |
121 | {isTokenExpired && ( | 121 | {isTokenExpired && ( |
122 | <p className="error-message center"> | 122 | <p className="error-message center"> |
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js index 49930f6bd..143c1d158 100644 --- a/src/components/auth/Password.js +++ b/src/components/auth/Password.js | |||
@@ -78,7 +78,7 @@ class Password extends Component { | |||
78 | return ( | 78 | return ( |
79 | <div className="auth__container"> | 79 | <div className="auth__container"> |
80 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 80 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
81 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> | 81 | <Link to='/auth/welcome'><img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /></Link> |
82 | <h1>{intl.formatMessage(messages.headline)}</h1> | 82 | <h1>{intl.formatMessage(messages.headline)}</h1> |
83 | {status.length > 0 && status.includes('sent') && ( | 83 | {status.length > 0 && status.includes('sent') && ( |
84 | <Infobox type="success" icon="checkbox-marked-circle-outline"> | 84 | <Infobox type="success" icon="checkbox-marked-circle-outline"> |
diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js index a24f4e4d5..2109bd8de 100644 --- a/src/components/auth/SetupAssistant.js +++ b/src/components/auth/SetupAssistant.js | |||
@@ -212,7 +212,7 @@ class SetupAssistant extends Component { | |||
212 | </Appear> | 212 | </Appear> |
213 | )} | 213 | )} |
214 | 214 | ||
215 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> | 215 | <img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /> |
216 | <h1>{intl.formatMessage(messages.headline)}</h1> | 216 | <h1>{intl.formatMessage(messages.headline)}</h1> |
217 | <h2>{intl.formatMessage(messages.subHeadline)}</h2> | 217 | <h2>{intl.formatMessage(messages.subHeadline)}</h2> |
218 | <div className={classnames('grid', classes.servicesGrid)}> | 218 | <div className={classnames('grid', classes.servicesGrid)}> |
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index 3cccb2428..2d45cfa24 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js | |||
@@ -123,7 +123,7 @@ class Signup extends Component { | |||
123 | className="franz-form auth__form" | 123 | className="franz-form auth__form" |
124 | onSubmit={e => this.submit(e)} | 124 | onSubmit={e => this.submit(e)} |
125 | > | 125 | > |
126 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> | 126 | <Link to='/auth/welcome'><img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /></Link> |
127 | <h1>{intl.formatMessage(messages.headline)}</h1> | 127 | <h1>{intl.formatMessage(messages.headline)}</h1> |
128 | <div className="grid__row"> | 128 | <div className="grid__row"> |
129 | <Input field={form.$('firstname')} focus /> | 129 | <Input field={form.$('firstname')} focus /> |
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js index 94ea4d603..bc489065e 100644 --- a/src/components/auth/Welcome.js +++ b/src/components/auth/Welcome.js | |||
@@ -50,7 +50,7 @@ class Welcome extends Component { | |||
50 | <div className="welcome"> | 50 | <div className="welcome"> |
51 | <div className="welcome__content"> | 51 | <div className="welcome__content"> |
52 | <img | 52 | <img |
53 | src="./assets/images/logo.svg" | 53 | src="./assets/images/ferdium-icon.svg" |
54 | className="welcome__logo" | 54 | className="welcome__logo" |
55 | alt="" | 55 | alt="" |
56 | /> | 56 | /> |
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 5aaac133a..168886227 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -135,7 +135,7 @@ class AppLayout extends Component { | |||
135 | {isWindows && !isFullScreen && ( | 135 | {isWindows && !isFullScreen && ( |
136 | <TitleBar | 136 | <TitleBar |
137 | menu={window['ferdium'].menu.template} | 137 | menu={window['ferdium'].menu.template} |
138 | icon="assets/images/logo.svg" | 138 | icon="assets/images/ferdium-icon.svg" |
139 | /> | 139 | /> |
140 | )} | 140 | )} |
141 | {isMac && !isFullScreen && ( | 141 | {isMac && !isFullScreen && ( |
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index b38b0e3c3..cdf189758 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js | |||
@@ -112,7 +112,7 @@ class Services extends Component { | |||
112 | <Appear timeout={1500} transitionName="slideUp"> | 112 | <Appear timeout={1500} transitionName="slideUp"> |
113 | <div className="services__no-service"> | 113 | <div className="services__no-service"> |
114 | <img | 114 | <img |
115 | src="./assets/images/logo-beard-only.svg" | 115 | src="./assets/images/moustache.svg" |
116 | alt="Logo" | 116 | alt="Logo" |
117 | style={{ maxHeight: '50vh' }} | 117 | style={{ maxHeight: '50vh' }} |
118 | /> | 118 | /> |
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index b500b82cf..280963a1f 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js | |||
@@ -145,7 +145,7 @@ class AccountDashboard extends Component { | |||
145 | <div className="account"> | 145 | <div className="account"> |
146 | <div className="account__box account__box--flex"> | 146 | <div className="account__box account__box--flex"> |
147 | <div className="account__avatar"> | 147 | <div className="account__avatar"> |
148 | <img src="./assets/images/logo.svg" alt="" /> | 148 | <img src="./assets/images/ferdium-icon.svg" alt="" /> |
149 | </div> | 149 | </div> |
150 | <div className="account__info"> | 150 | <div className="account__info"> |
151 | <H1> | 151 | <H1> |