basic cleanup of welcome osm page.

diff --git a/app/assets/images/sign-up-illustration.svg b/app/assets/images/sign-up-illustration.svg
index d335bdeba6a9a8f0a382d3e5171eb60b37a2882b..f3f6e295ef5016325142e4e97a78271df1cf49d0 100644 (file)
--- a/app/assets/images/sign-up-illustration.svg
+++ b/app/assets/images/sign-up-illustration.svg
@@ -506,7 +506,7 @@
      inkscape:cy="47.289177"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="true"
+     showgrid="false"
      inkscape:window-width="1524"
      inkscape:window-height="817"
      inkscape:window-x="220"

diff --git a/app/assets/images/welcome-sprite.png b/app/assets/images/welcome-sprite.png
index 67ebd635aeaada9365f32d424dca6bf4394ca209..74e6074b9cc9cb90fc32d2e56582849fde3dcf6e 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 603f3b753be63400e803129b097f7b2053951109..ad08b6ecd1f64181bb7d2ee0a29839878be71dc1 100644 (file)
--- a/app/assets/images/welcome-sprite.svg
+++ b/app/assets/images/welcome-sprite.svg
@@ -13,9 +13,9 @@
    height="500"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.2 r9819"
    sodipodi:docname="welcome-sprite.svg"
-   inkscape:export-filename="/Users/john/Development/openstreetmap-website/app/assets/images/welcome-sprite.png"
+   inkscape:export-filename="/Users/saman/work_repos/openstreetmap-website/app/assets/images/welcome-sprite.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
@@ -27,17 +27,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.1920929"
-     inkscape:cx="335.82515"
-     inkscape:cy="260.62006"
+     inkscape:zoom="1"
+     inkscape:cx="338.53242"
+     inkscape:cy="465.50598"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="true"
+     showgrid="false"
      inkscape:window-width="1369"
-     inkscape:window-height="1133"
+     inkscape:window-height="1036"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="0">
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
     <inkscape:grid
        type="xygrid"
        id="grid2985"
@@ -45,6 +47,34 @@
        visible="true"
        enabled="true"
        snapvisiblegridlinesonly="true" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="100,530"
+       id="guide11961" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="200,540"
+       id="guide11963" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="300,550"
+       id="guide11977" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="400,600"
+       id="guide11979" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="500,580"
+       id="guide11981" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="600,500"
+       id="guide11983" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="700,500"
+       id="guide11985" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -65,7 +95,7 @@
      transform="translate(0,-552.36218)">
     <path
        sodipodi:type="arc"
-       style="color:#000000;fill:#95cfa1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;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.99999994000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="path2987"
        sodipodi:cx="42.5"
        sodipodi:cy="42.5"
@@ -73,25 +103,29 @@
        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)" />
-    <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="rect3759"
-       width="35.294117"
-       height="11.764706"
-       x="441.29584"
-       y="401.12442"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,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="rect3761"
-       width="11.764706"
-       height="47.058823"
-       x="464.82526"
-       y="365.83029"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+    <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>
     <path
        sodipodi:type="arc"
-       style="color:#000000;fill:#cf9b95;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;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.99999994000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="path2987-7"
        sodipodi:cx="42.5"
        sodipodi:cy="42.5"
@@ -106,7 +140,7 @@
        inkscape:connector-curvature="0" />
     <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"
+       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"
@@ -142,10 +176,10 @@
        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:#285759;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
+       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:#95cdcf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       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"
@@ -174,7 +208,7 @@
          sodipodi:cy="42.5"
          sodipodi:cx="42.5"
          id="path2987-7-7-15-5"
-         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"
+         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)"
@@ -189,7 +223,8 @@
     </g>
     <g
        id="g3845-2"
-       transform="translate(-35,12.5)">
+       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"
@@ -198,7 +233,7 @@
          sodipodi:cy="42.5"
          sodipodi:cx="42.5"
          id="path2987-7-7-15-5-1"
