touch-ups to icons & layout of welcome page.

diff --git a/app/assets/images/sign-up-illustration-arm.png b/app/assets/images/sign-up-illustration-arm.png
index e33432773a5126b2220c2f8bceb6e6105d9e3e0e..50d6fb9fdfbbfc69dcd14ee2941cdef62270c8e5 100644 (file)
Binary files a/app/assets/images/sign-up-illustration-arm.png and b/app/assets/images/sign-up-illustration-arm.png differ

diff --git a/app/assets/images/sign-up-illustration.png b/app/assets/images/sign-up-illustration.png
index 8399067a232f15bc8f08cf97502db4893b2713e9..242ca14872b7c7471756aa5927bc8b22aff986b6 100644 (file)
Binary files a/app/assets/images/sign-up-illustration.png and b/app/assets/images/sign-up-illustration.png differ

diff --git a/app/assets/images/sign-up-illustration.svg b/app/assets/images/sign-up-illustration.svg
index f3f6e295ef5016325142e4e97a78271df1cf49d0..8cd6cc46ca8fa4b69f0343c76d1c18acc2fd0460 100644 (file)
--- a/app/assets/images/sign-up-illustration.svg
+++ b/app/assets/images/sign-up-illustration.svg
@@ -73,7 +73,7 @@
        inkscape:collect="always"
        id="linearGradient7775">
       <stop
        inkscape:collect="always"
        id="linearGradient7775">
       <stop

-         style="stop-color:#adadc6;stop-opacity:1;"
+         style="stop-color:#222222;stop-opacity:1"

          offset="0"
          id="stop7777" />
       <stop
          offset="0"
          id="stop7777" />
       <stop


@@ -82,14 +82,13 @@
          id="stop7779" />
     </linearGradient>
     <linearGradient
          id="stop7779" />
     </linearGradient>
     <linearGradient

-       inkscape:collect="always"

        id="linearGradient7767">
       <stop
          style="stop-color:#b2dbea;stop-opacity:1"
          offset="0"
          id="stop7769" />
       <stop
        id="linearGradient7767">
       <stop
          style="stop-color:#b2dbea;stop-opacity:1"
          offset="0"
          id="stop7769" />
       <stop

-         style="stop-color:#93b8e0;stop-opacity:1"
+         style="stop-color:#7092ff;stop-opacity:1"

          offset="1"
          id="stop7771" />
     </linearGradient>
          offset="1"
          id="stop7771" />
     </linearGradient>


@@ -183,31 +182,6 @@
        y2="802.62952"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-50,0)" />
        y2="802.62952"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-50,0)" />

-    <filter
-       inkscape:collect="always"
-       id="filter8230"
-       x="-0.11757551"
-       width="1.2351511"
-       y="-0.23515102"
-       height="1.470302"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.9797959"
-         id="feGaussianBlur8232" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7767-0">
-      <stop
-         style="stop-color:#b2dbea;stop-opacity:1"
-         offset="0"
-         id="stop7769-35" />
-      <stop
-         style="stop-color:#93b8e0;stop-opacity:1"
-         offset="1"
-         id="stop7771-9" />
-    </linearGradient>

     <filter
        color-interpolation-filters="sRGB"
        inkscape:collect="always"
     <filter
        color-interpolation-filters="sRGB"
        inkscape:collect="always"


@@ -475,7 +449,7 @@
        y2="155.43863" />
     <linearGradient
        inkscape:collect="always"
        y2="155.43863" />
     <linearGradient
        inkscape:collect="always"

-       xlink:href="#linearGradient7767-0"
+       xlink:href="#linearGradient7767"

        id="linearGradient9566"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-50,852.36218)"
        id="linearGradient9566"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-50,852.36218)"


@@ -493,6 +467,18 @@
        y1="139"
        x2="1125.7982"
        y2="99.201767" />
        y1="139"
        x2="1125.7982"
        y2="99.201767" />

+    <filter
+       inkscape:collect="always"
+       id="filter13004"
+       x="-0.15676734"
+       width="1.3135347"
+       y="-0.31353469"
+       height="1.6270694">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.3063945"
+         id="feGaussianBlur13006" />
+    </filter>

   </defs>
   <sodipodi:namedview
      id="base"
   </defs>
   <sodipodi:namedview
      id="base"


@@ -502,15 +488,15 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"

-     inkscape:cx="236.73047"
-     inkscape:cy="47.289177"
+     inkscape:cx="163.25145"
+     inkscape:cy="108.23928"

      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1524"
      inkscape:window-height="817"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1524"
      inkscape:window-height="817"

-     inkscape:window-x="220"
-     inkscape:window-y="127"
+     inkscape:window-x="414"
+     inkscape:window-y="111"

      inkscape:window-maximized="0"
      borderlayer="false"
      inkscape:showpageshadow="false"
      inkscape:window-maximized="0"
      borderlayer="false"
      inkscape:showpageshadow="false"


@@ -554,15 +540,16 @@
      id="layer1"
      transform="translate(-820,-742.36218)">
     <path
      id="layer1"
      transform="translate(-820,-742.36218)">
     <path

-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#a0afcf;fill-opacity:1;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7542-4-8-0);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#5e74ac;fill-opacity:1;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7542-4-8-0);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"

        d="m 884.625,854.79968 a 4.0004,4.0004 0 0 0 -3.84375,3.5625 4.0004,4.0004 0 0 0 -2.15625,-0.5625 4.0004,4.0004 0 0 0 -3.78125,4.90625 c 0,0 0.5454,2.1828 2.1875,5.1875 1.6421,3.0047 4.45773,7.22288 9.28125,12.4375 a 4.0025627,4.0025627 0 0 0 6.9375,-2.25 4.0025627,4.0025627 0 0 0 3.75,0.125 c 0.0733,0.22356 0.14387,0.47118 0.21875,0.6875 a 4.0025627,4.0025627 0 1 0 7.5625,-2.625 c -1.9723,-5.69775 -3.8125,-17.53125 -3.8125,-17.53125 a 4.0004,4.0004 0 0 0 -3.84375,-3.46875 4.0004,4.0004 0 0 0 -4.09375,4.65625 c 0,0 0.49861,3.30382 1.3125,7.46875 -2.08696,-2.64336 -3.45886,-4.78178 -4.3125,-6.34375 -1.2954,-2.3703 -1.375,-3.0625 -1.375,-3.0625 a 4.0004,4.0004 0 0 0 -4.03125,-3.1875 z"
        id="path8245"
        inkscape:connector-curvature="0" />
     <g
        id="g8240"
        d="m 884.625,854.79968 a 4.0004,4.0004 0 0 0 -3.84375,3.5625 4.0004,4.0004 0 0 0 -2.15625,-0.5625 4.0004,4.0004 0 0 0 -3.78125,4.90625 c 0,0 0.5454,2.1828 2.1875,5.1875 1.6421,3.0047 4.45773,7.22288 9.28125,12.4375 a 4.0025627,4.0025627 0 0 0 6.9375,-2.25 4.0025627,4.0025627 0 0 0 3.75,0.125 c 0.0733,0.22356 0.14387,0.47118 0.21875,0.6875 a 4.0025627,4.0025627 0 1 0 7.5625,-2.625 c -1.9723,-5.69775 -3.8125,-17.53125 -3.8125,-17.53125 a 4.0004,4.0004 0 0 0 -3.84375,-3.46875 4.0004,4.0004 0 0 0 -4.09375,4.65625 c 0,0 0.49861,3.30382 1.3125,7.46875 -2.08696,-2.64336 -3.45886,-4.78178 -4.3125,-6.34375 -1.2954,-2.3703 -1.375,-3.0625 -1.375,-3.0625 a 4.0004,4.0004 0 0 0 -4.03125,-3.1875 z"
        id="path8245"
        inkscape:connector-curvature="0" />
     <g
        id="g8240"

