diff options
57 files changed, 260 insertions, 238 deletions
@@ -375,38 +375,7 @@ The GUI has a specific settings file that is configured for each user. The path ## Icons -Icons such as the logo and menubar icons are automatically generated. The source files are: -| Path | Usage | -|------|-------| -| `graphics/icon.svg` | The logo icon used for e.g. application icon and in app logo | -| `graphics/icon-mono.svg` | The logo icon used for the android notification icon | -| `graphics/icon-square.svg` | Logo icon used to generate the iOS application icon | -| `gui/assets/images/*.svg` | Icons used to generate iOS icons and used in the desktop app | -| `gui/assets/images/menubar icons/svg/*.svg` | The frames for the menubar icon | - -Generate desktop icon by running -```bash -gui/scripts/build-logo-icons.sh -``` - -Generate android icons -```bash -android/scripts/generate-pngs.sh -``` - -Generate iOS icon and assets -```bash -ios/convert-assets.rb --app-icon -ios/convert-assets.rb --import-desktop-assets -ios/convert-assets.rb --additional-assets -``` - -Generate desktop menubar icons -```bash -gui/scripts/build-menubar-icons.sh -``` - -The menubar icons are described futher [here](./gui/assets/images/menubar%20icons/README.md). +See [graphics README](graphics/README.md) for information about icons. ## Locales and translations diff --git a/android/README.md b/android/README.md index 0dae157ada..335191cffb 100644 --- a/android/README.md +++ b/android/README.md @@ -36,3 +36,7 @@ the tool used to sync translations between the Android and Desktop apps. [gui-locales-readme]: ../gui/locales/README.md [translations-converter-readme]: ./translations-converter/README.md + +## Icons and assets + +For a general overview of icons and graphics read [the graphics readme](../graphics/README.md). diff --git a/android/app/src/main/res/drawable-hdpi/launch_logo.png b/android/app/src/main/res/drawable-hdpi/launch_logo.png Binary files differindex 4b9b739061..2a9b0ff904 100644 --- a/android/app/src/main/res/drawable-hdpi/launch_logo.png +++ b/android/app/src/main/res/drawable-hdpi/launch_logo.png diff --git a/android/app/src/main/res/drawable-hdpi/logo_icon.png b/android/app/src/main/res/drawable-hdpi/logo_icon.png Binary files differindex fef2b8ce1f..6bc7af4b6d 100644 --- a/android/app/src/main/res/drawable-hdpi/logo_icon.png +++ b/android/app/src/main/res/drawable-hdpi/logo_icon.png diff --git a/android/app/src/main/res/drawable-hdpi/small_logo_black.png b/android/app/src/main/res/drawable-hdpi/small_logo_black.png Binary files differindex f335f411f8..ac4cdd67ed 100644 --- a/android/app/src/main/res/drawable-hdpi/small_logo_black.png +++ b/android/app/src/main/res/drawable-hdpi/small_logo_black.png diff --git a/android/app/src/main/res/drawable-hdpi/small_logo_white.png b/android/app/src/main/res/drawable-hdpi/small_logo_white.png Binary files differindex b975e81ede..3d28cbb77c 100644 --- a/android/app/src/main/res/drawable-hdpi/small_logo_white.png +++ b/android/app/src/main/res/drawable-hdpi/small_logo_white.png diff --git a/android/app/src/main/res/drawable-mdpi/launch_logo.png b/android/app/src/main/res/drawable-mdpi/launch_logo.png Binary files differindex bb9d166f6c..00ab066921 100644 --- a/android/app/src/main/res/drawable-mdpi/launch_logo.png +++ b/android/app/src/main/res/drawable-mdpi/launch_logo.png diff --git a/android/app/src/main/res/drawable-mdpi/logo_icon.png b/android/app/src/main/res/drawable-mdpi/logo_icon.png Binary files differindex 08f807d7a3..534ea3a15f 100644 --- a/android/app/src/main/res/drawable-mdpi/logo_icon.png +++ b/android/app/src/main/res/drawable-mdpi/logo_icon.png diff --git a/android/app/src/main/res/drawable-mdpi/small_logo_black.png b/android/app/src/main/res/drawable-mdpi/small_logo_black.png Binary files differindex 0613f65cc6..318518b7fb 100644 --- a/android/app/src/main/res/drawable-mdpi/small_logo_black.png +++ b/android/app/src/main/res/drawable-mdpi/small_logo_black.png diff --git a/android/app/src/main/res/drawable-mdpi/small_logo_white.png b/android/app/src/main/res/drawable-mdpi/small_logo_white.png Binary files differindex 4d05b81186..87be0ab4c8 100644 --- a/android/app/src/main/res/drawable-mdpi/small_logo_white.png +++ b/android/app/src/main/res/drawable-mdpi/small_logo_white.png diff --git a/android/app/src/main/res/drawable-xhdpi/launch_logo.png b/android/app/src/main/res/drawable-xhdpi/launch_logo.png Binary files differindex 876cb32f32..b63b5083b8 100644 --- a/android/app/src/main/res/drawable-xhdpi/launch_logo.png +++ b/android/app/src/main/res/drawable-xhdpi/launch_logo.png diff --git a/android/app/src/main/res/drawable-xhdpi/logo_icon.png b/android/app/src/main/res/drawable-xhdpi/logo_icon.png Binary files differindex 28ed381da3..e9a95d58c9 100644 --- a/android/app/src/main/res/drawable-xhdpi/logo_icon.png +++ b/android/app/src/main/res/drawable-xhdpi/logo_icon.png diff --git a/android/app/src/main/res/drawable-xhdpi/small_logo_black.png b/android/app/src/main/res/drawable-xhdpi/small_logo_black.png Binary files differindex fd681d9c6a..511e5536bc 100644 --- a/android/app/src/main/res/drawable-xhdpi/small_logo_black.png +++ b/android/app/src/main/res/drawable-xhdpi/small_logo_black.png diff --git a/android/app/src/main/res/drawable-xhdpi/small_logo_white.png b/android/app/src/main/res/drawable-xhdpi/small_logo_white.png Binary files differindex b40c5b59dd..4e40f24132 100644 --- a/android/app/src/main/res/drawable-xhdpi/small_logo_white.png +++ b/android/app/src/main/res/drawable-xhdpi/small_logo_white.png diff --git a/android/app/src/main/res/drawable-xxhdpi/launch_logo.png b/android/app/src/main/res/drawable-xxhdpi/launch_logo.png Binary files differindex 3ea8cbe15a..0094063089 100644 --- a/android/app/src/main/res/drawable-xxhdpi/launch_logo.png +++ b/android/app/src/main/res/drawable-xxhdpi/launch_logo.png diff --git a/android/app/src/main/res/drawable-xxhdpi/logo_icon.png b/android/app/src/main/res/drawable-xxhdpi/logo_icon.png Binary files differindex 0be79bef01..da161671a3 100644 --- a/android/app/src/main/res/drawable-xxhdpi/logo_icon.png +++ b/android/app/src/main/res/drawable-xxhdpi/logo_icon.png diff --git a/android/app/src/main/res/drawable-xxhdpi/small_logo_black.png b/android/app/src/main/res/drawable-xxhdpi/small_logo_black.png Binary files differindex b012f609ec..a171963ed8 100644 --- a/android/app/src/main/res/drawable-xxhdpi/small_logo_black.png +++ b/android/app/src/main/res/drawable-xxhdpi/small_logo_black.png diff --git a/android/app/src/main/res/drawable-xxhdpi/small_logo_white.png b/android/app/src/main/res/drawable-xxhdpi/small_logo_white.png Binary files differindex 79c8003c09..85669c62ad 100644 --- a/android/app/src/main/res/drawable-xxhdpi/small_logo_white.png +++ b/android/app/src/main/res/drawable-xxhdpi/small_logo_white.png diff --git a/android/app/src/main/res/drawable-xxxhdpi/launch_logo.png b/android/app/src/main/res/drawable-xxxhdpi/launch_logo.png Binary files differindex 7d3ec88895..51171c101d 100644 --- a/android/app/src/main/res/drawable-xxxhdpi/launch_logo.png +++ b/android/app/src/main/res/drawable-xxxhdpi/launch_logo.png diff --git a/android/app/src/main/res/drawable-xxxhdpi/logo_icon.png b/android/app/src/main/res/drawable-xxxhdpi/logo_icon.png Binary files differindex eb7a150208..03979dbff4 100644 --- a/android/app/src/main/res/drawable-xxxhdpi/logo_icon.png +++ b/android/app/src/main/res/drawable-xxxhdpi/logo_icon.png diff --git a/android/app/src/main/res/drawable-xxxhdpi/small_logo_black.png b/android/app/src/main/res/drawable-xxxhdpi/small_logo_black.png Binary files differindex a2d59c953b..7f2d33734d 100644 --- a/android/app/src/main/res/drawable-xxxhdpi/small_logo_black.png +++ b/android/app/src/main/res/drawable-xxxhdpi/small_logo_black.png diff --git a/android/app/src/main/res/drawable-xxxhdpi/small_logo_white.png b/android/app/src/main/res/drawable-xxxhdpi/small_logo_white.png Binary files differindex 89c5de1385..82eabb4494 100644 --- a/android/app/src/main/res/drawable-xxxhdpi/small_logo_white.png +++ b/android/app/src/main/res/drawable-xxxhdpi/small_logo_white.png diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differindex e69d754ff4..eb38145c3c 100644 --- a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differindex 1d53dd86ac..13f0df6b36 100644 --- a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differindex 2164b759a6..2534ca44e3 100644 --- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differindex c2f5a200c2..b01a564765 100644 --- a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differindex 922f83b1db..063b31017e 100644 --- a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/android/scripts/generate-pngs.sh b/android/scripts/generate-pngs.sh index 3e75db6a4c..a3d90976c9 100755 --- a/android/scripts/generate-pngs.sh +++ b/android/scripts/generate-pngs.sh @@ -12,7 +12,7 @@ cd "$SCRIPT_DIR" ICON_SVG_PATH="../../graphics/icon.svg" # Icons used for notification and quick settings tile -BLACK_MONO_ICON_PATH="../../graphics/icon-mono.svg" +BLACK_MONO_ICON_PATH="../../graphics/icon-shaved.svg" # The following helper function converts an SVG image into a PNG image for a specific DPI # diff --git a/android/src/main/play/listings/en-US/graphics/icon/icon.png b/android/src/main/play/listings/en-US/graphics/icon/icon.png Binary files differindex 23a1bb5fe3..9a31f3f955 100644 --- a/android/src/main/play/listings/en-US/graphics/icon/icon.png +++ b/android/src/main/play/listings/en-US/graphics/icon/icon.png diff --git a/dist-assets/icon-macos.icns b/dist-assets/icon-macos.icns Binary files differindex 231c97df26..8c16f76c9a 100644 --- a/dist-assets/icon-macos.icns +++ b/dist-assets/icon-macos.icns diff --git a/dist-assets/icon.icns b/dist-assets/icon.icns Binary files differindex 76c7121124..bd507cfde6 100644 --- a/dist-assets/icon.icns +++ b/dist-assets/icon.icns diff --git a/dist-assets/icon.ico b/dist-assets/icon.ico Binary files differindex 2bd043c419..608c5d970b 100644 --- a/dist-assets/icon.ico +++ b/dist-assets/icon.ico diff --git a/dist-assets/windows/installersidebar.bmp b/dist-assets/windows/installersidebar.bmp Binary files differindex 843cf62868..f22ff83711 100644 --- a/dist-assets/windows/installersidebar.bmp +++ b/dist-assets/windows/installersidebar.bmp diff --git a/graphics/README.md b/graphics/README.md index 61287b764e..2c6451b8f1 100644 --- a/graphics/README.md +++ b/graphics/README.md @@ -9,6 +9,33 @@ The `Android-feature-graphics.psd` file should be used to generate a PNG image t feature graphics in the app's Google Play Store listing. The PNG image should be placed in the `android/app/src/main/play/listings/en-US/graphics/feature-graphics/` directory. +## Icons (The mole logo in different versions) + +### `icon.svg` + +The main and official mole logo. Used to generate icons on a bunch of platforms. + +If `icon.svg` is changed. You need to run the following to generate new assets: +* Desktop: `gui/scripts/build-logo-icons.sh` +* Android: `android/scripts/generate-pngs.sh` + +### `icon-square.svg` + +This is the regular mole but instead of being placed in a blue circle the entire background is just blue. +The mole is placed slighty to the right compared to `icon.svg` to appear more centered. And the mole +is a little bit smaller so it fits better when corners are rounded off during icon creation. + +#### Desktop + +The square icon is used on desktop as the base for the macOS icons. To update them: + +1. Create the macOS icons by inserting the updated `/graphics/icon-square.svg` into Apple's macOS +icon template available at https://developer.apple.com/design/resources/. +1. Save the icons to `/graphics/macOS/` +1. Run `scripts/build-logo-icons.sh` + +#### Android + The `icon-square.svg` is used to generate Android's square icon used in the app's Google Play Store listing. The resulting 512x512 PNG image should be placed in the `android/app/src/main/play/listings/en-US/graphics/icon/` directory. The file can be generate with the @@ -18,7 +45,26 @@ following command: rsvg-convert ./icon-square.svg -w 512 -h 512 -o ../android/app/src/main/play/listings/en-US/graphics/icon/icon.png ``` -The icon `adaptive-icon-source.svg` is used for Android adaptive icon. The icon converted to +#### iOS + +`icon-square.svg` is used to generate the app icon for iOS. To regenerate the assets run: +``` +ios/convert-assets.rb --app-icon +``` + +### `icon-android.svg` & `icon-android-mono.svg` + +The icon `icon-android.svg` is used for Android adaptive icon. The icon converted to Android Vector Drawable format and used as foreground layer for adaptive icon. For background layer is used solid color layer. Full documentation about adaptive icon available on link below: https://developer.android.com/guide/practices/ui_guidelines/icon_design_adaptive + +`icon-android-mono.svg` is the monochromatic version. It's used as "themed icons" on Android. + +### `icon-shaved.svg` + +This is a simplified version of the logo with the whiskers and fur removed. This version should be used +when rendering the mole icon in tiny versions where the little details in the logo would not be visible +anyway, and would just make the small assets look less clean. + +It is currently used to generate small icon assets for Android: `android/scripts/generate-pngs.sh`. diff --git a/graphics/adaptive-icon-source.svg b/graphics/adaptive-icon-source.svg deleted file mode 100644 index 1dc6511844..0000000000 --- a/graphics/adaptive-icon-source.svg +++ /dev/null @@ -1,14 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="108" height="108" viewBox="0 0 108 108"> - <g fill="none" fill-rule="evenodd"> - <g transform="translate(18 18)"> - <path fill="#D0933A" d="M5.56604657,32.5107851 L8.2142097,28.8028159 C8.2142097,28.8304873 8.0486995,34.1433984 8.0486995,34.1433984 L8.79349538,30.1310436 C11.000298,34.6138124 16.4069644,40.8122088 21.3446852,44.1327782 C21.8688008,44.4925066 22.3101613,44.8799063 22.6135967,45.2673061 C23.2480524,45.5163488 23.8825082,45.6547059 24.5169639,45.7653915 C24.8479843,45.8207344 25.2065898,45.8484058 25.5376101,45.8760772 C25.8686305,45.9037486 26.227236,45.9037486 26.5582564,45.9037486 C26.8892767,45.9037486 27.2202971,45.8760772 27.5513175,45.8484058 C27.8823379,45.8207344 28.2133583,45.7653915 28.5443787,45.7100487 C28.8753991,45.6547059 29.2064195,45.5993631 29.5098548,45.4886774 C29.8408752,45.4056632 30.1443106,45.3226489 30.475331,45.2119633 C30.7787663,45.1289491 31.1097867,44.990592 31.4132221,44.8799063 C31.7166574,44.7415493 32.0200928,44.6308636 32.3235282,44.4648352 C32.6269635,44.2988067 32.9303989,44.1604496 33.2062492,43.9944212 C33.5096846,43.8560641 33.7855349,43.6623642 34.0889702,43.4963357 C34.3924056,43.3303073 34.6682559,43.1366074 34.9716913,42.9705789 C35.2751266,42.8045504 35.550977,42.6108505 35.8268273,42.4448221 C36.1026776,42.2511222 36.406113,42.0850937 36.6819633,41.8913938 C36.9578136,41.6976939 37.261249,41.5316655 37.5646843,41.3379656 L37.8405347,41.1719371 L37.9784598,41.2549513 L39.9645822,42.5831791 L37.9508748,42.0574223 C37.7577796,42.2787936 37.5646843,42.5001649 37.3440041,42.7215362 C37.0957388,42.9705789 36.8198885,43.2196216 36.5716232,43.4686643 C36.2957728,43.6900356 36.0199225,43.9390783 35.7164872,44.1327782 C35.4130518,44.3541495 35.1372015,44.5478494 34.8061811,44.7415493 C34.1993104,45.1289491 33.5372696,45.461006 32.8476438,45.7377201 C32.5166234,45.8760772 32.158018,46.0144342 31.8269976,46.1251199 C31.4683922,46.2358055 31.1373718,46.3464912 30.7787663,46.4295054 C30.4201609,46.5125197 30.0615555,46.5955339 29.7029501,46.6508767 C29.3443446,46.7062196 28.9857392,46.733891 28.6271338,46.7892338 C27.9099229,46.8169052 27.1651271,46.8169052 26.4479162,46.7062196 C26.0893108,46.6508767 25.7307054,46.5955339 25.3721,46.5125197 C25.0134945,46.4295054 24.6824741,46.3188198 24.3514537,46.2081341 C23.7721681,45.9867628 23.1928824,45.7100487 22.6687668,45.3779918 C22.6687668,45.3779918 20.7653995,45.6547059 21.5377804,47.0936193 C22.3101613,48.5325328 23.4687327,48.3941757 22.9170321,50.0821318 C22.5308416,50.9952884 21.9791409,51.8807736 21.3722702,52.710916 C20.1033587,54.4265436 18.1172364,55.9484712 18.3103316,56.8616278 C27.3306373,68.013207 47.6608063,66.4636079 55.3846154,56.5018995 C55.2742753,55.062986 53.0123026,54.3712007 51.4399557,50.8569314 C51.8813162,50.9952884 52.543357,51.1889883 52.543357,51.1613169 C52.543357,51.1336455 50.6675748,48.0897902 50.5848197,47.7854046 L51.7985612,47.8684189 C51.7985612,47.8684189 50.1986293,45.8760772 50.1434592,45.6823773 L51.7709761,45.461006 C51.7709761,45.461006 49.7296837,43.108936 49.7020987,42.9152361 L51.7709761,43.247293 L49.5090034,40.5078232 L50.5848197,40.5078232 L49.3159082,38.6538386 C49.095228,38.5708244 48.8745477,38.5154815 48.6538674,38.4601387 C48.3780171,38.3771245 48.1021668,38.2941102 47.8263165,38.211096 C44.7367928,37.2425966 41.8127794,36.3571114 38.999106,34.586141 C35.0544464,32.1233853 31.5235622,29.1072014 28.8753991,26.7551314 L23.5514878,24.1540186 C18.4482568,23.7666188 13.6484611,23.9049759 10.7244477,24.4860756 L12.6002299,21.2761917 L9.73138649,24.7351183 C9.53829126,24.6797754 9.4831212,24.5690898 9.4831212,24.5690898 L9.67621642,20.3076923 L8.76591035,24.1540186 C8.49006002,24.0156615 8.15903963,23.9603187 7.82801924,23.9603187 C6.55910774,23.9603187 5.53846154,24.984161 5.53846154,26.2570459 C5.53846154,27.4192452 6.39359755,28.3877447 7.52458388,28.5261017 L5.56604657,32.5107851 L5.56604657,32.5107851 L5.56604657,32.5107851 L5.56604657,32.5107851 Z"/> - <path fill="#FFCC86" d="M8.66806053,22.3888112 C8.39826752,22.2545455 8.0745159,22.1538462 7.77774358,22.1538462 C6.5366957,22.1538462 5.53846154,23.3958042 5.53846154,24.9398601 C5.53846154,26.2825175 6.32086129,27.4237762 7.34607475,27.6923077 C7.37305405,27.6923077 7.37305405,27.6923077 7.40003335,27.6923077 C8.0745159,27.4237762 9.42348098,25.1748252 9.20764657,23.765035 C9.12670866,23.2615385 8.93785355,22.7916084 8.66806053,22.3888112 L8.66806053,22.3888112 L8.66806053,22.3888112 L8.66806053,22.3888112 Z"/> - <path fill="#FDD321" d="M28.7647068,21.238805 C28.3404418,20.0308261 28.4535791,18.4692924 29.0475501,16.9961473 C29.8960799,14.9632072 31.5082867,13.6079138 33.0356405,13.6079138 C33.3467681,13.6079138 33.6296114,13.6668396 33.9124547,13.7846912 C34.7892689,12.95973 35.8075047,12.2820833 36.9388779,11.8106769 C43.1897147,9.21794163 52.325553,13.843617 54.6731524,20.2370664 C55.8045255,23.3306709 55.4651136,26.7189045 54.5034464,29.812509 C53.7114852,32.3463185 50.8264836,35.9997181 51.9012881,38.7692308 C51.4770232,38.6513792 42.5391751,35.7640149 40.0501541,34.1140925 C36.0620637,31.5213573 32.4699539,28.339364 29.7829426,25.8644804 L29.6980896,25.7760917 L20.6188199,21.2977308 C20.5056826,21.238805 20.3925453,21.1798792 20.3076923,21.1209534 C21.6087715,21.1209534 26.5585291,21.7396743 28.7647068,21.238805"/> - <g fill-rule="nonzero" transform="translate(29.538 12.923)"> - <path fill="#FFF" d="M2.64615385,6.76526055 C2.36923077,6.76526055 2.12307692,6.71761787 1.93846154,6.64615385 C1.44615385,6.47940447 1.07692308,6.16972705 0.830769231,5.69330025 C0.4,4.88337469 0.523076923,3.76377171 1.10769231,2.71563275 C1.87692308,1.35781638 3.32307692,0.404962779 4.64615385,0.404962779 C4.89230769,0.404962779 5.13846154,0.452605459 5.38461538,0.524069479 C6.03076923,0.738461538 6.49230769,1.23870968 6.64615385,1.95334988 C6.83076923,2.71563275 6.67692308,3.59702233 6.18461538,4.43076923 C5.41538462,5.78858561 3.93846154,6.76526055 2.64615385,6.76526055 Z"/> - <path fill="#1D2A3A" d="M4.61538462,0.786104218 C4.8,0.786104218 4.98461538,0.809925558 5.16923077,0.881389578 C5.66153846,1.04813896 6.03076923,1.47692308 6.15384615,2.04863524 C6.30769231,2.73945409 6.18461538,3.54937965 5.72307692,4.31166253 C5.04615385,5.52655087 3.72307692,6.40794045 2.61538462,6.40794045 C2.43076923,6.40794045 2.24615385,6.38411911 2.09230769,6.33647643 L2.09230769,6.33647643 L2.09230769,6.33647643 C1.63076923,6.19354839 1.38461538,5.86004963 1.26153846,5.59801489 C0.892307692,4.88337469 0.984615385,3.83523573 1.50769231,2.88238213 C2.21538462,1.6674938 3.50769231,0.786104218 4.61538462,0.786104218 M4.61538462,0.0714640199 C3.13846154,0.0714640199 1.50769231,1.11960298 0.646153846,2.62034739 C-1.2101431e-13,3.73995037 -0.0923076923,4.95483871 0.369230769,5.88387097 C0.646153846,6.43176179 1.10769231,6.81290323 1.69230769,7.02729529 C1.96923077,7.12258065 2.27692308,7.17022333 2.61538462,7.17022333 C4.09230769,7.17022333 5.72307692,6.12208437 6.55384615,4.62133995 C7.07692308,3.71612903 7.23076923,2.76327543 7.04615385,1.92952854 C6.86153846,1.09578164 6.30769231,0.500248139 5.50769231,0.2382134 C5.26153846,0.1191067 4.95384615,0.0714640199 4.61538462,0.0714640199 L4.61538462,0.0714640199 Z"/> - </g> - <circle cx="36" cy="36" r="36"/> - </g> - </g> -</svg> diff --git a/graphics/icon-android-mono.svg b/graphics/icon-android-mono.svg new file mode 100644 index 0000000000..31b85fb1ea --- /dev/null +++ b/graphics/icon-android-mono.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg version="1.1" id="Mullvad_VPN_Logo_BW_Android" + xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 108 108" + style="enable-background:new 0 0 108 108;" xml:space="preserve"> +<style type="text/css"> + .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#000000;} +</style> +<path class="st1" d="M74.2,74.5c-8,10.3-29,11.9-38.3,0.4c-0.2-0.9,1.9-2.5,3.2-4.3c0.6-0.9,1.2-1.8,1.6-2.7c0.6-1.7-0.6-1.6-1.4-3.1 + c-0.1-0.3-0.3-0.6-0.1-0.9c0.2-0.6,1.1-1,1.3-0.9c3.9,2.6,11.3,1.8,15.8-3.4c0,0,1.4,0.3,2.1,0.5l-2.1-1.4l-0.1-0.1 + c-0.1,0.1-0.2,0.1-0.3,0.2c-9.4,7.1-15.5,4.1-15.5,4.1c-0.2-0.2-0.8-0.8-1.3-1.2c-6.4-4.5-10.9-10.5-13-14.4l-0.8,4.1l0.2-5.5 + l-2.7,3.8l2-4.1c-1.5-0.2-2.4-1.7-2-2.9c0.3-1.3,1.9-2.2,3.3-1.6l0.9-4l-0.2,4.3c0,0,0.2,0.1,0.4,0.1l2.8-3.4l-1.9,3.3 + c3-0.6,8-0.7,13.3-0.3l5.5,2.7c2.7,2.4,6.4,5.5,10.5,8.1L67.9,56l1.3,1.9h-1.1l2.3,2.8l-2.1-0.3c0,0.2,2.1,2.6,2.1,2.6l-1.7,0.2 + c0.1,0.2,1.7,2.3,1.7,2.3l-1.3-0.1c0.1,0.3,2,3.5,2,3.5s-0.7-0.2-1.1-0.3C71.7,72.3,74.1,73,74.2,74.5z M72.8,46.2 + c-0.8,2.5-3.7,6-2.6,8.7c-0.4-0.1-9.4-3.1-11.9-4.5c-4-2.5-7.6-5.6-10.3-8l-0.1-0.1L38.6,38c-0.1-0.1-0.2-0.1-0.3-0.2 + c1.3,0.1,6.3,0.7,8.5,0.2c-0.4-1.2-0.3-2.7,0.3-4.1c0.9-2,2.5-3.3,4-3.3c0.3,0,0.6,0.1,0.9,0.2c0.9-0.8,1.9-1.5,3.1-1.9 + c6.3-2.5,15.5,2,17.9,8.1C74.1,40,73.8,43.2,72.8,46.2z M52,31.6c-1.4-0.6-3.2,0.5-4,2.6c-0.9,2-0.5,4.1,0.9,4.7 + c1.3,0.6,3.2-0.5,4-2.6C53.7,34.3,53.3,32.1,52,31.6z"/> +</svg> diff --git a/graphics/icon-android.svg b/graphics/icon-android.svg new file mode 100644 index 0000000000..95cdb328f6 --- /dev/null +++ b/graphics/icon-android.svg @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg version="1.1" id="logo" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 108 108" style="enable-background:new 0 0 108 108;" xml:space="preserve"> +<style type="text/css"> + .background{fill-rule:evenodd;clip-rule:evenodd;fill:none;} + .fur{fill-rule:evenodd;clip-rule:evenodd;fill:#D2943B;} + .nose{fill-rule:evenodd;clip-rule:evenodd;fill:#FFCD86;} + .helmet{fill-rule:evenodd;clip-rule:evenodd;fill:#FFD524;} + .lamp-light{fill:#FFFFFF;} + .lamp-ring{fill:#192E45;} +</style> +<g id="mole"> + <path id="bg" class="background" d="M18,54c0,19.9,16.1,36,36,36s36-16.1,36-36 + S73.9,18,54,18S18,34.1,18,54L18,54L18,54L18,54z"/> + <g id="body"> + <path id="fur" class="fur" d="M24.8,45.6l-2,4.1l2.7-3.8 + c0,0-0.2,5.5-0.2,5.5l0.8-4.1c2.1,3.9,6.6,9.9,13,14.4c0.5,0.3,1.1,0.9,1.3,1.2c0,0,6.1,3.1,15.5-4.1c0.1-0.1,0.2-0.1,0.3-0.2 + l0.1,0.1l2.1,1.4c-0.7-0.2-2.1-0.5-2.1-0.5c-4.5,5.2-11.9,6.1-15.8,3.4c-0.2-0.1-1.1,0.3-1.3,0.9c-0.1,0.3,0,0.7,0.1,0.9 + c0.8,1.5,2,1.3,1.4,3.1c-0.4,0.9-1,1.9-1.6,2.7c-1.3,1.8-3.4,3.3-3.2,4.3c9.3,11.5,30.3,9.9,38.3-0.4c-0.1-1.5-2.5-2.2-4.1-5.8 + c0.5,0.1,1.1,0.3,1.1,0.3c0,0-1.9-3.2-2-3.5l1.3,0.1c0,0-1.7-2.1-1.7-2.3l1.7-0.2c0,0-2.1-2.4-2.1-2.6l2.1,0.3l-2.3-2.8h1.1L68,56 + l-10.7-4.2c-4.1-2.5-7.7-5.7-10.5-8.1l-5.5-2.7c-5.3-0.4-10.2-0.3-13.3,0.3l1.9-3.3l-2.8,3.4c-0.2-0.1-0.4-0.1-0.4-0.1l0.2-4.3 + l-0.9,4L24.8,45.6z"/> + <path id="nose" class="nose" d="M26.1,41.1c-1.4-0.7-3,0.3-3.3,1.6 + c-0.3,1.2,0.5,2.7,2,2.9C26.3,44.7,27.5,42.4,26.1,41.1z"/> + </g> + <g id="helmet"> + <path id="helmet" class="helmet" d="M46.9,38c-0.4-1.2-0.3-2.7,0.3-4.1 + c0.9-2,2.5-3.3,4-3.3c0.3,0,0.6,0.1,0.9,0.2c0.9-0.8,1.9-1.5,3.1-1.9c6.3-2.5,15.5,2,17.9,8.1c1.1,3,0.8,6.3-0.2,9.3 + c-0.8,2.5-3.7,6-2.6,8.7c-0.4-0.1-9.4-3.1-11.9-4.5c-4-2.5-7.6-5.6-10.3-8l-0.1-0.1L38.7,38c-0.1-0.1-0.2-0.1-0.3-0.2 + C39.7,37.9,44.7,38.5,46.9,38"/> + <g id="lamp"> + + <ellipse id="lamp-light" transform="matrix(0.4007 -0.9162 0.9162 0.4007 -2.0292 67.412)" class="lamp-light" cx="50.5" cy="35.3" rx="3.9" ry="2.3"/> + <path id="lamp-ring" class="lamp-ring" d="M52.3,31.2c-1.5-0.7-3.5,0.6-4.5,2.9 + c-1,2.3-0.6,4.6,1,5.3c1.5,0.7,3.5-0.6,4.5-2.9S53.8,31.8,52.3,31.2z M52.5,36.1c-0.8,1.8-2.3,2.9-3.4,2.4 + c-1.1-0.5-1.3-2.3-0.5-4.1c0.8-1.8,2.3-2.9,3.4-2.4C53,32.5,53.3,34.3,52.5,36.1z"/> + </g> + </g> +</g> +</svg> diff --git a/graphics/icon-mono.svg b/graphics/icon-mono.svg deleted file mode 100644 index d98f8c3f5d..0000000000 --- a/graphics/icon-mono.svg +++ /dev/null @@ -1,31 +0,0 @@ -<svg version="1.1" id="brand" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - x="0px" y="0px" viewBox="73.7 73.7 252.6 252.6" style="enable-background:new 0 0 400 400;" xml:space="preserve"> -<style type="text/css"> - .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#000000;} -</style> -<g id="Logo"> - <path id="Mullvad_Fur" class="st1" d="M90.6,184.9l9.6-13.4c0,0.1-0.6,19.3-0.6,19.3l2.7-14.5c8,16.2,27.6,38.6,45.5,50.6 - c1.9,1.3,3.5,2.7,4.6,4.1c2.3,0.9,4.6,1.4,6.9,1.8c1.2,0.2,2.5,0.3,3.7,0.4c1.2,0.1,2.5,0.1,3.7,0.1c1.2,0,2.4-0.1,3.6-0.2 - c1.2-0.1,2.4-0.3,3.6-0.5c1.2-0.2,2.4-0.4,3.5-0.8c1.2-0.3,2.3-0.6,3.5-1c1.1-0.3,2.3-0.8,3.4-1.2c1.1-0.5,2.2-0.9,3.3-1.5 - c1.1-0.6,2.2-1.1,3.2-1.7c1.1-0.5,2.1-1.2,3.2-1.8c1.1-0.6,2.1-1.3,3.2-1.9c1.1-0.6,2.1-1.3,3.1-1.9c1-0.7,2.1-1.3,3.1-2 - c1-0.7,2.1-1.3,3.2-2l1-0.6l0.5,0.3l7.2,4.8l-7.3-1.9c-0.7,0.8-1.4,1.6-2.2,2.4c-0.9,0.9-1.9,1.8-2.8,2.7c-1,0.8-2,1.7-3.1,2.4 - c-1.1,0.8-2.1,1.5-3.3,2.2c-2.2,1.4-4.6,2.6-7.1,3.6c-1.2,0.5-2.5,1-3.7,1.4c-1.3,0.4-2.5,0.8-3.8,1.1c-1.3,0.3-2.6,0.6-3.9,0.8 - c-1.3,0.2-2.6,0.3-3.9,0.5c-2.6,0.1-5.3,0.1-7.9-0.3c-1.3-0.2-2.6-0.4-3.9-0.7c-1.3-0.3-2.5-0.7-3.7-1.1c-2.1-0.8-4.2-1.8-6.1-3 - c0,0-6.9,1-4.1,6.2c2.8,5.2,7,4.7,5,10.8c-1.4,3.3-3.4,6.5-5.6,9.5c-4.6,6.2-11.8,11.7-11.1,15c32.7,40.3,106.4,34.7,134.4-1.3 - c-0.4-5.2-8.6-7.7-14.3-20.4c1.6,0.5,4,1.2,4,1.1c0-0.1-6.8-11.1-7.1-12.2l4.4,0.3c0,0-5.8-7.2-6-7.9l5.9-0.8c0,0-7.4-8.5-7.5-9.2 - l7.5,1.2l-8.2-9.9h3.9l-4.6-6.7c-0.8-0.3-1.6-0.5-2.4-0.7c-1-0.3-2-0.6-3-0.9c-11.2-3.5-21.8-6.7-32-13.1 - c-14.3-8.9-27.1-19.8-36.7-28.3l-19.3-9.4c-18.5-1.4-35.9-0.9-46.5,1.2l6.8-11.6l-10.4,12.5c-0.7-0.2-0.9-0.6-0.9-0.6l0.7-15.4 - l-3.3,13.9c-1-0.5-2.2-0.7-3.4-0.7c-4.6,0-8.3,3.7-8.3,8.3c0,4.2,3.1,7.7,7.2,8.2L90.6,184.9L90.6,184.9L90.6,184.9L90.6,184.9z"/> - <path id="Mullvad_Nose" class="st1" d="M102.2,154.5c-1-0.4-2.2-0.7-3.3-0.7c-4.6,0-8.3,3.7-8.3,8.3c0,4,2.9,7.4,6.7,8.2 - c0.1,0,0.1,0,0.2,0c2.5-0.8,7.5-7.5,6.7-11.7C103.9,157.1,103.2,155.7,102.2,154.5L102.2,154.5L102.2,154.5L102.2,154.5z"/> - <mask id="Helmet_Lamp"> - <rect fill="white" x="-1000" y="-1000" width="2000" height="2000"/> - <path fill="black" d="M184.6,147.4c-0.9,0-1.7-0.2-2.3-0.5c-1.6-0.7-2.8-2-3.6-4c-1.4-3.4-1-8.1,0.9-12.5c2.5-5.7,7.2-9.7,11.5-9.7 - c0.8,0,1.6,0.2,2.4,0.5c2.1,0.9,3.6,3,4.1,6c0.6,3.2,0.1,6.9-1.5,10.4C193.6,143.3,188.8,147.4,184.6,147.4z"/> - </mask> - <path id="Mullvad_Helmet" class="st1" mask="url(#Helmet_Lamp)" d="M175.1,143.8c-1.5-4.1-1.1-9.4,1-14.4c3-6.9,8.7-11.5,14.1-11.5 - c1.1,0,2.1,0.2,3.1,0.6 c3.1-2.8,6.7-5.1,10.7-6.7c22.1-8.8,54.4,6.9,62.7,28.6c4,10.5,2.8,22-0.6,32.5c-2.8,8.6-13,21-9.2,30.4 - c-1.5-0.4-33.1-10.2-41.9-15.8c-14.1-8.8-26.8-19.6-36.3-28l-0.3-0.3L146.3,144c-0.4-0.2-0.8-0.4-1.1-0.6 - C149.8,143.4,167.3,145.5,175.1,143.8"/> -</g> -</svg> diff --git a/graphics/icon-shaved.svg b/graphics/icon-shaved.svg new file mode 100644 index 0000000000..0da09d8cb8 --- /dev/null +++ b/graphics/icon-shaved.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg version="1.1" id="Mullvad_VPN_Logo_BW_Android" + xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 252 252" + style="enable-background:new 0 0 252 252;" xml:space="preserve"> +<style type="text/css"> + .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#000000;} +</style> +<path class="st1" d="M35.1,81.7c10.5-2.1,28-2.5,46.6-1.1l19.3,9.5c9.5,8.4,22.4,19.3,36.8,28.4l37.1,14.4c-2.5,10.9,3.9,33.7,7.7,44.2 + c4.9,13,14,15.1,14.4,20.3c-28,36.1-101.6,41.7-134.2,1.4c-0.7-3.2,6.7-8.8,11.2-15.1c2.1-3.2,4.2-6.3,5.6-9.5 + c2.1-6-2.1-5.6-4.9-10.9c-0.4-1.1-1.1-2.1-0.4-3.2c0.7-2.1,3.9-3.5,4.6-3.2c13.7,9.1,39.6,6.3,55.4-11.9c0,0,4.9,1.1,7.4,1.8 + l-7.4-4.9l-0.4-0.4c-0.4,0.4-0.7,0.4-1.1,0.7c-32.9,24.9-54.3,14.4-54.3,14.4c-0.7-0.7-2.8-2.8-4.6-4.2 + c-22.4-15.8-38.2-36.8-45.6-50.5l-2.1-3.9l-2.5-2.1c-5.3-0.7-8.4-6-7-10.2c1.1-4.6,6.7-7.7,11.6-5.6l3.2,1.1L35.1,81.7z M192.1,98.5 + c-2.8,8.8-13,21-9.1,30.5c-1.4-0.4-32.9-10.9-41.7-15.8c-14-8.8-26.6-19.6-36.1-28.1l-0.4-0.4L72.2,69.8c-0.4-0.4-0.7-0.4-1.1-0.7 + c4.6,0.4,22.1,2.5,29.8,0.7c-1.4-4.2-1.1-9.5,1.1-14.4c3.2-7,8.8-11.6,14-11.6c1.1,0,2.1,0.4,3.2,0.7c3.2-2.8,6.7-5.3,10.9-6.7 + c22.1-8.8,54.3,7,62.7,28.4C196.6,76.8,195.6,88,192.1,98.5z M119.2,47.3c-4.9-2.1-11.2,1.8-14,9.1c-3.2,7-1.8,14.4,3.2,16.5 + c4.6,2.1,11.2-1.8,14-9.1C125.2,56.8,123.8,49.1,119.2,47.3z"/> +</svg> diff --git a/graphics/icon-square.svg b/graphics/icon-square.svg index b07b29bdb1..cdd45a71c5 100644 --- a/graphics/icon-square.svg +++ b/graphics/icon-square.svg @@ -1,80 +1,38 @@ -<?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" - height="257.37976" - width="257.37976" - xml:space="preserve" - viewBox="0 0 257.37976 257.37976" - y="0px" - x="0px" - id="Mullvad_VPN_Logo_Positive" - version="1.1"><metadata - id="metadata4044"><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="defs4042" /> -<style - id="style3920" - type="text/css"> - .st0{clip-path:url(#SVGID_1_);} - .st1{clip-path:url(#SVGID_2_);} - .st2{clip-path:url(#SVGID_3_);} - .st3{clip-path:url(#SVGID_4_);fill:none;stroke:#002C5B;stroke-width:6;stroke-miterlimit:10;} - .st4{fill-rule:evenodd;clip-rule:evenodd;fill:#192E45;} - .st5{fill-rule:evenodd;clip-rule:evenodd;fill:#D0933A;} - .st6{fill-rule:evenodd;clip-rule:evenodd;fill:#FFCC86;} - .st7{fill-rule:evenodd;clip-rule:evenodd;fill:#FDD321;} - .st8{fill:#FFFFFF;} - .st9{fill:#1D2A3A;} - .st10{fill:#192E45;} +<?xml version="1.0" encoding="utf-8"?> +<svg version="1.1" id="mullvad-vpn-logo-square" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + x="0px" y="0px" viewBox="0 0 252 252" style="enable-background:new 0 0 252 252;" xml:space="preserve"> +<style type="text/css"> + .background{fill:#192E45;} + .fur{fill-rule:evenodd;clip-rule:evenodd;fill:#D2943B;} + .nose{fill-rule:evenodd;clip-rule:evenodd;fill:#FFCD86;} + .helmet{fill-rule:evenodd;clip-rule:evenodd;fill:#FFD524;} + .lamp-light{fill:#FFFFFF;} + .lamp-ring{fill:#192E45;} </style> -<g - transform="translate(-63.339966,-71.310112)" - id="Logo"> - - <rect - y="71.310112" - x="63.339966" - height="257.37976" - width="257.37976" - id="rect4102" - style="fill:#192e45;fill-opacity:1" /> - <path - style="clip-rule:evenodd;fill:#d0933a;fill-rule:evenodd" - d="m 90.6,184.9 9.6,-13.4 c 0,0.1 -0.6,19.3 -0.6,19.3 l 2.7,-14.5 c 8,16.2 27.6,38.6 45.5,50.6 1.9,1.3 3.5,2.7 4.6,4.1 2.3,0.9 4.6,1.4 6.9,1.8 1.2,0.2 2.5,0.3 3.7,0.4 1.2,0.1 2.5,0.1 3.7,0.1 1.2,0 2.4,-0.1 3.6,-0.2 1.2,-0.1 2.4,-0.3 3.6,-0.5 1.2,-0.2 2.4,-0.4 3.5,-0.8 1.2,-0.3 2.3,-0.6 3.5,-1 1.1,-0.3 2.3,-0.8 3.4,-1.2 1.1,-0.5 2.2,-0.9 3.3,-1.5 1.1,-0.6 2.2,-1.1 3.2,-1.7 1.1,-0.5 2.1,-1.2 3.2,-1.8 1.1,-0.6 2.1,-1.3 3.2,-1.9 1.1,-0.6 2.1,-1.3 3.1,-1.9 1,-0.7 2.1,-1.3 3.1,-2 1,-0.7 2.1,-1.3 3.2,-2 l 1,-0.6 0.5,0.3 7.2,4.8 -7.3,-1.9 c -0.7,0.8 -1.4,1.6 -2.2,2.4 -0.9,0.9 -1.9,1.8 -2.8,2.7 -1,0.8 -2,1.7 -3.1,2.4 -1.1,0.8 -2.1,1.5 -3.3,2.2 -2.2,1.4 -4.6,2.6 -7.1,3.6 -1.2,0.5 -2.5,1 -3.7,1.4 -1.3,0.4 -2.5,0.8 -3.8,1.1 -1.3,0.3 -2.6,0.6 -3.9,0.8 -1.3,0.2 -2.6,0.3 -3.9,0.5 -2.6,0.1 -5.3,0.1 -7.9,-0.3 -1.3,-0.2 -2.6,-0.4 -3.9,-0.7 -1.3,-0.3 -2.5,-0.7 -3.7,-1.1 -2.1,-0.8 -4.2,-1.8 -6.1,-3 0,0 -6.9,1 -4.1,6.2 2.8,5.2 7,4.7 5,10.8 -1.4,3.3 -3.4,6.5 -5.6,9.5 -4.6,6.2 -11.8,11.7 -11.1,15 32.7,40.3 106.4,34.7 134.4,-1.3 -0.4,-5.2 -8.6,-7.7 -14.3,-20.4 1.6,0.5 4,1.2 4,1.1 0,-0.1 -6.8,-11.1 -7.1,-12.2 l 4.4,0.3 c 0,0 -5.8,-7.2 -6,-7.9 l 5.9,-0.8 c 0,0 -7.4,-8.5 -7.5,-9.2 l 7.5,1.2 -8.2,-9.9 h 3.9 l -4.6,-6.7 c -0.8,-0.3 -1.6,-0.5 -2.4,-0.7 -1,-0.3 -2,-0.6 -3,-0.9 -11.2,-3.5 -21.8,-6.7 -32,-13.1 -14.3,-8.9 -27.1,-19.8 -36.7,-28.3 l -19.3,-9.4 c -18.5,-1.4 -35.9,-0.9 -46.5,1.2 l 6.8,-11.6 -10.4,12.5 c -0.7,-0.2 -0.9,-0.6 -0.9,-0.6 l 0.7,-15.4 -3.3,13.9 c -1,-0.5 -2.2,-0.7 -3.4,-0.7 -4.6,0 -8.3,3.7 -8.3,8.3 0,4.2 3.1,7.7 7.2,8.2 l -7.1,14.4 v 0 z" - class="st5" - id="Mullvad_Fur" /> - <path - style="clip-rule:evenodd;fill:#ffcc86;fill-rule:evenodd" - d="m 102.2,154.5 c -1,-0.4 -2.2,-0.7 -3.3,-0.7 -4.6,0 -8.3,3.7 -8.3,8.3 0,4 2.9,7.4 6.7,8.2 0.1,0 0.1,0 0.2,0 2.5,-0.8 7.5,-7.5 6.7,-11.7 -0.3,-1.5 -1,-2.9 -2,-4.1 v 0 z" - class="st6" - id="Mullvad_Nose" /> - <path - style="clip-rule:evenodd;fill:#fdd321;fill-rule:evenodd" - d="m 175.1,143.8 c -1.5,-4.1 -1.1,-9.4 1,-14.4 3,-6.9 8.7,-11.5 14.1,-11.5 1.1,0 2.1,0.2 3.1,0.6 3.1,-2.8 6.7,-5.1 10.7,-6.7 22.1,-8.8 54.4,6.9 62.7,28.6 4,10.5 2.8,22 -0.6,32.5 -2.8,8.6 -13,21 -9.2,30.4 -1.5,-0.4 -33.1,-10.2 -41.9,-15.8 -14.1,-8.8 -26.8,-19.6 -36.3,-28 l -0.3,-0.3 -32.1,-15.2 c -0.4,-0.2 -0.8,-0.4 -1.1,-0.6 4.6,0 22.1,2.1 29.9,0.4" - class="st7" - id="Mullvad_Helmet" /> - <g - id="Helmet_Lamp"> - <path - style="fill:#ffffff" - id="path3961" - d="m 184.6,147.4 c -0.9,0 -1.7,-0.2 -2.3,-0.5 -1.6,-0.7 -2.8,-2 -3.6,-4 -1.4,-3.4 -1,-8.1 0.9,-12.5 2.5,-5.7 7.2,-9.7 11.5,-9.7 0.8,0 1.6,0.2 2.4,0.5 2.1,0.9 3.6,3 4.1,6 0.6,3.2 0.1,6.9 -1.5,10.4 -2.5,5.7 -7.3,9.8 -11.5,9.8 z" - class="st8" /> - <g - id="g3965"> - <path - style="fill:#1d2a3a" - id="path3963" - d="m 191,122.3 c 0.6,0 1.2,0.1 1.8,0.4 1.6,0.7 2.8,2.5 3.2,4.9 0.5,2.9 0.1,6.3 -1.4,9.5 -2.2,5.1 -6.5,8.8 -10.1,8.8 -0.6,0 -1.2,-0.1 -1.7,-0.3 v 0 0 c -1.5,-0.6 -2.3,-2 -2.7,-3.1 -1.2,-3 -0.9,-7.4 0.8,-11.4 2.3,-5.1 6.5,-8.8 10.1,-8.8 m 0,-3 c -4.8,0 -10.1,4.4 -12.9,10.7 -2.1,4.7 -2.4,9.8 -0.9,13.7 0.9,2.3 2.4,3.9 4.3,4.8 0.9,0.4 1.9,0.6 3,0.6 4.8,0 10.1,-4.4 12.8,-10.7 1.7,-3.8 2.2,-7.8 1.6,-11.3 -0.6,-3.5 -2.4,-6 -5,-7.1 -0.8,-0.5 -1.8,-0.7 -2.9,-0.7 z" - class="st9" /> +<rect id="background" y="0" class="background" width="252" height="252"/> +<g id="mole" transform="translate(26.591 37.207)"> + <g id="body" transform="translate(0 30.763)"> + <path id="fur" class="fur" d="M7.2,29.2l-7,14.1l9.4-13.1c0,0.1-0.6,18.9-0.6,18.9l2.6-14.2C18.8,48.3,34.4,69,56.2,84.4 + c1.6,1.2,3.1,2.5,4.5,4c0,0,20.9,10.6,53-13.9c0.3-0.2,0.7-0.4,1-0.6l0.5,0.3l7.1,4.7c-2.5-0.7-7.2-1.9-7.2-1.9 + C99.7,94.9,74.5,97.8,60.9,88.8c-0.6-0.4-3.9,1-4.5,2.9c-0.3,1.1-0.1,2.2,0.5,3.1c2.7,5.1,6.9,4.6,4.9,10.6 + c-1.5,3.3-3.3,6.4-5.5,9.3c-4.5,6.1-11.6,11.5-10.9,14.7c32,39.4,104,33.9,131.5-1.3c-0.4-5.1-8.4-7.5-14-20 + c1.3,0.4,2.6,0.8,3.9,1.1c0-0.1-6.7-10.9-7-12l4.3,0.3c0,0-5.7-7.1-5.9-7.7l5.8-0.8c0,0-7.3-8.3-7.4-9l7.4,1.2l-8-9.7h3.8 + l-4.5-6.6l-36.6-14.4c-14-8.7-26.5-19.4-35.9-27.6L64,13.7c-18.1-1.4-35.1-0.9-45.5,1.2l6.7-11.4l-9.7,11.6 + c-0.6-0.2-1.3-0.4-1.3-0.4L14.9,0l-3.2,13.7L7.2,29.2z"/> + <path id="nose" class="nose" d="M11.6,13.7c-4.1-1.9-8.9-0.2-10.8,3.9c-1.9,4.1-0.2,8.9,3.9,10.8c0.8,0.4,1.6,0.6,2.5,0.7 + C12.1,26.2,16.3,18.3,11.6,13.7z"/> + </g> + <g id="helmet" transform="translate(53.885)"> + <path id="helmet-2" class="helmet" d="M29.1,33.8c-1.5-4-1.1-9.2,1-14.1C33,12.9,38.6,8.4,43.9,8.4c1,0,2.1,0.2,3,0.6 + c3.1-2.8,6.6-5,10.5-6.6c21.6-8.6,53.2,6.8,61.4,27.9c3.9,10.3,2.7,21.5-0.6,31.8c-2.7,8.4-12.7,20.6-9,29.7 + c-1.5-0.4-32.2-10.8-41-15.5C54.4,67.7,42.1,57.1,32.7,49l-0.3-0.3L1.1,33.8c-0.4-0.2-0.7-0.4-1.1-0.6 + C4.3,33.4,21.5,35.5,29.1,33.8"/> + <g id="lamp" transform="translate(28.842 9.097)"> + <path id="lamp-light" class="lamp-light" d="M5.3,12.2c3-6.7,8.6-10.8,12.6-9s4.9,8.6,1.9,15.4s-8.6,10.8-12.6,9S2.4,19,5.3,12.2z"/> + <path id="lamp-ring" class="lamp-ring" d="M18.8,1.4C13.6-0.9,6.6,3.5,3.2,11.3S1.4,27.1,6.6,29.4c5.2,2.3,12.2-2.2,15.6-9.9 + S24,3.7,18.8,1.4z M19.3,18.3c-2.7,6.2-7.9,9.9-11.6,8.3C4,25,3.2,18.7,6,12.5c2.7-6.2,7.9-9.9,11.7-8.3 + C21.3,5.8,22,12.2,19.3,18.3z"/> </g> </g> - - </g> -</svg>
\ No newline at end of file +</svg> diff --git a/graphics/icon.svg b/graphics/icon.svg index 10096f2a47..9df70ac22b 100644 --- a/graphics/icon.svg +++ b/graphics/icon.svg @@ -1,43 +1,38 @@ -<svg version="1.1" id="brand" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - x="0px" y="0px" viewBox="73.7 73.7 252.6 252.6" style="enable-background:new 0 0 400 400;" xml:space="preserve"> +<?xml version="1.0" encoding="utf-8"?> +<svg version="1.1" id="logo_00000183244726354177486890000003471613280854675596_" + xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 252 252" + style="enable-background:new 0 0 252 252;" xml:space="preserve"> <style type="text/css"> - .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#192E45;} - .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#D0933A;} - .st2{fill-rule:evenodd;clip-rule:evenodd;fill:#FFCC86;} - .st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FDD321;} - .st4{fill:#FFFFFF;} - .st5{fill:#1D2A3A;} + .background{fill-rule:evenodd;clip-rule:evenodd;fill:#192E45;} + .fur{fill-rule:evenodd;clip-rule:evenodd;fill:#D2943B;} + .nose{fill-rule:evenodd;clip-rule:evenodd;fill:#FFCD86;} + .helmet{fill-rule:evenodd;clip-rule:evenodd;fill:#FFD524;} + .lamp-light{fill:#FFFFFF;} + .lamp-ring{fill:#192E45;} </style> -<g id="Logo"> - <path id="bg" class="st0" d="M73.7,200 c0,69.8,56.6,126.3,126.3,126.3 S326.3,269.8,326.3,200 S269.8,73.7,200,73.7 - S73.7,130.2,73.7,200L73.7,200L73.7,200L73.7,200z"/> - <path id="Mullvad_Fur" class="st1" d="M90.6,184.9l9.6-13.4c0,0.1-0.6,19.3-0.6,19.3l2.7-14.5c8,16.2,27.6,38.6,45.5,50.6 - c1.9,1.3,3.5,2.7,4.6,4.1c2.3,0.9,4.6,1.4,6.9,1.8c1.2,0.2,2.5,0.3,3.7,0.4c1.2,0.1,2.5,0.1,3.7,0.1c1.2,0,2.4-0.1,3.6-0.2 - c1.2-0.1,2.4-0.3,3.6-0.5c1.2-0.2,2.4-0.4,3.5-0.8c1.2-0.3,2.3-0.6,3.5-1c1.1-0.3,2.3-0.8,3.4-1.2c1.1-0.5,2.2-0.9,3.3-1.5 - c1.1-0.6,2.2-1.1,3.2-1.7c1.1-0.5,2.1-1.2,3.2-1.8c1.1-0.6,2.1-1.3,3.2-1.9c1.1-0.6,2.1-1.3,3.1-1.9c1-0.7,2.1-1.3,3.1-2 - c1-0.7,2.1-1.3,3.2-2l1-0.6l0.5,0.3l7.2,4.8l-7.3-1.9c-0.7,0.8-1.4,1.6-2.2,2.4c-0.9,0.9-1.9,1.8-2.8,2.7c-1,0.8-2,1.7-3.1,2.4 - c-1.1,0.8-2.1,1.5-3.3,2.2c-2.2,1.4-4.6,2.6-7.1,3.6c-1.2,0.5-2.5,1-3.7,1.4c-1.3,0.4-2.5,0.8-3.8,1.1c-1.3,0.3-2.6,0.6-3.9,0.8 - c-1.3,0.2-2.6,0.3-3.9,0.5c-2.6,0.1-5.3,0.1-7.9-0.3c-1.3-0.2-2.6-0.4-3.9-0.7c-1.3-0.3-2.5-0.7-3.7-1.1c-2.1-0.8-4.2-1.8-6.1-3 - c0,0-6.9,1-4.1,6.2c2.8,5.2,7,4.7,5,10.8c-1.4,3.3-3.4,6.5-5.6,9.5c-4.6,6.2-11.8,11.7-11.1,15c32.7,40.3,106.4,34.7,134.4-1.3 - c-0.4-5.2-8.6-7.7-14.3-20.4c1.6,0.5,4,1.2,4,1.1c0-0.1-6.8-11.1-7.1-12.2l4.4,0.3c0,0-5.8-7.2-6-7.9l5.9-0.8c0,0-7.4-8.5-7.5-9.2 - l7.5,1.2l-8.2-9.9h3.9l-4.6-6.7c-0.8-0.3-1.6-0.5-2.4-0.7c-1-0.3-2-0.6-3-0.9c-11.2-3.5-21.8-6.7-32-13.1 - c-14.3-8.9-27.1-19.8-36.7-28.3l-19.3-9.4c-18.5-1.4-35.9-0.9-46.5,1.2l6.8-11.6l-10.4,12.5c-0.7-0.2-0.9-0.6-0.9-0.6l0.7-15.4 - l-3.3,13.9c-1-0.5-2.2-0.7-3.4-0.7c-4.6,0-8.3,3.7-8.3,8.3c0,4.2,3.1,7.7,7.2,8.2L90.6,184.9L90.6,184.9L90.6,184.9L90.6,184.9z"/> - <path id="Mullvad_Nose" class="st2" d="M102.2,154.5c-1-0.4-2.2-0.7-3.3-0.7c-4.6,0-8.3,3.7-8.3,8.3c0,4,2.9,7.4,6.7,8.2 - c0.1,0,0.1,0,0.2,0c2.5-0.8,7.5-7.5,6.7-11.7C103.9,157.1,103.2,155.7,102.2,154.5L102.2,154.5L102.2,154.5L102.2,154.5z"/> - <path id="Mullvad_Helmet" class="st3" d="M175.1,143.8c-1.5-4.1-1.1-9.4,1-14.4c3-6.9,8.7-11.5,14.1-11.5c1.1,0,2.1,0.2,3.1,0.6 - c3.1-2.8,6.7-5.1,10.7-6.7c22.1-8.8,54.4,6.9,62.7,28.6c4,10.5,2.8,22-0.6,32.5c-2.8,8.6-13,21-9.2,30.4 - c-1.5-0.4-33.1-10.2-41.9-15.8c-14.1-8.8-26.8-19.6-36.3-28l-0.3-0.3L146.3,144c-0.4-0.2-0.8-0.4-1.1-0.6 - C149.8,143.4,167.3,145.5,175.1,143.8"/> - <g id="Helmet_Lamp"> - <path class="st4" d="M184.6,147.4c-0.9,0-1.7-0.2-2.3-0.5c-1.6-0.7-2.8-2-3.6-4c-1.4-3.4-1-8.1,0.9-12.5c2.5-5.7,7.2-9.7,11.5-9.7 - c0.8,0,1.6,0.2,2.4,0.5c2.1,0.9,3.6,3,4.1,6c0.6,3.2,0.1,6.9-1.5,10.4C193.6,143.3,188.8,147.4,184.6,147.4z"/> - <g> - <path class="st5" d="M191,122.3c0.6,0,1.2,0.1,1.8,0.4c1.6,0.7,2.8,2.5,3.2,4.9c0.5,2.9,0.1,6.3-1.4,9.5 - c-2.2,5.1-6.5,8.8-10.1,8.8c-0.6,0-1.2-0.1-1.7-0.3l0,0l0,0c-1.5-0.6-2.3-2-2.7-3.1c-1.2-3-0.9-7.4,0.8-11.4 - C183.2,126,187.4,122.3,191,122.3 M191,119.3c-4.8,0-10.1,4.4-12.9,10.7c-2.1,4.7-2.4,9.8-0.9,13.7c0.9,2.3,2.4,3.9,4.3,4.8 - c0.9,0.4,1.9,0.6,3,0.6c4.8,0,10.1-4.4,12.8-10.7c1.7-3.8,2.2-7.8,1.6-11.3c-0.6-3.5-2.4-6-5-7.1 - C193.1,119.5,192.1,119.3,191,119.3L191,119.3z"/> +<g id="mole"> + <path id="bg" class="background" d="M0,126c0,69.6,56.5,126,126,126s126-56.4,126-126S195.6,0,126,0S0,56.4,0,126L0,126L0,126L0,126z"/> + <g id="body"> + <path id="fur" class="fur" d="M23.9,96.6L16.8,111l9.6-13.4c0,0.1-0.6,19.3-0.6,19.3l2.7-14.5c7.2,13.7,23.1,34.8,45.4,50.5 + c1.7,1.2,3.9,3.3,4.6,4.1c0,0,21.3,10.8,54.1-14.2c0.3-0.2,0.7-0.4,1-0.6l0.5,0.3l7.2,4.8c-2.5-0.7-7.3-1.9-7.3-1.9 + c-15.8,18.2-41.5,21.2-55.3,12c-0.6-0.4-4,1-4.6,3c-0.4,1.1,0,2.3,0.5,3.2c2.8,5.2,7,4.7,5,10.8c-1.4,3.3-3.4,6.5-5.6,9.5 + c-4.6,6.2-11.8,11.7-11.1,15c32.6,40.2,106.1,34.6,134.1-1.3c-0.4-5.2-8.6-7.7-14.3-20.4c1.6,0.5,4,1.2,4,1.1 + c0-0.1-6.8-11.1-7.1-12.2l4.4,0.3c0,0-5.8-7.2-6-7.9l5.9-0.8c0,0-7.4-8.5-7.5-9.2l7.5,1.2l-8.2-9.9h3.9l-4.6-6.7l-37.3-14.7 + c-14.3-8.9-27-19.8-36.6-28.2l-19.3-9.4C63.3,79.4,46,79.9,35.4,82l6.8-11.6l-9.9,11.8C31.7,82,31,81.8,31,81.8l0.7-15l-3.3,14 + L23.9,96.6z"/> + <path id="nose" class="nose" d="M28.4,80.8c-4.9-2.3-10.6,1-11.6,5.5c-1.2,4.3,1.8,9.6,7.1,10.3C28.9,93.5,33.2,85.5,28.4,80.8z"/> + </g> + <g id="helmet"> + <path id="helmet" class="helmet" d="M101.2,69.9c-1.5-4.1-1.1-9.4,1-14.4c3-6.9,8.7-11.5,14.1-11.5c1.1,0,2.1,0.2,3.1,0.6 + c3.1-2.8,6.7-5.1,10.7-6.7c22-8.8,54.3,6.9,62.6,28.5c4,10.5,2.8,21.9-0.6,32.4c-2.8,8.6-13,21-9.2,30.3 + c-1.5-0.4-32.8-11-41.8-15.8c-14.1-8.8-26.7-19.6-36.2-27.9l-0.3-0.3l-32-15.2c-0.4-0.2-0.8-0.4-1.1-0.6 + C75.9,69.5,93.4,71.6,101.2,69.9"/> + <g id="lamp"> + + <ellipse id="lamp-light" transform="matrix(0.4007 -0.9162 0.9162 0.4007 12.8553 140.4693)" class="lamp-light" cx="113.8" cy="60.4" rx="13.6" ry="8.1"/> + <path id="lamp-ring" class="lamp-ring" d="M120.1,46.1c-5.3-2.3-12.4,2.2-15.9,10.1s-1.9,16.1,3.4,18.5c5.3,2.3,12.4-2.2,15.9-10.1 + S125.4,48.5,120.1,46.1z M120.6,63.4c-2.8,6.3-8.1,10.1-11.8,8.5c-3.8-1.7-4.6-8.1-1.8-14.5c2.8-6.3,8.1-10.1,11.9-8.5 + C122.6,50.6,123.4,57.1,120.6,63.4z"/> </g> </g> </g> diff --git a/graphics/macOS/icon-128.png b/graphics/macOS/icon-128.png Binary files differindex 84cc2b009d..b12c3e3a9e 100644 --- a/graphics/macOS/icon-128.png +++ b/graphics/macOS/icon-128.png diff --git a/graphics/macOS/icon-128@2x.png b/graphics/macOS/icon-128@2x.png Binary files differindex 6162e47547..3de6c126bf 100644 --- a/graphics/macOS/icon-128@2x.png +++ b/graphics/macOS/icon-128@2x.png diff --git a/graphics/macOS/icon-16.png b/graphics/macOS/icon-16.png Binary files differindex 2a4c8d8edc..018c22ae74 100644 --- a/graphics/macOS/icon-16.png +++ b/graphics/macOS/icon-16.png diff --git a/graphics/macOS/icon-16@2x.png b/graphics/macOS/icon-16@2x.png Binary files differindex 880ae61d68..25f568b706 100644 --- a/graphics/macOS/icon-16@2x.png +++ b/graphics/macOS/icon-16@2x.png diff --git a/graphics/macOS/icon-256.png b/graphics/macOS/icon-256.png Binary files differindex 5dd510c4f1..b92849415e 100644 --- a/graphics/macOS/icon-256.png +++ b/graphics/macOS/icon-256.png diff --git a/graphics/macOS/icon-256@2x.png b/graphics/macOS/icon-256@2x.png Binary files differindex c15d24b595..18b4693e3d 100644 --- a/graphics/macOS/icon-256@2x.png +++ b/graphics/macOS/icon-256@2x.png diff --git a/graphics/macOS/icon-32.png b/graphics/macOS/icon-32.png Binary files differindex 880ae61d68..f543a06c04 100644 --- a/graphics/macOS/icon-32.png +++ b/graphics/macOS/icon-32.png diff --git a/graphics/macOS/icon-32@2x.png b/graphics/macOS/icon-32@2x.png Binary files differindex bdc3d42679..e17f2d0bc0 100644 --- a/graphics/macOS/icon-32@2x.png +++ b/graphics/macOS/icon-32@2x.png diff --git a/graphics/macOS/icon-512.png b/graphics/macOS/icon-512.png Binary files differindex c15d24b595..ec49dee7a6 100644 --- a/graphics/macOS/icon-512.png +++ b/graphics/macOS/icon-512.png diff --git a/graphics/macOS/icon-512@2x.png b/graphics/macOS/icon-512@2x.png Binary files differindex 5567d784e0..8efec9077e 100644 --- a/graphics/macOS/icon-512@2x.png +++ b/graphics/macOS/icon-512@2x.png diff --git a/gui/assets/images/icon-notification.png b/gui/assets/images/icon-notification.png Binary files differindex 23e028728c..a220894700 100644 --- a/gui/assets/images/icon-notification.png +++ b/gui/assets/images/icon-notification.png diff --git a/gui/assets/images/logo-icon.svg b/gui/assets/images/logo-icon.svg index 10096f2a47..9df70ac22b 100644 --- a/gui/assets/images/logo-icon.svg +++ b/gui/assets/images/logo-icon.svg @@ -1,43 +1,38 @@ -<svg version="1.1" id="brand" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - x="0px" y="0px" viewBox="73.7 73.7 252.6 252.6" style="enable-background:new 0 0 400 400;" xml:space="preserve"> +<?xml version="1.0" encoding="utf-8"?> +<svg version="1.1" id="logo_00000183244726354177486890000003471613280854675596_" + xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 252 252" + style="enable-background:new 0 0 252 252;" xml:space="preserve"> <style type="text/css"> - .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#192E45;} - .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#D0933A;} - .st2{fill-rule:evenodd;clip-rule:evenodd;fill:#FFCC86;} - .st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FDD321;} - .st4{fill:#FFFFFF;} - .st5{fill:#1D2A3A;} + .background{fill-rule:evenodd;clip-rule:evenodd;fill:#192E45;} + .fur{fill-rule:evenodd;clip-rule:evenodd;fill:#D2943B;} + .nose{fill-rule:evenodd;clip-rule:evenodd;fill:#FFCD86;} + .helmet{fill-rule:evenodd;clip-rule:evenodd;fill:#FFD524;} + .lamp-light{fill:#FFFFFF;} + .lamp-ring{fill:#192E45;} </style> -<g id="Logo"> - <path id="bg" class="st0" d="M73.7,200 c0,69.8,56.6,126.3,126.3,126.3 S326.3,269.8,326.3,200 S269.8,73.7,200,73.7 - S73.7,130.2,73.7,200L73.7,200L73.7,200L73.7,200z"/> - <path id="Mullvad_Fur" class="st1" d="M90.6,184.9l9.6-13.4c0,0.1-0.6,19.3-0.6,19.3l2.7-14.5c8,16.2,27.6,38.6,45.5,50.6 - c1.9,1.3,3.5,2.7,4.6,4.1c2.3,0.9,4.6,1.4,6.9,1.8c1.2,0.2,2.5,0.3,3.7,0.4c1.2,0.1,2.5,0.1,3.7,0.1c1.2,0,2.4-0.1,3.6-0.2 - c1.2-0.1,2.4-0.3,3.6-0.5c1.2-0.2,2.4-0.4,3.5-0.8c1.2-0.3,2.3-0.6,3.5-1c1.1-0.3,2.3-0.8,3.4-1.2c1.1-0.5,2.2-0.9,3.3-1.5 - c1.1-0.6,2.2-1.1,3.2-1.7c1.1-0.5,2.1-1.2,3.2-1.8c1.1-0.6,2.1-1.3,3.2-1.9c1.1-0.6,2.1-1.3,3.1-1.9c1-0.7,2.1-1.3,3.1-2 - c1-0.7,2.1-1.3,3.2-2l1-0.6l0.5,0.3l7.2,4.8l-7.3-1.9c-0.7,0.8-1.4,1.6-2.2,2.4c-0.9,0.9-1.9,1.8-2.8,2.7c-1,0.8-2,1.7-3.1,2.4 - c-1.1,0.8-2.1,1.5-3.3,2.2c-2.2,1.4-4.6,2.6-7.1,3.6c-1.2,0.5-2.5,1-3.7,1.4c-1.3,0.4-2.5,0.8-3.8,1.1c-1.3,0.3-2.6,0.6-3.9,0.8 - c-1.3,0.2-2.6,0.3-3.9,0.5c-2.6,0.1-5.3,0.1-7.9-0.3c-1.3-0.2-2.6-0.4-3.9-0.7c-1.3-0.3-2.5-0.7-3.7-1.1c-2.1-0.8-4.2-1.8-6.1-3 - c0,0-6.9,1-4.1,6.2c2.8,5.2,7,4.7,5,10.8c-1.4,3.3-3.4,6.5-5.6,9.5c-4.6,6.2-11.8,11.7-11.1,15c32.7,40.3,106.4,34.7,134.4-1.3 - c-0.4-5.2-8.6-7.7-14.3-20.4c1.6,0.5,4,1.2,4,1.1c0-0.1-6.8-11.1-7.1-12.2l4.4,0.3c0,0-5.8-7.2-6-7.9l5.9-0.8c0,0-7.4-8.5-7.5-9.2 - l7.5,1.2l-8.2-9.9h3.9l-4.6-6.7c-0.8-0.3-1.6-0.5-2.4-0.7c-1-0.3-2-0.6-3-0.9c-11.2-3.5-21.8-6.7-32-13.1 - c-14.3-8.9-27.1-19.8-36.7-28.3l-19.3-9.4c-18.5-1.4-35.9-0.9-46.5,1.2l6.8-11.6l-10.4,12.5c-0.7-0.2-0.9-0.6-0.9-0.6l0.7-15.4 - l-3.3,13.9c-1-0.5-2.2-0.7-3.4-0.7c-4.6,0-8.3,3.7-8.3,8.3c0,4.2,3.1,7.7,7.2,8.2L90.6,184.9L90.6,184.9L90.6,184.9L90.6,184.9z"/> - <path id="Mullvad_Nose" class="st2" d="M102.2,154.5c-1-0.4-2.2-0.7-3.3-0.7c-4.6,0-8.3,3.7-8.3,8.3c0,4,2.9,7.4,6.7,8.2 - c0.1,0,0.1,0,0.2,0c2.5-0.8,7.5-7.5,6.7-11.7C103.9,157.1,103.2,155.7,102.2,154.5L102.2,154.5L102.2,154.5L102.2,154.5z"/> - <path id="Mullvad_Helmet" class="st3" d="M175.1,143.8c-1.5-4.1-1.1-9.4,1-14.4c3-6.9,8.7-11.5,14.1-11.5c1.1,0,2.1,0.2,3.1,0.6 - c3.1-2.8,6.7-5.1,10.7-6.7c22.1-8.8,54.4,6.9,62.7,28.6c4,10.5,2.8,22-0.6,32.5c-2.8,8.6-13,21-9.2,30.4 - c-1.5-0.4-33.1-10.2-41.9-15.8c-14.1-8.8-26.8-19.6-36.3-28l-0.3-0.3L146.3,144c-0.4-0.2-0.8-0.4-1.1-0.6 - C149.8,143.4,167.3,145.5,175.1,143.8"/> - <g id="Helmet_Lamp"> - <path class="st4" d="M184.6,147.4c-0.9,0-1.7-0.2-2.3-0.5c-1.6-0.7-2.8-2-3.6-4c-1.4-3.4-1-8.1,0.9-12.5c2.5-5.7,7.2-9.7,11.5-9.7 - c0.8,0,1.6,0.2,2.4,0.5c2.1,0.9,3.6,3,4.1,6c0.6,3.2,0.1,6.9-1.5,10.4C193.6,143.3,188.8,147.4,184.6,147.4z"/> - <g> - <path class="st5" d="M191,122.3c0.6,0,1.2,0.1,1.8,0.4c1.6,0.7,2.8,2.5,3.2,4.9c0.5,2.9,0.1,6.3-1.4,9.5 - c-2.2,5.1-6.5,8.8-10.1,8.8c-0.6,0-1.2-0.1-1.7-0.3l0,0l0,0c-1.5-0.6-2.3-2-2.7-3.1c-1.2-3-0.9-7.4,0.8-11.4 - C183.2,126,187.4,122.3,191,122.3 M191,119.3c-4.8,0-10.1,4.4-12.9,10.7c-2.1,4.7-2.4,9.8-0.9,13.7c0.9,2.3,2.4,3.9,4.3,4.8 - c0.9,0.4,1.9,0.6,3,0.6c4.8,0,10.1-4.4,12.8-10.7c1.7-3.8,2.2-7.8,1.6-11.3c-0.6-3.5-2.4-6-5-7.1 - C193.1,119.5,192.1,119.3,191,119.3L191,119.3z"/> +<g id="mole"> + <path id="bg" class="background" d="M0,126c0,69.6,56.5,126,126,126s126-56.4,126-126S195.6,0,126,0S0,56.4,0,126L0,126L0,126L0,126z"/> + <g id="body"> + <path id="fur" class="fur" d="M23.9,96.6L16.8,111l9.6-13.4c0,0.1-0.6,19.3-0.6,19.3l2.7-14.5c7.2,13.7,23.1,34.8,45.4,50.5 + c1.7,1.2,3.9,3.3,4.6,4.1c0,0,21.3,10.8,54.1-14.2c0.3-0.2,0.7-0.4,1-0.6l0.5,0.3l7.2,4.8c-2.5-0.7-7.3-1.9-7.3-1.9 + c-15.8,18.2-41.5,21.2-55.3,12c-0.6-0.4-4,1-4.6,3c-0.4,1.1,0,2.3,0.5,3.2c2.8,5.2,7,4.7,5,10.8c-1.4,3.3-3.4,6.5-5.6,9.5 + c-4.6,6.2-11.8,11.7-11.1,15c32.6,40.2,106.1,34.6,134.1-1.3c-0.4-5.2-8.6-7.7-14.3-20.4c1.6,0.5,4,1.2,4,1.1 + c0-0.1-6.8-11.1-7.1-12.2l4.4,0.3c0,0-5.8-7.2-6-7.9l5.9-0.8c0,0-7.4-8.5-7.5-9.2l7.5,1.2l-8.2-9.9h3.9l-4.6-6.7l-37.3-14.7 + c-14.3-8.9-27-19.8-36.6-28.2l-19.3-9.4C63.3,79.4,46,79.9,35.4,82l6.8-11.6l-9.9,11.8C31.7,82,31,81.8,31,81.8l0.7-15l-3.3,14 + L23.9,96.6z"/> + <path id="nose" class="nose" d="M28.4,80.8c-4.9-2.3-10.6,1-11.6,5.5c-1.2,4.3,1.8,9.6,7.1,10.3C28.9,93.5,33.2,85.5,28.4,80.8z"/> + </g> + <g id="helmet"> + <path id="helmet" class="helmet" d="M101.2,69.9c-1.5-4.1-1.1-9.4,1-14.4c3-6.9,8.7-11.5,14.1-11.5c1.1,0,2.1,0.2,3.1,0.6 + c3.1-2.8,6.7-5.1,10.7-6.7c22-8.8,54.3,6.9,62.6,28.5c4,10.5,2.8,21.9-0.6,32.4c-2.8,8.6-13,21-9.2,30.3 + c-1.5-0.4-32.8-11-41.8-15.8c-14.1-8.8-26.7-19.6-36.2-27.9l-0.3-0.3l-32-15.2c-0.4-0.2-0.8-0.4-1.1-0.6 + C75.9,69.5,93.4,71.6,101.2,69.9"/> + <g id="lamp"> + + <ellipse id="lamp-light" transform="matrix(0.4007 -0.9162 0.9162 0.4007 12.8553 140.4693)" class="lamp-light" cx="113.8" cy="60.4" rx="13.6" ry="8.1"/> + <path id="lamp-ring" class="lamp-ring" d="M120.1,46.1c-5.3-2.3-12.4,2.2-15.9,10.1s-1.9,16.1,3.4,18.5c5.3,2.3,12.4-2.2,15.9-10.1 + S125.4,48.5,120.1,46.1z M120.6,63.4c-2.8,6.3-8.1,10.1-11.8,8.5c-3.8-1.7-4.6-8.1-1.8-14.5c2.8-6.3,8.1-10.1,11.9-8.5 + C122.6,50.6,123.4,57.1,120.6,63.4z"/> </g> </g> </g> diff --git a/gui/scripts/README.md b/gui/scripts/README.md index cd9b723045..7fd98fb217 100644 --- a/gui/scripts/README.md +++ b/gui/scripts/README.md @@ -1,7 +1,9 @@ This is a folder with the supporting scripts written in Python 3, node, bash. -## Dependency installation notes +## Maps and location translations + +### Dependency installation notes 1. Install GDAL/OGR dependencies, which are required by Fiona python package. @@ -20,7 +22,7 @@ This is a folder with the supporting scripts written in Python 3, node, bash. https://www.gnu.org/software/gettext/ -## Geo data installation notes +### Geo data installation notes Go to http://www.naturalearthdata.com/downloads/50m-cultural-vectors/ and download ZIP files with the following shapes: @@ -52,7 +54,7 @@ unzip ne_50m_admin_1_states_provinces_lines.zip -d ne_50m_admin_1_states_provinc unzip ne_10m_populated_places.zip -d ne_10m_populated_places/ ``` -## Geo data extraction notes +### Geo data extraction notes Run the following script to produce a TopoJSON data used by the app: @@ -68,7 +70,7 @@ npm exec ts-node prepare-rtree.ts At this point all of the data should be saved in `gui/scripts/out` folder. -## App integration notes +### App integration notes Once you've extracted all the geo data, run the integration script that will copy all files ignoring intermediate ones into the `gui/assets/geo` folder: @@ -77,7 +79,7 @@ copy all files ignoring intermediate ones into the `gui/assets/geo` folder: python3 integrate-into-app.py ``` -## Locking Python dependencies +### Locking Python dependencies 1. Freeze dependencies: diff --git a/gui/scripts/build-logo-icons.sh b/gui/scripts/build-logo-icons.sh index 78d8652096..7002d565ee 100755 --- a/gui/scripts/build-logo-icons.sh +++ b/gui/scripts/build-logo-icons.sh @@ -1,12 +1,22 @@ #!/usr/bin/env bash -# Icon guidlines for MacOS: +# This script creates the macOS .icns from the icons in /graphics/macOS/ which need to be updated +# first if the source SVGs have been updated. More info about how to update them can be found in +# the readme. +# +# Icon guidlines for macOS: # https://developer.apple.com/design/human-interface-guidelines/macos/icons-and-images/app-icon/ # +# Icon templates for macOS: +# https://developer.apple.com/design/resources/ +# # Icon guidlines for Windows: # https://docs.microsoft.com/en-us/windows/uwp/design/style/app-icons-and-logos#target-size-app-icon-assets # https://docs.microsoft.com/en-us/windows/win32/uxguide/vis-icons +echo "Press enter to continue if you've followed the instructions in graphics/README.md" +read -r + set -eu if ! command -v convert > /dev/null; then @@ -24,6 +34,8 @@ if ! command -v iconutil > /dev/null; then exit 1 fi + + SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd "$SCRIPT_DIR" diff --git a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIcon.png b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIcon.png Binary files differindex 837fea7fef..782f4895f3 100644 --- a/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIcon.png +++ b/ios/MullvadVPN/Assets.xcassets/AppIcon.appiconset/AppIcon.png diff --git a/ios/README.md b/ios/README.md index 560c7f4cff..c1e0ab06b0 100644 --- a/ios/README.md +++ b/ios/README.md @@ -103,4 +103,15 @@ and save the output into `requirements.txt`. ``` hashin --python 3.7 --verbose --update-all -```
\ No newline at end of file +``` + +## Icons and assets + +For a general overview of icons and graphics read [the graphics readme](../graphics/README.md). + +To copy graphical assets from the desktop GUI and generate iOS assets, run: +```bash +ios/convert-assets.rb --app-icon +ios/convert-assets.rb --import-desktop-assets +ios/convert-assets.rb --additional-assets +``` |
