From de092da36a61ec1aea4058c7c461ba1dae13a94f Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 26 Nov 2014 22:25:54 -0800 Subject: added masthead, reorganized logo, added android black icons --- .gitignore | 1 + Rakefile | 13 +- icons/leap-small.png | Bin 10100 -> 0 bytes icons/leap64.png | Bin 4117 -> 0 bytes icons/logo/leap128.png | Bin 0 -> 10050 bytes icons/logo/leap256x256.png | Bin 0 -> 19989 bytes icons/logo/leap64.png | Bin 0 -> 4123 bytes print/leap.png | Bin 0 -> 92160 bytes source/android/black/vpn_connected.svg | 61 ++ source/android/black/vpn_disconnected.svg | 68 ++ source/android/black/vpn_progress.svg | 65 ++ source/common/color-wheel.svg | 184 ++++++ source/kid-jumping-bw.svg | 108 --- source/kid-jumping-silhouette-light.svg | 99 --- source/kid-jumping.svg | 757 ---------------------- source/leap/kid-jumping-bw.svg | 108 +++ source/leap/kid-jumping-silhouette-light.svg | 99 +++ source/leap/kid-jumping.svg | 681 +++++++++++++++++++ source/leap/kid-square.svg | 640 ++++++++++++++++++ source/masks/android-mask.svg | 610 +++++++++++++++++ source/masks/favicon.ico | Bin 1150 -> 1406 bytes source/masks/favicon.png | Bin 1072 -> 926 bytes source/masks/mask-favicon.svg | 270 +++----- source/web/masthead/rainbow-masthead-centered.svg | 124 ---- source/web/masthead/rainbow-masthead-large.svg | 168 +---- source/web/masthead/rainbow-masthead-medium.svg | 155 +---- source/web/masthead/rainbow-masthead-small.svg | 401 +++++------- web/22/vpn_connected.png | Bin 0 -> 393 bytes web/22/vpn_disconnected.png | Bin 0 -> 534 bytes web/22/vpn_progress.png | Bin 0 -> 465 bytes web/masthead/rainbow-masthead-large.png | Bin 35946 -> 36446 bytes web/masthead/rainbow-masthead-medium.png | Bin 23148 -> 23015 bytes web/masthead/rainbow-masthead-small.png | Bin 34286 -> 12715 bytes 33 files changed, 2835 insertions(+), 1777 deletions(-) create mode 100644 .gitignore delete mode 100644 icons/leap-small.png delete mode 100644 icons/leap64.png create mode 100644 icons/logo/leap128.png create mode 100644 icons/logo/leap256x256.png create mode 100644 icons/logo/leap64.png create mode 100644 print/leap.png create mode 100644 source/android/black/vpn_connected.svg create mode 100644 source/android/black/vpn_disconnected.svg create mode 100644 source/android/black/vpn_progress.svg create mode 100644 source/common/color-wheel.svg delete mode 100644 source/kid-jumping-bw.svg delete mode 100644 source/kid-jumping-silhouette-light.svg delete mode 100644 source/kid-jumping.svg create mode 100644 source/leap/kid-jumping-bw.svg create mode 100644 source/leap/kid-jumping-silhouette-light.svg create mode 100644 source/leap/kid-jumping.svg create mode 100644 source/leap/kid-square.svg create mode 100644 source/masks/android-mask.svg create mode 100644 web/22/vpn_connected.png create mode 100644 web/22/vpn_disconnected.png create mode 100644 web/22/vpn_progress.png diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2169409 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +draft/ diff --git a/Rakefile b/Rakefile index a1eabe3..e448e40 100644 --- a/Rakefile +++ b/Rakefile @@ -21,7 +21,9 @@ output_directories = [ 'icons/black/22', 'icons/black/32', 'icons/black/64', + 'icons/logo', 'web', + 'web/22', 'web/32', 'web/64', 'web/128', @@ -88,14 +90,15 @@ svg_to_raster = [ # icons ['source/icons/white/*.svg', white_icon_target], ['source/icons/black/*.svg', black_icon_target], - ['source/kid-jumping.svg', {:width => 128, :dest => 'icons/leap-small.png'}], - ['source/kid-jumping.svg', {:width => 64, :dest => 'icons/leap64.png'}], + ['source/leap/kid-square.svg', {:size => 256, :dest => 'icons/logo/leap256x256.png'}], + ['source/leap/kid-jumping.svg', {:width => 128, :dest => 'icons/logo/leap128.png'}], + ['source/leap/kid-jumping.svg', {:width => 64, :dest => 'icons/logo/leap64.png'}], # android ['source/android/icons/*.svg', android_icon_target], ['source/android/leap-launcher.svg', android_launcher_target], ['source/android/leap-launcher.svg', {:size => 512, :dest => 'android/leap-icon.png'}], - ['source/kid-jumping-silhouette-light.svg', android_icon_target], + ['source/leap/kid-jumping-silhouette-light.svg', android_icon_target], ['source/android/vpn_disconnected.svg', android_icon_target], ['source/android/vpn_progress.svg', android_icon_target], ['source/android/leap-debug-launcher.svg', android_launcher_target], @@ -110,16 +113,18 @@ svg_to_raster = [ ['source/masks/mask-launcher.svg', {:width => 32, :height => 26, :dest => 'mac/bitmask.tiff'}], # web - ['source/kid-jumping-bw.svg', {:size => 16, :dest => 'web/favicon.png'}], + ['source/leap/kid-jumping-bw.svg', {:size => 16, :dest => 'web/favicon.png'}], ['source/masks/mask.svg', {:width => 128, :dest => 'web/128'}], ['source/web/masthead/*.svg', {:dest => 'web/masthead'}], ['source/web/icons/*', {:size => 32, :dest => 'web/32'}], ['source/web/icons/*', {:size => 64, :dest => 'web/64'}], + ['source/android/black/*.svg', {:size => 22, :dest => 'web/22'}], # linux ['source/masks/mask-launcher.svg', linux_target], # print + ['source/leap/kid-jumping.svg', {:width => 1000, :dest => 'print/leap.png'}], ['source/letterhead/letterhead.svg', {:width => 2400, :height => 300, :dest => 'print'}] ] diff --git a/icons/leap-small.png b/icons/leap-small.png deleted file mode 100644 index bc9d4e7..0000000 Binary files a/icons/leap-small.png and /dev/null differ diff --git a/icons/leap64.png b/icons/leap64.png deleted file mode 100644 index 79c582b..0000000 Binary files a/icons/leap64.png and /dev/null differ diff --git a/icons/logo/leap128.png b/icons/logo/leap128.png new file mode 100644 index 0000000..d7f30fe Binary files /dev/null and b/icons/logo/leap128.png differ diff --git a/icons/logo/leap256x256.png b/icons/logo/leap256x256.png new file mode 100644 index 0000000..6ef664e Binary files /dev/null and b/icons/logo/leap256x256.png differ diff --git a/icons/logo/leap64.png b/icons/logo/leap64.png new file mode 100644 index 0000000..109e1b9 Binary files /dev/null and b/icons/logo/leap64.png differ diff --git a/print/leap.png b/print/leap.png new file mode 100644 index 0000000..e5558f4 Binary files /dev/null and b/print/leap.png differ diff --git a/source/android/black/vpn_connected.svg b/source/android/black/vpn_connected.svg new file mode 100644 index 0000000..21b7097 --- /dev/null +++ b/source/android/black/vpn_connected.svg @@ -0,0 +1,61 @@ + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/source/android/black/vpn_disconnected.svg b/source/android/black/vpn_disconnected.svg new file mode 100644 index 0000000..5d01ed3 --- /dev/null +++ b/source/android/black/vpn_disconnected.svg @@ -0,0 +1,68 @@ + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/source/android/black/vpn_progress.svg b/source/android/black/vpn_progress.svg new file mode 100644 index 0000000..73447cf --- /dev/null +++ b/source/android/black/vpn_progress.svg @@ -0,0 +1,65 @@ + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/source/common/color-wheel.svg b/source/common/color-wheel.svg new file mode 100644 index 0000000..743ca50 --- /dev/null +++ b/source/common/color-wheel.svg @@ -0,0 +1,184 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/kid-jumping-bw.svg b/source/kid-jumping-bw.svg deleted file mode 100644 index b0f4f9e..0000000 --- a/source/kid-jumping-bw.svg +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/source/kid-jumping-silhouette-light.svg b/source/kid-jumping-silhouette-light.svg deleted file mode 100644 index e4a0421..0000000 --- a/source/kid-jumping-silhouette-light.svg +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/source/kid-jumping.svg b/source/kid-jumping.svg deleted file mode 100644 index 7a330fd..0000000 --- a/source/kid-jumping.svg +++ /dev/null @@ -1,757 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/leap/kid-jumping-bw.svg b/source/leap/kid-jumping-bw.svg new file mode 100644 index 0000000..b0f4f9e --- /dev/null +++ b/source/leap/kid-jumping-bw.svg @@ -0,0 +1,108 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/source/leap/kid-jumping-silhouette-light.svg b/source/leap/kid-jumping-silhouette-light.svg new file mode 100644 index 0000000..e4a0421 --- /dev/null +++ b/source/leap/kid-jumping-silhouette-light.svg @@ -0,0 +1,99 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/source/leap/kid-jumping.svg b/source/leap/kid-jumping.svg new file mode 100644 index 0000000..ba827cd --- /dev/null +++ b/source/leap/kid-jumping.svg @@ -0,0 +1,681 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/leap/kid-square.svg b/source/leap/kid-square.svg new file mode 100644 index 0000000..c7b28ed --- /dev/null +++ b/source/leap/kid-square.svg @@ -0,0 +1,640 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/masks/android-mask.svg b/source/masks/android-mask.svg new file mode 100644 index 0000000..dad23aa --- /dev/null +++ b/source/masks/android-mask.svg @@ -0,0 +1,610 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/masks/favicon.ico b/source/masks/favicon.ico index 7f41dd1..c2f9e97 100644 Binary files a/source/masks/favicon.ico and b/source/masks/favicon.ico differ diff --git a/source/masks/favicon.png b/source/masks/favicon.png index 99c6fb1..6fd865e 100644 Binary files a/source/masks/favicon.png and b/source/masks/favicon.png differ diff --git a/source/masks/mask-favicon.svg b/source/masks/mask-favicon.svg index 75e42ac..e2aa9fd 100644 --- a/source/masks/mask-favicon.svg +++ b/source/masks/mask-favicon.svg @@ -14,11 +14,12 @@ height="256" id="svg3088" version="1.1" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.48.4 r9939" sodipodi:docname="mask-favicon.svg" - inkscape:export-filename="/home/elijah/dev/leap/leap_assets/svg/masks/favicon.png" + inkscape:export-filename="/home/elijah/dev/leap/leap_assets/source/masks/favicon.png" inkscape:export-xdpi="5.625" - inkscape:export-ydpi="5.625"> + inkscape:export-ydpi="5.625" + enable-background="new"> - @@ -166,18 +156,27 @@ offset="1" id="stop4024-2" /> + + + + style="opacity:0.52755906;filter:url(#filter3954)"> + clip-path="none" + transform="matrix(0.22002687,-0.97549381,0.97549381,0.22002687,153.8847,84.738036)"> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> - - + inkscape:connector-curvature="0" /> + style="display:inline"> + + transform="matrix(3.9239993,0,0,3.9239993,3.1838955,3.448418)"> - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - + @@ -243,11 +243,11 @@ id="layer1" inkscape:label="rainbow" inkscape:groupmode="layer" - transform="translate(0,126)" + transform="translate(0,136)" style="display:inline"> + transform="matrix(0.93071194,0.20844557,-0.43019585,0.45096387,-25.231042,-256.2603)"> - - - - - - - - - - - - - - - - - - - - - - - - - - + style="display:inline;opacity:1" + transform="translate(0,-56)"> + transform="matrix(3.5605206,0,0,3.5605206,777.42198,35.578315)"> + transform="translate(0,72)"> @@ -222,6 +222,10 @@ orientation="1,0" position="1500,0" id="guide3104" /> + @@ -239,10 +243,10 @@ id="layer1" inkscape:label="rainbow" inkscape:groupmode="layer" - transform="translate(0,64)"> + transform="translate(0,66)"> + transform="matrix(0.93071194,0.20844557,-0.43019585,0.45096387,0.768958,-222.2603)"> - - - - - - - - - - - - - - - - - - - - - - - - - - + transform="translate(0,-126)"> + transform="matrix(2.6485758,0,0,2.6485758,832.73172,101.55626)"> + style="display:none" + transform="translate(0,2)"> + inkscape:window-width="900" + inkscape:window-height="885" + inkscape:window-x="2674" + inkscape:window-y="154" + inkscape:window-maximized="0"> - + orientation="0,1" + position="0,40" + id="guide3083" /> @@ -239,224 +235,156 @@ id="layer1" inkscape:label="rainbow" inkscape:groupmode="layer" - transform="translate(0,32)"> - - - - - - - - - - - - - - - - - - - - - - - - + transform="translate(0,16)"> + + + + + + + + + + + + + + + + + + + + + + + + + + - - + style="display:inline" /> + + transform="translate(0,-176)"> + transform="matrix(1.6440036,0,0,1.6440036,394.65934,160.75867)"> + diff --git a/web/22/vpn_connected.png b/web/22/vpn_connected.png new file mode 100644 index 0000000..3428947 Binary files /dev/null and b/web/22/vpn_connected.png differ diff --git a/web/22/vpn_disconnected.png b/web/22/vpn_disconnected.png new file mode 100644 index 0000000..c524307 Binary files /dev/null and b/web/22/vpn_disconnected.png differ diff --git a/web/22/vpn_progress.png b/web/22/vpn_progress.png new file mode 100644 index 0000000..2a7ad45 Binary files /dev/null and b/web/22/vpn_progress.png differ diff --git a/web/masthead/rainbow-masthead-large.png b/web/masthead/rainbow-masthead-large.png index 2724cec..d3d2329 100644 Binary files a/web/masthead/rainbow-masthead-large.png and b/web/masthead/rainbow-masthead-large.png differ diff --git a/web/masthead/rainbow-masthead-medium.png b/web/masthead/rainbow-masthead-medium.png index 7c0a5f8..a863733 100644 Binary files a/web/masthead/rainbow-masthead-medium.png and b/web/masthead/rainbow-masthead-medium.png differ diff --git a/web/masthead/rainbow-masthead-small.png b/web/masthead/rainbow-masthead-small.png index 9b7f292..d412bf5 100644 Binary files a/web/masthead/rainbow-masthead-small.png and b/web/masthead/rainbow-masthead-small.png differ -- cgit v1.2.3