-       transform="translate(-49,2)">
+       transform="translate(-49,2)"
+       style="fill:#7693dc;fill-opacity:1">

       <path
       <path

-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#99b7da;fill-opacity:1;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7542-4-8-0);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#7693dc;fill-opacity:1;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7542-4-8-0);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"

          d="m 922.625,10.4375 a 4.0004,4.0004 0 0 0 -3.78125,4.90625 c 0,0 0.5454,2.1828 2.1875,5.1875 1.40985,2.579729 3.70701,6.049888 7.375,10.28125 0.11178,0.128944 0.19812,0.275904 0.3125,0.40625 0.11345,0.137051 0.22397,0.284764 0.34375,0.40625 0.15485,0.157057 0.25496,0.252929 0.40625,0.40625 0.28133,0.31274 0.54746,0.61719 0.84375,0.9375 a 4.0025627,4.0025627 0 0 0 0.59375,0.53125 4.0025627,4.0025627 0 0 0 0.0625,0.03125 c 5.98699,6.043061 9.08242,9.018781 11.6875,10.90625 5.06802,3.671953 10.79446,9.23077 29.46875,15.59375 18.67429,6.36298 46.9429,9.60422 85.4688,-0.71875 2.5788,-0.63185 4.8672,-2.33956 6.2187,-4.625 1.3516,-2.28544 1.7513,-8.09198 1.0625,-10.65625 -0.6888,-2.56427 -2.4352,-4.82439 -4.75,-6.125 -2.3148,-1.30061 -5.1703,-1.65166 -7.7188,-0.90625 -35.1951,9.43054 -57.91701,6.16915 -72.81245,1.09375 C 964.69831,33.01835 961.4304,31.785386 957.34375,26.875 951.9003,20.33433 948.89393,16 942.5625,16 l -8.125,0 c -2.53697,0 -4.35949,0.782327 -5.625,2 -0.27387,-0.453136 -0.57102,-0.927833 -0.78125,-1.3125 -1.2954,-2.3703 -1.375,-3.0625 -1.375,-3.0625 A 4.0004,4.0004 0 0 0 922.625,10.4375 z"
          transform="translate(-1,850.36218)"
          id="path8234"
          d="m 922.625,10.4375 a 4.0004,4.0004 0 0 0 -3.78125,4.90625 c 0,0 0.5454,2.1828 2.1875,5.1875 1.40985,2.579729 3.70701,6.049888 7.375,10.28125 0.11178,0.128944 0.19812,0.275904 0.3125,0.40625 0.11345,0.137051 0.22397,0.284764 0.34375,0.40625 0.15485,0.157057 0.25496,0.252929 0.40625,0.40625 0.28133,0.31274 0.54746,0.61719 0.84375,0.9375 a 4.0025627,4.0025627 0 0 0 0.59375,0.53125 4.0025627,4.0025627 0 0 0 0.0625,0.03125 c 5.98699,6.043061 9.08242,9.018781 11.6875,10.90625 5.06802,3.671953 10.79446,9.23077 29.46875,15.59375 18.67429,6.36298 46.9429,9.60422 85.4688,-0.71875 2.5788,-0.63185 4.8672,-2.33956 6.2187,-4.625 1.3516,-2.28544 1.7513,-8.09198 1.0625,-10.65625 -0.6888,-2.56427 -2.4352,-4.82439 -4.75,-6.125 -2.3148,-1.30061 -5.1703,-1.65166 -7.7188,-0.90625 -35.1951,9.43054 -57.91701,6.16915 -72.81245,1.09375 C 964.69831,33.01835 961.4304,31.785386 957.34375,26.875 951.9003,20.33433 948.89393,16 942.5625,16 l -8.125,0 c -2.53697,0 -4.35949,0.782327 -5.625,2 -0.27387,-0.453136 -0.57102,-0.927833 -0.78125,-1.3125 -1.2954,-2.3703 -1.375,-3.0625 -1.375,-3.0625 A 4.0004,4.0004 0 0 0 922.625,10.4375 z"
          transform="translate(-1,850.36218)"
          id="path8234"


@@ -616,7 +603,7 @@
          style="fill:url(#linearGradient9033);fill-opacity:1">101010110010101101</flowPara><flowPara
          id="flowPara8619"
          style="fill:url(#linearGradient9035);fill-opacity:1">101010111010101011</flowPara></flowRoot>    <path
          style="fill:url(#linearGradient9033);fill-opacity:1">101010110010101101</flowPara><flowPara
          id="flowPara8619"
          style="fill:url(#linearGradient9035);fill-opacity:1">101010111010101011</flowPara></flowRoot>    <path