-         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"
+         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)"
@@ -208,7 +243,7 @@
          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.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         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
@@ -222,7 +257,7 @@
          sodipodi:cy="42.5"
          sodipodi:cx="42.5"
          id="path2987-7-7-15-5-1-4"
-         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"
+         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)"
@@ -242,118 +277,6 @@
        height="100"
        x="400"
        y="552.36218" />
-    <path
-       style="color:#000000;fill:#dce0c6;fill-opacity:1;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 410,5 0,25 0,20 0,45 80,0 0,-40 0,-25 0,-5 -20,-20 z"
-       transform="translate(0,552.36218)"
-       id="rect3936"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3941"
-       width="70"
-       height="5"
-       x="415"
-       y="587.36218" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3941-5"
-       width="30"
-       height="5"
-       x="415"
-       y="597.36218" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3941-5-5"
-       width="30"
-       height="5"
-       x="450"
-       y="597.36218" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3941-5-52"
-       width="30"
-       height="5"
-       x="435"
-       y="607.36218" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3941-5-3"
-       width="15"
-       height="5"
-       x="415"
-       y="607.36218" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3941-5-8"
-       width="35"
-       height="5"
-       x="415"
-       y="617.36218" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3941-5-3-4"
-       width="15"
-       height="5"
-       x="455"
-       y="617.36218" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3941-5-3-5"
-       width="15"
-       height="5"
-       x="415"
-       y="627.36218" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3941-5-3-7"
-       width="15"
-       height="5"
-       x="435"
-       y="627.36218" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3941-5-3-2"
-       width="15"
-       height="5"
-       x="455"
-       y="627.36218" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3941-5-0"
-       width="30"
-       height="5"
-       x="415"
-       y="577.36218" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3941-5-4"
-       width="30"
-       height="5"
-       x="415"
-       y="567.36218" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3941-5-3-5-5"
-       width="15"
-       height="5"
-       x="450"
-       y="567.36218" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3941-5-3-5-1"
-       width="10"
-       height="5"
-       x="450"
-       y="577.36218" />
-    <path
-       style="color:#000000;fill:#b8bca5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 470,5 0,20 20,0 z"
-       id="path4107"
-       inkscape:connector-curvature="0"
-       transform="translate(0,552.36218)"
-       sodipodi:nodetypes="cccc" />
     <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"
@@ -362,7 +285,7 @@
        x="500"
        y="552.36218" />
     <rect
-       style="color:#000000;fill:#95cdcf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.05882347;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       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"
@@ -370,7 +293,7 @@
        y="785.85742"
        transform="matrix(0.79335334,-0.60876143,0.60876143,0.79335334,0,0)" />
     <rect
-       style="color:#000000;fill:#285759;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       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"
        id="rect4174"
        width="25"
        height="10"
@@ -378,51 +301,10 @@
        y="770.85742"
        transform="matrix(0.79335334,-0.60876143,0.60876143,0.79335334,0,0)" />
     <path
-       style="color:#000000;fill:#285759;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       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"
        id="path4182"
        inkscape:connector-curvature="0" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect4051"