-       style="color:#000000;fill:#adadc6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7759);enable-background:accumulate"
+       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7759);enable-background:accumulate;opacity:0.5"

        d="m 1174,-70 c -6.4317,0.0395 -12.7696,0.4728 -19,1.25 l 0,8.75 5,5 10,0 4,-15 z m 40.25,4.84375 -0.031,0.15625 7.7812,9 5,0 3,-4 0,-0.28125 c -1.2872,-0.4713 -2.5726,-0.93607 -3.875,-1.375 -0.041,-0.0138 -0.084,-0.01755 -0.125,-0.03125 -1.2576,-0.42471 -2.5104,-0.82436 -3.7812,-1.21875 -1.1271,-0.34978 -2.2683,-0.70623 -3.4063,-1.03125 -0.1871,-0.0531 -0.3752,-0.10379 -0.5625,-0.15625 -1.079,-0.30374 -2.1607,-0.59432 -3.25,-0.875 -0.2478,-0.0638 -0.5017,-0.1249 -0.75,-0.1875 z m -95,5.15625 c -39.4401,14.6674 -71.5429,44.43079 -89.25,82.28125 L 1030,35 l 15,15 0,10 5,0 5,5 0,5 -5,5 0,15 105,0 -10,-10 -20,0 -5,-5 0,-5 -40,-25 -10,0 -10,10 -10,0 0,-15 -5,-5 5,-5 0,-5 -5,0 -10,0 10,-20 15,-5 0,15 5,0 5,-5 0,-10 25,-30 5,0 40,-15 0,-10 -5,-5 -15.75,0 z m 91.75,5 6,8 7,0 -8,-8 -5,0 z m 33.5,0.84375 -2.375,4.15625 -12.125,0 -5.7812,10 5.7812,10 -10,0.3125 -4.4375,4.6875 0,5 8.6563,5 10.7812,0 8.6562,-15 6.3438,0 10,10 1.3438,5 3.6562,0 0,-10 5,5 5,0 5,-5 -10,-10 4.875,0 c -0.029,-0.0234 -0.064,-0.0392 -0.094,-0.0625 -0.3359,-0.26835 -0.6619,-0.54681 -1,-0.8125 -0.8033,-0.63134 -1.6219,-1.25882 -2.4374,-1.875 -0.2074,-0.1566 -0.417,-0.31314 -0.625,-0.46875 -0.9966,-0.74524 -1.9858,-1.46514 -3,-2.1875 -0.031,-0.0218 -0.063,-0.0408 -0.094,-0.0625 -0.1103,-0.0784 -0.2332,-0.14058 -0.3438,-0.21875 -0.9382,-0.66399 -1.8596,-1.35587 -2.8124,-2 -0.1442,-0.0974 -0.2931,-0.18434 -0.4376,-0.28125 -0.9169,-0.61558 -1.8508,-1.21555 -2.7812,-1.8125 -0.3292,-0.21107 -0.6691,-0.41628 -1,-0.625 -1.2672,-0.79993 -2.5216,-1.57877 -3.8125,-2.34375 -1.0622,-0.62947 -2.1409,-1.23835 -3.2187,-1.84375 -0.538,-0.302 -1.0834,-0.6103 -1.625,-0.90625 -0.1142,-0.0623 -0.2296,-0.12545 -0.3438,-0.1875 -0.9035,-0.49081 -1.8049,-0.9637 -2.7188,-1.4375 -1.3366,-0.69309 -2.6725,-1.3751 -4.0312,-2.03125 z M 1280,-25 l 0,5 5,5 10,0 0,10 -15,0 0,5 -20,0 0,-15 -20,0 -5,5 -10,0 -5,5 0,10 -5,0 -10,20 0,5 5,5 0,15 20,20 20,0 5,-5 10,0 10,10 0,10 3.3438,5 56.6562,0 c 0,-44.18275 -17.9207,-84.17069 -46.875,-113.125 -0.6292,-0.62919 -1.2668,-1.25631 -1.9062,-1.875 L 1280,-25 z m -75,-25 3,5 5,0 -3,-5 -5,0 z"
        transform="translate(-50,852.36218)"
        id="path7591"
        d="m 1174,-70 c -6.4317,0.0395 -12.7696,0.4728 -19,1.25 l 0,8.75 5,5 10,0 4,-15 z m 40.25,4.84375 -0.031,0.15625 7.7812,9 5,0 3,-4 0,-0.28125 c -1.2872,-0.4713 -2.5726,-0.93607 -3.875,-1.375 -0.041,-0.0138 -0.084,-0.01755 -0.125,-0.03125 -1.2576,-0.42471 -2.5104,-0.82436 -3.7812,-1.21875 -1.1271,-0.34978 -2.2683,-0.70623 -3.4063,-1.03125 -0.1871,-0.0531 -0.3752,-0.10379 -0.5625,-0.15625 -1.079,-0.30374 -2.1607,-0.59432 -3.25,-0.875 -0.2478,-0.0638 -0.5017,-0.1249 -0.75,-0.1875 z m -95,5.15625 c -39.4401,14.6674 -71.5429,44.43079 -89.25,82.28125 L 1030,35 l 15,15 0,10 5,0 5,5 0,5 -5,5 0,15 105,0 -10,-10 -20,0 -5,-5 0,-5 -40,-25 -10,0 -10,10 -10,0 0,-15 -5,-5 5,-5 0,-5 -5,0 -10,0 10,-20 15,-5 0,15 5,0 5,-5 0,-10 25,-30 5,0 40,-15 0,-10 -5,-5 -15.75,0 z m 91.75,5 6,8 7,0 -8,-8 -5,0 z m 33.5,0.84375 -2.375,4.15625 -12.125,0 -5.7812,10 5.7812,10 -10,0.3125 -4.4375,4.6875 0,5 8.6563,5 10.7812,0 8.6562,-15 6.3438,0 10,10 1.3438,5 3.6562,0 0,-10 5,5 5,0 5,-5 -10,-10 4.875,0 c -0.029,-0.0234 -0.064,-0.0392 -0.094,-0.0625 -0.3359,-0.26835 -0.6619,-0.54681 -1,-0.8125 -0.8033,-0.63134 -1.6219,-1.25882 -2.4374,-1.875 -0.2074,-0.1566 -0.417,-0.31314 -0.625,-0.46875 -0.9966,-0.74524 -1.9858,-1.46514 -3,-2.1875 -0.031,-0.0218 -0.063,-0.0408 -0.094,-0.0625 -0.1103,-0.0784 -0.2332,-0.14058 -0.3438,-0.21875 -0.9382,-0.66399 -1.8596,-1.35587 -2.8124,-2 -0.1442,-0.0974 -0.2931,-0.18434 -0.4376,-0.28125 -0.9169,-0.61558 -1.8508,-1.21555 -2.7812,-1.8125 -0.3292,-0.21107 -0.6691,-0.41628 -1,-0.625 -1.2672,-0.79993 -2.5216,-1.57877 -3.8125,-2.34375 -1.0622,-0.62947 -2.1409,-1.23835 -3.2187,-1.84375 -0.538,-0.302 -1.0834,-0.6103 -1.625,-0.90625 -0.1142,-0.0623 -0.2296,-0.12545 -0.3438,-0.1875 -0.9035,-0.49081 -1.8049,-0.9637 -2.7188,-1.4375 -1.3366,-0.69309 -2.6725,-1.3751 -4.0312,-2.03125 z M 1280,-25 l 0,5 5,5 10,0 0,10 -15,0 0,5 -20,0 0,-15 -20,0 -5,5 -10,0 -5,5 0,10 -5,0 -10,20 0,5 5,5 0,15 20,20 20,0 5,-5 10,0 10,10 0,10 3.3438,5 56.6562,0 c 0,-44.18275 -17.9207,-84.17069 -46.875,-113.125 -0.6292,-0.62919 -1.2668,-1.25631 -1.9062,-1.875 L 1280,-25 z m -75,-25 3,5 5,0 -3,-5 -5,0 z"
        transform="translate(-50,852.36218)"
        id="path7591"


@@ -636,7 +623,7 @@
     <path
        id="path7695"
        d="m 1244.5,798.23718 -2.375,4.125 -9.5938,0 c 1.6022,11.28663 1.0712,23.08107 -0.9687,35 l 3.4375,0 8.6562,-15 6.3438,0 10,8 1.3438,5 3.6562,0 0,-8 5,3 5,2 5,0 5,5 10,0 0,10 -15,0 0,5 -10,0 -10,-10 -20,0 -5,0 -4.375,0 c -3.929,19.09563 -11.5854,38.31192 -20.625,55.9375 l 0,4.0625 20,20 20,0 5,-5 10,0 10,10 0,10 3.3438,5 51.6562,0 5,0 c 0,-51.43766 -24.2837,-97.1986 -62,-126.46875 -0.1548,-0.11296 -0.322,-0.23072 -0.4688,-0.34375 -0.018,-0.014 -0.044,-0.0172 -0.062,-0.0312 -0.7174,-0.55233 -1.4292,-1.11612 -2.1563,-1.65625 -0.053,-0.0397 -0.1026,-0.0854 -0.1563,-0.125 -0.06,-0.0444 -0.1299,-0.0771 -0.1874,-0.125 -0.023,-0.0187 -0.043,-0.0403 -0.063,-0.0625 -0.023,-0.0174 -0.039,-0.0451 -0.062,-0.0625 -0.7324,-0.5397 -1.4775,-1.07211 -2.2188,-1.59375 -0.019,-0.0133 -0.044,-0.0179 -0.062,-0.0312 -0.7603,-0.5345 -1.5107,-1.06633 -2.2813,-1.59375 -0.8253,-0.56504 -1.6633,-1.10637 -2.5,-1.65625 -1.673,-1.09976 -3.3777,-2.18082 -5.0937,-3.21875 -0.858,-0.51897 -1.7254,-1.02804 -2.5937,-1.53125 -0.8686,-0.50321 -1.744,-1.0092 -2.625,-1.5 -0.8811,-0.49079 -1.7676,-0.96639 -2.6563,-1.4375 -0.8887,-0.47111 -1.7576,-0.92024 -2.6563,-1.375 -0.8777,-0.44428 -1.7692,-0.884 -2.6562,-1.3125 z"
     <path
        id="path7695"
        d="m 1244.5,798.23718 -2.375,4.125 -9.5938,0 c 1.6022,11.28663 1.0712,23.08107 -0.9687,35 l 3.4375,0 8.6562,-15 6.3438,0 10,8 1.3438,5 3.6562,0 0,-8 5,3 5,2 5,0 5,5 10,0 0,10 -15,0 0,5 -10,0 -10,-10 -20,0 -5,0 -4.375,0 c -3.929,19.09563 -11.5854,38.31192 -20.625,55.9375 l 0,4.0625 20,20 20,0 5,-5 10,0 10,10 0,10 3.3438,5 51.6562,0 5,0 c 0,-51.43766 -24.2837,-97.1986 -62,-126.46875 -0.1548,-0.11296 -0.322,-0.23072 -0.4688,-0.34375 -0.018,-0.014 -0.044,-0.0172 -0.062,-0.0312 -0.7174,-0.55233 -1.4292,-1.11612 -2.1563,-1.65625 -0.053,-0.0397 -0.1026,-0.0854 -0.1563,-0.125 -0.06,-0.0444 -0.1299,-0.0771 -0.1874,-0.125 -0.023,-0.0187 -0.043,-0.0403 -0.063,-0.0625 -0.023,-0.0174 -0.039,-0.0451 -0.062,-0.0625 -0.7324,-0.5397 -1.4775,-1.07211 -2.2188,-1.59375 -0.019,-0.0133 -0.044,-0.0179 -0.062,-0.0312 -0.7603,-0.5345 -1.5107,-1.06633 -2.2813,-1.59375 -0.8253,-0.56504 -1.6633,-1.10637 -2.5,-1.65625 -1.673,-1.09976 -3.3777,-2.18082 -5.0937,-3.21875 -0.858,-0.51897 -1.7254,-1.02804 -2.5937,-1.53125 -0.8686,-0.50321 -1.744,-1.0092 -2.625,-1.5 -0.8811,-0.49079 -1.7676,-0.96639 -2.6563,-1.4375 -0.8887,-0.47111 -1.7576,-0.92024 -2.6563,-1.375 -0.8777,-0.44428 -1.7692,-0.884 -2.6562,-1.3125 z"

-       style="color:#000000;fill:#9090b2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7763);enable-background:accumulate"
+       style="opacity:0.5;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7763);enable-background:accumulate"

        inkscape:connector-curvature="0"
        clip-path="url(#clipPath7755)"
        transform="translate(-50,0)" />
        inkscape:connector-curvature="0"
        clip-path="url(#clipPath7755)"
        transform="translate(-50,0)" />


@@ -665,10 +652,10 @@
        inkscape:connector-curvature="0"
        d="m 895.26569,833.36219 c -4.1421,0 -7.5,3.35787 -7.5,7.5 0,4.14215 7.5,10.5 7.5,10.5 0,0 7.5,-6.35785 7.5,-10.5 0,-4.14213 -3.3579,-7.5 -7.5,-7.5 z m 0.2343,4.5 c 1.6569,0 3,1.34315 3,3 0,1.65686 -1.3431,3 -3,3 -1.65675,0 -3,-1.34314 -3,-3 0,-1.65685 1.34325,-3 3,-3 z"
        id="path8139-4-6-3-6"
        inkscape:connector-curvature="0"
        d="m 895.26569,833.36219 c -4.1421,0 -7.5,3.35787 -7.5,7.5 0,4.14215 7.5,10.5 7.5,10.5 0,0 7.5,-6.35785 7.5,-10.5 0,-4.14213 -3.3579,-7.5 -7.5,-7.5 z m 0.2343,4.5 c 1.6569,0 3,1.34315 3,3 0,1.65686 -1.3431,3 -3,3 -1.65675,0 -3,-1.34314 -3,-3 0,-1.65685 1.34325,-3 3,-3 z"
        id="path8139-4-6-3-6"

-       style="color:#000000;fill:#8282a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />

     <path
        sodipodi:type="arc"
     <path
        sodipodi:type="arc"

-       style="color:#000000;fill:#9aa1c0;fill-opacity:0.39215686;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8230);enable-background:accumulate"
+       style="color:#000000;fill:#3f4767;fill-opacity:0.39215686999999999;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter13004)"

        id="path8216"
        sodipodi:cx="945"
        sodipodi:cy="25"
        id="path8216"
        sodipodi:cx="945"
        sodipodi:cy="25"


@@ -680,15 +667,15 @@
        inkscape:connector-curvature="0"
        d="m 903.24999,851.86219 c -2.07107,0 -3.75,1.67891 -3.75,3.75001 0,0.37775 0.0679,0.73424 0.17187,1.07809 l -9.34375,9.34376 c -0.34388,-0.1039 -0.70033,-0.17186 -1.07812,-0.17186 -2.07107,0 -3.74999,1.6789 -3.74999,3.75 0,2.07104 1.67892,3.75 3.74999,3.75 2.07107,0 3.75,-1.67896 3.75,-3.75 0,-0.3778 -0.068,-0.73425 -0.17188,-1.07815 l 9.34375,-9.34375 c 0.34388,0.10395 0.70034,0.1719 1.07813,0.1719 2.07106,0 3.75,-1.67895 3.75,-3.74999 0,-2.0711 -1.67894,-3.75001 -3.75,-3.75001 z m 0,2.25001 c 0.82842,0 1.5,0.67155 1.5,1.5 0,0.8284 -0.67158,1.5 -1.5,1.5 -0.82843,0 -1.5,-0.6716 -1.5,-1.5 0,-0.82845 0.67157,-1.5 1.5,-1.5 z m -14,13.99999 c 0.82843,0 1.5,0.67155 1.5,1.5 0,0.8284 -0.67157,1.5 -1.5,1.5 -0.82842,0 -1.5,-0.6716 -1.5,-1.5 0,-0.82845 0.67158,-1.5 1.5,-1.5 z"
        id="path5387-6-5-6"
        inkscape:connector-curvature="0"
        d="m 903.24999,851.86219 c -2.07107,0 -3.75,1.67891 -3.75,3.75001 0,0.37775 0.0679,0.73424 0.17187,1.07809 l -9.34375,9.34376 c -0.34388,-0.1039 -0.70033,-0.17186 -1.07812,-0.17186 -2.07107,0 -3.74999,1.6789 -3.74999,3.75 0,2.07104 1.67892,3.75 3.74999,3.75 2.07107,0 3.75,-1.67896 3.75,-3.75 0,-0.3778 -0.068,-0.73425 -0.17188,-1.07815 l 9.34375,-9.34375 c 0.34388,0.10395 0.70034,0.1719 1.07813,0.1719 2.07106,0 3.75,-1.67895 3.75,-3.74999 0,-2.0711 -1.67894,-3.75001 -3.75,-3.75001 z m 0,2.25001 c 0.82842,0 1.5,0.67155 1.5,1.5 0,0.8284 -0.67158,1.5 -1.5,1.5 -0.82843,0 -1.5,-0.6716 -1.5,-1.5 0,-0.82845 0.67157,-1.5 1.5,-1.5 z m -14,13.99999 c 0.82843,0 1.5,0.67155 1.5,1.5 0,0.8284 -0.67157,1.5 -1.5,1.5 -0.82842,0 -1.5,-0.6716 -1.5,-1.5 0,-0.82845 0.67158,-1.5 1.5,-1.5 z"
        id="path5387-6-5-6"