-       width="700"
-       height="350"
-       x="0"
-       y="672.36218"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="color:#000000;fill:none;stroke:#bcbcbc;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 215.48388,806.39447 0,-47.41936 c 0,0 0,-31.6129 31.6129,-31.6129 31.6129,0 86.93549,0 86.93549,0 l 0,0"
-       id="path4070"
-       inkscape:connector-curvature="0" />
-    <path
-       style="color:#000000;fill:none;stroke:#bcbcbc;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 144.35484,830.10415 -47.419354,0 c 0,0 -31.612904,0 -31.612904,-31.61291 0,-31.6129 0,-39.51613 0,-39.51613 l 0,0"
-       id="path4070-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccscc" />
-    <path
-       style="color:#000000;fill:none;stroke:#8f8f8f;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 175.96775,806.39447 0,-15.80645 c 0,0 0,-23.70968 23.70967,-23.70968 23.70968,0 71.12904,0 71.12904,0"
-       id="path4152"
-       inkscape:connector-curvature="0" />
-    <path
-       style="color:#000000;fill:none;stroke:#bcbcbc;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 231.29033,861.71705 0,31.6129 0,39.51613"
-       id="path4209"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-    <path
-       style="color:#000000;fill:none;stroke:#bcbcbc;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 500.00001,869.62028 0,15.80645 c 0,0 0,47.41935 -47.41935,47.41935 -47.41936,0 -47.41936,0 -47.41936,0 0,0 -23.70968,0 -23.70968,-23.70967"
-       id="path4301"
-       inkscape:connector-curvature="0" />
-    <path
-       style="color:#000000;fill:none;stroke:#bcbcbc;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 444.67743,806.39447 c 0,0 0,-31.61291 31.6129,-31.61291 31.61291,0 55.32259,0 55.32259,0"
-       id="path4341"
-       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"
@@ -450,16 +332,52 @@
        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.94117644,0,0,0.94117644,610,562.36218)" />
-    <text
-       xml:space="preserve"
-       style="font-size:75.74924469px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:120.00000477%;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:#202020;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.05882347;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Open Sans;-inkscape-font-specification:Open Sans Bold"
-       x="627.5"
-       y="629.86218"
-       id="text4436"
-       sodipodi:linespacing="120%"><tspan
-         sodipodi:role="line"
-         id="tspan4438"
-         x="627.5"
-         y="629.86218">?</tspan></text>
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/Users/saman/work_repos/osm-redesign/renders/share-1.png"
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:connector-curvature="0"
+       id="path6918-2"
+       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"
+       id="rect11998"
+       width="60"
+       height="70"
+       x="410"
+       y="557.36218" />
+    <rect
+       y="-637.36218"
+       x="415"
+       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"
+       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"
+       id="rect12002"
+       width="5"
+       height="74.999985"
+       x="475"
+       y="562.36218" />
+    <rect
+       y="567.36218"
+       x="-490"
+       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"
+       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"
+       id="rect12006"
+       width="70"
+       height="4.9999948"
+       x="420"
+       y="-647.36218"
+       transform="scale(1,-1)" />
   </g>
 </svg>

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 09ef07373d2c4c029c94dda6b1d78bbf541842aa..13a4d1986545eba37fefe5eccfb711688efcf218 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1047,12 +1047,14 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 /* Overrides for pages that use new layout conventions */
 .site-copyright,
-.site-welcome,
-.user-new {
-  #content.pad2 {
-    padding: 0;
+.site-welcome {
+  #content {
+    max-width: 740px;
   }
 }
+.user-new #content.pad2 {
+    padding: 0;
+  }
 
 .user-new .content-heading {
   height: 200px;  
@@ -1538,9 +1540,9 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
       float: left;
     }
     #decline {
-      background: $grey;
+      background: $lightblue;
       &:hover {
-        background: darken($grey, $hovercolor);
+        background: darken($lightblue, $hovercolor);
       }
     }
   }