-       style="color:#000000;fill:#8282a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />

     <path
        inkscape:connector-curvature="0"
        d="m 865.40433,849.14391 c -1.7936,1.03555 -2.40813,3.32901 -1.3726,5.12261 0.71815,1.24387 2.04645,1.91607 3.3883,1.8687 l 3.43751,5.95394 c -0.71196,1.13839 -0.79395,2.62483 -0.0758,3.8687 1.03552,1.79358 3.32899,2.40813 5.12259,1.37259 1.24386,-0.71814 1.91607,-2.04646 1.86871,-3.3883 l 5.95391,-3.43749 c 1.1384,0.71193 2.62484,0.79394 3.86871,0.0758 1.7936,-1.03553 2.40812,-3.329 1.37259,-5.12259 -0.71815,-1.24387 -2.04643,-1.91608 -3.38828,-1.86871 l -3.4375,-5.95392 c 0.71195,-1.1384 0.79393,-2.62484 0.0758,-3.86871 -1.03554,-1.7936 -3.32899,-2.40813 -5.12259,-1.3726 -1.25899,0.72688 -1.92459,2.07817 -1.85879,3.43672 l -0.10461,0.006 -5.8592,3.38282 c -1.13839,-0.71195 -2.62484,-0.79395 -3.8687,-0.0758 z m 1.125,1.94857 c 0.71744,-0.41421 1.63482,-0.1684 2.04904,0.54904 0.4142,0.71743 0.1684,1.63482 -0.54904,2.04904 -0.71744,0.41421 -1.63482,0.16839 -2.04904,-0.54905 -0.41422,-0.71744 -0.16841,-1.63482 0.54904,-2.04903 z m 11.69133,-6.75 c 0.71745,-0.41422 1.63483,-0.16841 2.04904,0.54904 0.41421,0.71744 0.1684,1.63482 -0.54904,2.04904 -0.71743,0.4142 -1.63482,0.16839 -2.04904,-0.54904 -0.41421,-0.71744 -0.16839,-1.63483 0.54904,-2.04904 z m -7.19762,7.90833 5.95392,-3.4375 c 0.63528,0.3973 1.38559,0.59835 2.13442,0.57191 l 3.4375,5.95393 c -0.39733,0.63527 -0.59837,1.38558 -0.57192,2.13442 l -5.95392,3.43749 c -0.6353,-0.39733 -1.3856,-0.59836 -2.13441,-0.57191 l -3.43751,-5.95393 c 0.39731,-0.63529 0.59835,-1.38559 0.57192,-2.13441 z m 2.25629,10.53301 c 0.71744,-0.41421 1.63481,-0.16842 2.04904,0.54904 0.4142,0.71741 0.16839,1.63481 -0.54904,2.04902 -0.71744,0.41422 -1.63484,0.16839 -2.04904,-0.54903 -0.41423,-0.71745 -0.1684,-1.63482 0.54904,-2.04903 z m 11.69133,-6.75 c 0.71744,-0.41421 1.63482,-0.16842 2.04904,0.54904 0.4142,0.71741 0.1684,1.63482 -0.54904,2.04903 -0.71744,0.41421 -1.63483,0.16838 -2.04904,-0.54903 -0.41422,-0.71746 -0.16839,-1.63483 0.54904,-2.04904 z"
        id="path5288-4-8-0-3"
     <path
        inkscape:connector-curvature="0"
        d="m 865.40433,849.14391 c -1.7936,1.03555 -2.40813,3.32901 -1.3726,5.12261 0.71815,1.24387 2.04645,1.91607 3.3883,1.8687 l 3.43751,5.95394 c -0.71196,1.13839 -0.79395,2.62483 -0.0758,3.8687 1.03552,1.79358 3.32899,2.40813 5.12259,1.37259 1.24386,-0.71814 1.91607,-2.04646 1.86871,-3.3883 l 5.95391,-3.43749 c 1.1384,0.71193 2.62484,0.79394 3.86871,0.0758 1.7936,-1.03553 2.40812,-3.329 1.37259,-5.12259 -0.71815,-1.24387 -2.04643,-1.91608 -3.38828,-1.86871 l -3.4375,-5.95392 c 0.71195,-1.1384 0.79393,-2.62484 0.0758,-3.86871 -1.03554,-1.7936 -3.32899,-2.40813 -5.12259,-1.3726 -1.25899,0.72688 -1.92459,2.07817 -1.85879,3.43672 l -0.10461,0.006 -5.8592,3.38282 c -1.13839,-0.71195 -2.62484,-0.79395 -3.8687,-0.0758 z m 1.125,1.94857 c 0.71744,-0.41421 1.63482,-0.1684 2.04904,0.54904 0.4142,0.71743 0.1684,1.63482 -0.54904,2.04904 -0.71744,0.41421 -1.63482,0.16839 -2.04904,-0.54905 -0.41422,-0.71744 -0.16841,-1.63482 0.54904,-2.04903 z m 11.69133,-6.75 c 0.71745,-0.41422 1.63483,-0.16841 2.04904,0.54904 0.41421,0.71744 0.1684,1.63482 -0.54904,2.04904 -0.71743,0.4142 -1.63482,0.16839 -2.04904,-0.54904 -0.41421,-0.71744 -0.16839,-1.63483 0.54904,-2.04904 z m -7.19762,7.90833 5.95392,-3.4375 c 0.63528,0.3973 1.38559,0.59835 2.13442,0.57191 l 3.4375,5.95393 c -0.39733,0.63527 -0.59837,1.38558 -0.57192,2.13442 l -5.95392,3.43749 c -0.6353,-0.39733 -1.3856,-0.59836 -2.13441,-0.57191 l -3.43751,-5.95393 c 0.39731,-0.63529 0.59835,-1.38559 0.57192,-2.13441 z m 2.25629,10.53301 c 0.71744,-0.41421 1.63481,-0.16842 2.04904,0.54904 0.4142,0.71741 0.16839,1.63481 -0.54904,2.04902 -0.71744,0.41422 -1.63484,0.16839 -2.04904,-0.54903 -0.41423,-0.71745 -0.1684,-1.63482 0.54904,-2.04903 z m 11.69133,-6.75 c 0.71744,-0.41421 1.63482,-0.16842 2.04904,0.54904 0.4142,0.71741 0.1684,1.63482 -0.54904,2.04903 -0.71744,0.41421 -1.63483,0.16838 -2.04904,-0.54903 -0.41422,-0.71746 -0.16839,-1.63483 0.54904,-2.04904 z"
        id="path5288-4-8-0-3"

-       style="color:#000000;fill:#8282a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />

     <path
        sodipodi:type="arc"
     <path
        sodipodi:type="arc"

-       style="color:#000000;fill:#8282a9;fill-opacity:1;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"

        id="path8131"
        sodipodi:cx="1302.5"
        sodipodi:cy="17.5"
        id="path8131"
        sodipodi:cx="1302.5"
        sodipodi:cy="17.5"


@@ -698,7 +685,7 @@
        transform="matrix(2,0,0,2,-1521,832.36218)" />
     <path
        sodipodi:type="arc"
        transform="matrix(2,0,0,2,-1521,832.36218)" />
     <path
        sodipodi:type="arc"

-       style="color:#000000;fill:#8282a9;fill-opacity:1;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"

        id="path8157"
        sodipodi:cx="1302.5"
        sodipodi:cy="17.5"
        id="path8157"
        sodipodi:cx="1302.5"
        sodipodi:cy="17.5"


@@ -707,7 +694,7 @@
        d="m 1305,17.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z"
        transform="matrix(2,0,0,2,-1547,832.36218)" />
     <path
        d="m 1305,17.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z"
        transform="matrix(2,0,0,2,-1547,832.36218)" />
     <path

-       style="color:#000000;fill:#a6a6c2;fill-opacity:1;stroke:#8282a9;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:none;fill-opacity:1;stroke:#222222;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"

        d="m 1062,882.36218 c 0,0 3,2 8,2 5,0 8,-2 8,-2"
        id="path8488"
        inkscape:connector-curvature="0"
        d="m 1062,882.36218 c 0,0 3,2 8,2 5,0 8,-2 8,-2"
        id="path8488"
        inkscape:connector-curvature="0"


@@ -737,7 +724,8 @@
        id="g9572"
        inkscape:export-filename="/Users/saman/work_repos/openstreetmap-website/app/assets/images/sign-up-illustration-arm.png"
        inkscape:export-xdpi="90"
        id="g9572"
        inkscape:export-filename="/Users/saman/work_repos/openstreetmap-website/app/assets/images/sign-up-illustration-arm.png"
        inkscape:export-xdpi="90"

-       inkscape:export-ydpi="90">
+       inkscape:export-ydpi="90"
+       transform="translate(0,170)">

       <g
          id="g9543">
         <path
       <g
          id="g9543">
         <path

diff --git a/app/assets/images/welcome-sprite.png b/app/assets/images/welcome-sprite.png
index 74e6074b9cc9cb90fc32d2e56582849fde3dcf6e..5a65496da13cc6dc8b52d77d1315afe3c3eda888 100644 (file)
Binary files a/app/assets/images/welcome-sprite.png and b/app/assets/images/welcome-sprite.png differ

diff --git a/app/assets/images/welcome-sprite.svg b/app/assets/images/welcome-sprite.svg
index ad08b6ecd1f64181bb7d2ee0a29839878be71dc1..3e134c4e461f5b267230f7c01ab5278c695283a3 100644 (file)
--- a/app/assets/images/welcome-sprite.svg
+++ b/app/assets/images/welcome-sprite.svg
@@ -28,8 +28,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"

-     inkscape:cx="338.53242"
-     inkscape:cy="465.50598"
+     inkscape:cx="445.30552"
+     inkscape:cy="408.06523"

      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"


@@ -38,8 +38,12 @@
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="0"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="0"

-     showguides="true"
-     inkscape:guide-bbox="true">
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true">

     <inkscape:grid
        type="xygrid"
        id="grid2985"
     <inkscape:grid
        type="xygrid"
        id="grid2985"


@@ -75,6 +79,10 @@
        orientation="1,0"
        position="700,500"
        id="guide11985" />
        orientation="1,0"
        position="700,500"
        id="guide11985" />

+    <sodipodi:guide
+       orientation="-0.79335322,-0.60876159"
+       position="575.00001,439.99998"
+       id="guide12971" />

   </sodipodi:namedview>
   <metadata
      id="metadata7">
   </sodipodi:namedview>
   <metadata
      id="metadata7">


@@ -95,59 +103,33 @@
      transform="translate(0,-552.36218)">
     <path
        sodipodi:type="arc"
      transform="translate(0,-552.36218)">
     <path
        sodipodi:type="arc"

-       style="color:#000000;fill:#70cd8f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#70cd8f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"

        id="path2987"
        sodipodi:cx="42.5"
        sodipodi:cy="42.5"
        sodipodi:rx="42.5"
        sodipodi:ry="42.5"
        id="path2987"
        sodipodi:cx="42.5"
        sodipodi:cy="42.5"
        sodipodi:rx="42.5"
        sodipodi:ry="42.5"

-       d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 z"
-       transform="matrix(1.1764706,0,0,1.1764706,-4.9999999e-7,552.36218)" />
+       d="m 85,42.5 a 42.5,42.5 0 1 1 -85,0 42.5,42.5 0 1 1 85,0 z"
+       transform="matrix(1.0588235,0,0,1.0588235,5,557.36218)" />

     <g
        id="g11955"
     <g
        id="g11955"

-       transform="translate(0,-3)">
-      <rect
-         transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
-         y="401.12442"
-         x="441.29584"
-         height="11.764706"
-         width="35.294117"
-         id="rect3759"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
-         y="365.83029"
-         x="464.82526"
-         height="47.058823"
-         width="11.764706"
-         id="rect3761"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
+       transform="translate(0,-3)" />

     <path
        sodipodi:type="arc"
     <path
        sodipodi:type="arc"

-       style="color:#000000;fill:#cd7070;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#cd7070;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"

        id="path2987-7"
        sodipodi:cx="42.5"
        sodipodi:cy="42.5"
        sodipodi:rx="42.5"
        sodipodi:ry="42.5"
        id="path2987-7"
        sodipodi:cx="42.5"
        sodipodi:cy="42.5"
        sodipodi:rx="42.5"
        sodipodi:ry="42.5"

-       d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 z"
-       transform="matrix(1.1764706,0,0,1.1764706,100,552.36218)" />
+       d="m 85,42.5 a 42.5,42.5 0 1 1 -85,0 42.5,42.5 0 1 1 85,0 z"
+       transform="matrix(1.0588235,0,0,1.0588235,105,557.36218)" />

     <path
        style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
     <path
        style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"

-       d="m 137.90441,580.85483 -8.30882,8.30882 12.68382,12.68382 L 130,614.12689 l 8.30882,8.30882 12.27942,-12.27941 12.27941,12.27941 8.30882,-8.30882 -12.27941,-12.27942 12.68382,-12.68382 -8.30882,-8.30882 -12.68382,12.68382 -12.68383,-12.68382 z"
+       d="m 135,582.36218 -2,0 -3,3 0,2 15,15 -15,15 0,2 3,3 2,0 15,-15 15,15 2,0 3,-3 0,-2 -15,-15 15,-15 0,-2 -3,-3 -2,0 -15,15 z"

        id="rect3761-9"
        id="rect3761-9"

-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#8282a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.94444447;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2987-7-7"
-       sodipodi:cx="42.5"
-       sodipodi:cy="42.5"
-       sodipodi:rx="42.5"
-       sodipodi:ry="42.5"
-       d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 z"
-       transform="matrix(1.0588235,0,0,1.0588235,205,557.36218)" />
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccccccccccc" />

     <path
        sodipodi:type="arc"
        style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
     <path
        sodipodi:type="arc"
        style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"