@@ -2269,6 +2271,10 @@ a.button {
 .site-welcome {
   .center {
     text-align: center;
+    .sprite { 
+      float: none;
+      margin: auto;
+    }
   }
 
   .drop {
@@ -2278,9 +2284,18 @@ a.button {
   .sprite {
     background-image: image-url("welcome-sprite.png");
     background-size: 500px 250px;
-    display: inline-block;
+    display: block;
+    float: left;
   }
 
+  .icon-list div { 
+    margin-bottom: 10px;
+  }
+  
+  .icon-list div p { 
+    padding-top: 10px;
+  }
+  
   .sprite.small {
     width: 50px;
     height: 50px;
@@ -2316,13 +2331,9 @@ a.button {
   }
 
   .start-mapping {
-    background: #EB6F67;
-    color: #FFF;
     margin: auto;
     cursor: pointer;
     border: none;
-    border-radius: 5px;
-    border-bottom: 1px solid #A53931;
     padding: 20px 40px;
     font-size: 30px;
     text-decoration: none;

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index 78dd515528ad25512853014a349919d75adafbf2..8eed246c58d160f9b30a170874a32d2e20789662 100644 (file)
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -6,65 +6,62 @@
   <h2><%= t "welcome_page.title" %></h2>
 <% end %>
 
-<div class='pad2'>
-  <p><%= t "welcome_page.introduction_html" %></p>
-</div>
+<p><%= t "welcome_page.introduction_html" %></p>
 
-<div class='pad2 clearfix'>
+<div class=' clearfix'>
   <h3><%= t "welcome_page.whats_on_the_map.title" %></h3>
   <div class='col6 pad1'>
-    <div class='center pad1'>
+    <div class='center clearfix pad1'>
       <span class='sprite small check'></span>
     </div>
     <p><%= t "welcome_page.whats_on_the_map.on_html" %></p>
   </div>
   <div class='col6 pad1'>
-    <div class='center pad1'>
+    <div class='center clearfix pad1'>
       <span class='sprite small x'></span>
     </div>
     <p><%= t "welcome_page.whats_on_the_map.off_html" %></p>
   </div>
 </div>
 
-<div class='pad2'>
+<div>
   <h3><%= t "welcome_page.basic_terms.title" %></h3>
   <p><%= t "welcome_page.basic_terms.paragraph_1_html" %></p>
-  <div class='col12 clearfix'>
-    <p>
+  <div class='col12 clearfix icon-list'>
+    <div class='clearfix'>
       <span class='sprite small term editor'></span>
-      <%= t "welcome_page.basic_terms.editor_html" %>
-    </p>
-    <p>
+      <p><%= t "welcome_page.basic_terms.editor_html" %></p>
+    </div>
+    <div class='clearfix'>
       <span class='sprite small term node'></span>
-      <%= t "welcome_page.basic_terms.node_html" %>
-    </p>
-    <p>
+      <p><%= t "welcome_page.basic_terms.node_html" %></p>
+    </div>
+    <div class='clearfix'>
       <span class='sprite small term way'></span>
-      <%= t "welcome_page.basic_terms.way_html" %>
-    </p>
-    <p>
+      <p><%= t "welcome_page.basic_terms.way_html" %></p>
+    </div>
+    <div class='clearfix'>
       <span class='sprite small term changeset'></span>
-      <%= t "welcome_page.basic_terms.changeset_html" %>
-    </p>
+      <p><%= t "welcome_page.basic_terms.changeset_html" %></p>
+    </div>
   </div>
 </div>
 
-<div class='pad2'>
+<div>
   <h3><%= t "welcome_page.questions.title" %></h3>
-  <div class='center pad1'>
-    <span class='sprite small term question'></span>
-  </div>
-  <p><%= t "welcome_page.questions.paragraph_1_html" %></p>
+  <p>
+    <%= t "welcome_page.questions.paragraph_1_html" %>
+  </p>
 </div>
 
-<div class='pad2 center'>
-  <a href="<%= edit_path %>" class="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>
 </div>
 
-<div class='note-box pad2 drop'>
-  <div class='pad1'>
+<div class='note-box drop'>
+  <div class='pad2'>
     <h3><%= t "welcome_page.add_a_note.title" %></h3>
     <p><%= t "welcome_page.add_a_note.paragraph_1_html" %></p>
     <p><%= t "welcome_page.add_a_note.paragraph_2_html" %></p>
   </div>
-</div>
+</div>
\ No newline at end of file

diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb
index 33c528292208fba6dc3db01041d4df658dc69d53..f95073df67a9a99afd71c78097f41353d1f50735 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -40,6 +40,6 @@
       <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
       <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
     </div>
-    <p id="contributorGuidance"><%= raw t 'user.terms.guidance', :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %></p>
+    <p class='pad1' id="contributorGuidance"><%= raw t 'user.terms.guidance', :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %></p>
   <% end %>
 </terms>