@@ -159,159 +141,25 @@
        d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 z"
        transform="matrix(0.3529412,0,0,0.3529412,235,587.36218)" />
     <path
        d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 z"
        transform="matrix(0.3529412,0,0,0.3529412,235,587.36218)" />
     <path

-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99999994000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-opacity:1"
-       d="m 317,18 35,18 -20,34 50,10"
-       id="path3897"
-       inkscape:connector-curvature="0"
-       transform="translate(0,552.36218)" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3834"
-       width="100"
-       height="100"
-       x="300"
-       y="552.36218" />
-    <path
-       transform="translate(0,552.36218)"
+       transform="matrix(0.79335334,-0.60876143,0.60876143,0.79335334,0,0)"
+       style="opacity:0.5;color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.05882347;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 57.472735,778.84685 25,0 1.84592,64.02114 -25,0 z"
+       id="rect4144"

        inkscape:connector-curvature="0"
        inkscape:connector-curvature="0"

-       id="path3899"
-       d="m 317,18 35,18 -20,34 50,10"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#8282a9;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;opacity:0.50000000000000000" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#8282a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2987-7-7-15"
-       sodipodi:cx="42.5"
-       sodipodi:cy="42.5"
-       sodipodi:rx="42.5"
-       sodipodi:ry="42.5"
-       d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 z"
-       transform="matrix(0.29411765,0,0,0.29411765,305,557.36218)" />
+       sodipodi:nodetypes="ccccc" />

     <path
     <path

-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2987-7-7-1-2"
-       sodipodi:cx="42.5"
-       sodipodi:cy="42.5"
-       sodipodi:rx="42.5"
-       sodipodi:ry="42.5"
-       d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 z"
-       transform="matrix(0.09803922,0,0,0.09803922,313.33333,565.69551)" />
-    <g
-       id="g3845"
-       transform="translate(15,22.5)">
-      <path
-         transform="matrix(0.29411765,0,0,0.29411765,355,597.36218)"
-         d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 z"
-         sodipodi:ry="42.5"
-         sodipodi:rx="42.5"
-         sodipodi:cy="42.5"
-         sodipodi:cx="42.5"
-         id="path2987-7-7-15-5"
-         style="color:#000000;fill:#8282a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.09803922,0,0,0.09803922,363.33333,605.69551)"
-         d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 z"
-         sodipodi:ry="42.5"
-         sodipodi:rx="42.5"
-         sodipodi:cy="42.5"
-         sodipodi:cx="42.5"
-         id="path2987-7-7-1-2-6"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-    </g>
-    <g
-       id="g3845-2"
-       transform="translate(-35,12.5)"
-       style="fill:#8282a9;fill-opacity:1">
-      <path
-         transform="matrix(0.29411765,0,0,0.29411765,355,597.36218)"
-         d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 z"
-         sodipodi:ry="42.5"
-         sodipodi:rx="42.5"
-         sodipodi:cy="42.5"
-         sodipodi:cx="42.5"
-         id="path2987-7-7-15-5-1"
-         style="color:#000000;fill:#8282a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.09803922,0,0,0.09803922,363.33333,605.69551)"
-         d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 z"
-         sodipodi:ry="42.5"
-         sodipodi:rx="42.5"
-         sodipodi:cy="42.5"
-         sodipodi:cx="42.5"
-         id="path2987-7-7-1-2-6-9"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-    </g>
-    <g
-       id="g3845-2-2"
-       transform="translate(-15,-22.5)">
-      <path
-         transform="matrix(0.29411765,0,0,0.29411765,355,597.36218)"
-         d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 z"
-         sodipodi:ry="42.5"
-         sodipodi:rx="42.5"
-         sodipodi:cy="42.5"
-         sodipodi:cx="42.5"
-         id="path2987-7-7-15-5-1-4"
-         style="color:#000000;fill:#8282a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.09803922,0,0,0.09803922,363.33333,605.69551)"
-         d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 z"
-         sodipodi:ry="42.5"
-         sodipodi:rx="42.5"
-         sodipodi:cy="42.5"
-         sodipodi:cx="42.5"
-         id="path2987-7-7-1-2-6-9-5"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-    </g>
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3834-6"
-       width="100"
-       height="100"
-       x="400"
-       y="552.36218" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3834-6-3"
-       width="100"
-       height="100"
-       x="500"
-       y="552.36218" />
-    <rect
-       style="color:#000000;fill:#8282a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.05882347000000010;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.50000000000000000"
-       id="rect4144"
-       width="25"
-       height="49.999996"
-       x="58.395695"
-       y="785.85742"
-       transform="matrix(0.79335334,-0.60876143,0.60876143,0.79335334,0,0)" />
-    <rect
-       style="color:#000000;fill:#8282a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       transform="matrix(0.79335334,-0.60876143,0.60876143,0.79335334,0,0)"
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 57.472735,763.84685 25,0 0,10 -25,0 z"

        id="rect4174"
        id="rect4174"

-       width="25"
-       height="10"
-       x="58.395695"
-       y="770.85742"
-       transform="matrix(0.79335334,-0.60876143,0.60876143,0.79335334,0,0)" />
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />

     <path
     <path

-       style="color:#000000;fill:#8282a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 558.20997,631.54797 19.83384,-15.21903 1.19788,17.98791 -3.96676,3.04381 z"
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 563.20997,636.54797 19.83384,-15.21903 1.19788,17.98791 -3.96676,3.04381 z"

        id="path4182"
        id="path4182"

-       inkscape:connector-curvature="0" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3834-6-3-8"
-       width="100"
-       height="100"
-       x="600"
-       y="552.36218" />
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />

     <path
        sodipodi:type="arc"
        style="color:#000000;fill:#95cdcf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
     <path
        sodipodi:type="arc"
        style="color:#000000;fill:#95cdcf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"


@@ -342,7 +190,7 @@
        d="m -153,412.86218 0,-2.00001 10,-3.99999 2,10e-6 0,1.99998 -4,10 -2,1e-5 0,-6 z"
        style="color:#000000;fill:#70cd8f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6591-2);enable-background:accumulate" />
     <rect
        d="m -153,412.86218 0,-2.00001 10,-3.99999 2,10e-6 0,1.99998 -4,10 -2,1e-5 0,-6 z"
        style="color:#000000;fill:#70cd8f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6591-2);enable-background:accumulate" />
     <rect

-       style="color:#000000;fill:#8282a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"

        id="rect11998"
        width="60"
        height="70"
        id="rect11998"
        width="60"
        height="70"


@@ -354,10 +202,10 @@
        height="4.9999948"
        width="65"
        id="rect12000"
        height="4.9999948"
        width="65"
        id="rect12000"

-       style="color:#000000;fill:#8282a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"

        transform="scale(1,-1)" />
     <rect
        transform="scale(1,-1)" />
     <rect

-       style="color:#000000;fill:#8282a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"

        id="rect12002"
        width="5"
        height="74.999985"
        id="rect12002"
        width="5"
        height="74.999985"


@@ -369,15 +217,54 @@
        height="79.999977"
        width="5"
        id="rect12004"
        height="79.999977"
        width="5"
        id="rect12004"

-       style="color:#000000;fill:#8282a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"

        transform="scale(-1,1)" />
     <rect
        transform="scale(-1,1)" />
     <rect

-       style="color:#000000;fill:#8282a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"

        id="rect12006"
        width="70"
        height="4.9999948"
        x="420"
        y="-647.36218"
        transform="scale(1,-1)" />
        id="rect12006"
        width="70"
        height="4.9999948"
        x="420"
        y="-647.36218"
        transform="scale(1,-1)" />

+    <path
+       inkscape:connector-curvature="0"
+       d="m 379.30233,557.36218 c -8.6696,0 -15.69768,7.02808 -15.69768,15.69767 0,1.58143 0.28446,3.07359 0.71948,4.51309 l -39.11337,39.11337 c -1.4395,-0.43502 -2.93166,-0.71948 -4.51309,-0.71948 -8.66959,0 -15.69767,7.02808 -15.69767,15.69768 0,8.66959 7.02808,15.69767 15.69767,15.69767 8.6696,0 15.69768,-7.02808 15.69768,-15.69767 0,-1.58143 -0.28446,-3.07359 -0.71948,-4.51309 l 39.11337,-39.11337 c 1.4395,0.43502 2.93166,0.71948 4.51309,0.71948 8.66959,0 15.69767,-7.02808 15.69767,-15.69768 0,-8.66959 -7.02808,-15.69767 -15.69767,-15.69767 z m 0,9.4186 c 3.46782,0 6.27907,2.81125 6.27907,6.27907 0,3.46783 -2.81125,6.27907 -6.27907,6.27907 -3.46783,0 -6.27907,-2.81124 -6.27907,-6.27907 0,-3.46782 2.81124,-6.27907 6.27907,-6.27907 z m -58.60466,58.60466 c 3.46783,0 6.27907,2.81124 6.27907,6.27907 0,3.46782 -2.81124,6.27907 -6.27907,6.27907 -3.46782,0 -6.27907,-2.81125 -6.27907,-6.27907 0,-3.46783 2.81125,-6.27907 6.27907,-6.27907 z"
+       id="path5387-6-5"
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 250,557.36218 c -20.7105,0 -37.5,16.78935 -37.5,37.5 0,20.71072 37.5,52.5 37.5,52.5 0,0 37.5,-31.78928 37.5,-52.5 0,-20.71065 -16.7895,-37.5 -37.5,-37.5 z m 1.1715,22.5 c 8.2845,0 15,6.71572 15,15 0,8.28427 -6.7155,15 -15,15 -8.28375,0 -15,-6.71573 -15,-15 0,-8.28428 6.71625,-15 15,-15 z"
+       id="path8139-4-6-3-5"
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path12963"
+       d="m 31,598.36218 -2,0 -3,3 0,2 14,14 5,5 5,-5 25,-25 0,-2 -3,-3 -2,0 -25,25 z"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g12979">
+      <path
+         transform="matrix(1.0666649,0,0,1.0666649,-20.332779,546.02902)"
+         d="m 335,80 a 15,15 0 1 1 -30,0 15,15 0 1 1 30,0 z"
+         sodipodi:ry="15"
+         sodipodi:rx="15"
+         sodipodi:cy="80"
+         sodipodi:cx="320"
+         id="path12975"
+         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:16;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:16;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path12977"
+         sodipodi:cx="320"
+         sodipodi:cy="80"
+         sodipodi:rx="15"
+         sodipodi:ry="15"
+         d="m 335,80 a 15,15 0 1 1 -30,0 15,15 0 1 1 30,0 z"
+         transform="matrix(0.46666693,0,0,0.46666693,171.66658,594.02886)" />
+    </g>

   </g>
 </svg>
   </g>
 </svg>

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 13a4d1986545eba37fefe5eccfb711688efcf218..67f04e55cce1b562c7926e19cfecc1a408947423 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -2288,14 +2288,15 @@ a.button {
     float: left;
   }
 
     float: left;
   }
 

-  .icon-list div { 
+  .icon-list { 
+    padding-bottom: 20px;
+  div { 

     margin-bottom: 10px;
     margin-bottom: 10px;

+      p {
+        padding-top: 10px;
+      }
+    }

   }
   }

-  
-  .icon-list div p { 
-    padding-top: 10px;
-  }
-  

   .sprite.small {
     width: 50px;
     height: 50px;
   .sprite.small {
     width: 50px;
     height: 50px;

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index 8eed246c58d160f9b30a170874a32d2e20789662..0c274043acd970688cfb8f22595a5d2b2efba9f4 100644 (file)
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -8,8 +8,9 @@
 
 <p><%= t "welcome_page.introduction_html" %></p>
 
 
 <p><%= t "welcome_page.introduction_html" %></p>
 

+<h3><%= t "welcome_page.whats_on_the_map.title" %></h3>
+

 <div class=' clearfix'>
 <div class=' clearfix'>

-  <h3><%= t "welcome_page.whats_on_the_map.title" %></h3>

   <div class='col6 pad1'>
     <div class='center clearfix pad1'>
       <span class='sprite small check'></span>
   <div class='col6 pad1'>
     <div class='center clearfix pad1'>
       <span class='sprite small check'></span>


@@ -24,35 +25,31 @@
   </div>
 </div>
 
   </div>
 </div>
 

-<div>
-  <h3><%= t "welcome_page.basic_terms.title" %></h3>
-  <p><%= t "welcome_page.basic_terms.paragraph_1_html" %></p>
-  <div class='col12 clearfix icon-list'>
-    <div class='clearfix'>
-      <span class='sprite small term editor'></span>
-      <p><%= t "welcome_page.basic_terms.editor_html" %></p>
-    </div>
-    <div class='clearfix'>
-      <span class='sprite small term node'></span>
-      <p><%= t "welcome_page.basic_terms.node_html" %></p>
-    </div>
-    <div class='clearfix'>
-      <span class='sprite small term way'></span>
-      <p><%= t "welcome_page.basic_terms.way_html" %></p>
-    </div>
-    <div class='clearfix'>
-      <span class='sprite small term changeset'></span>
-      <p><%= t "welcome_page.basic_terms.changeset_html" %></p>
-    </div>
+<h3><%= t "welcome_page.basic_terms.title" %></h3>
+
+<p><%= t "welcome_page.basic_terms.paragraph_1_html" %></p>
+
+<div class='col12 clearfix icon-list'>
+  <div class='clearfix'>
+    <span class='sprite small term editor'></span>
+    <p><%= t "welcome_page.basic_terms.editor_html" %></p>
+  </div>
+  <div class='clearfix'>
+    <span class='sprite small term node'></span>
+    <p><%= t "welcome_page.basic_terms.node_html" %></p>
+  </div>
+  <div class='clearfix'>
+    <span class='sprite small term way'></span>
+    <p><%= t "welcome_page.basic_terms.way_html" %></p>
+  </div>
+  <div class='clearfix'>
+    <span class='sprite small term changeset'></span>
+    <p><%= t "welcome_page.basic_terms.changeset_html" %></p>

   </div>
 </div>
 
   </div>
 </div>
 

-<div>
-  <h3><%= t "welcome_page.questions.title" %></h3>
-  <p>
-    <%= t "welcome_page.questions.paragraph_1_html" %>
-  </p>
-</div>
+<h3><%= t "welcome_page.questions.title" %></h3>
+<p><%= t "welcome_page.questions.paragraph_1_html" %></p>

 
 <div class='clearfix center'>
   <a href="<%= edit_path %>" class="button start-mapping"><%= t "welcome_page.start_mapping" %></a>
 
 <div class='clearfix center'>
   <a href="<%= edit_path %>" class="button start-mapping"><%= t "welcome_page.start_mapping" %></a>