From: Saman Bemel-Benrud Date: Wed, 31 Jul 2013 14:37:13 +0000 (-0400) Subject: touch-ups to icons & layout of welcome page. X-Git-Tag: live~5377^2~29 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/580d25b971548f227bc3e39661479c20e548e0df?ds=sidebyside 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 e33432773..50d6fb9fd 100644 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 8399067a2..242ca1487 100644 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 f3f6e295e..8cd6cc46c 100644 --- 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"> @@ -183,31 +182,6 @@ y2="802.62952" gradientUnits="userSpaceOnUse" gradientTransform="translate(-50,0)" /> - - - - - - - + + + + transform="translate(-49,2)" + style="fill:#7693dc;fill-opacity:1"> 101010110010101101101010111010101011 @@ -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" - 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" /> + 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" /> + 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" /> + inkscape:export-ydpi="90" + transform="translate(0,170)"> + showguides="false" + inkscape:guide-bbox="true" + inkscape:snap-bbox="true" + inkscape:snap-nodes="true" + inkscape:object-paths="true" + inkscape:object-nodes="true"> + @@ -95,59 +103,33 @@ transform="translate(0,-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)" /> - - - + transform="translate(0,-3)" /> + 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)" /> - + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccccccccccc" /> - - - + sodipodi:nodetypes="ccccc" /> - - - - - - - - - - - - - - - - + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> - + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> + + + + + + + diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 13a4d1986..67f04e55c 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -2288,14 +2288,15 @@ a.button { float: left; } - .icon-list div { + .icon-list { + padding-bottom: 20px; + div { margin-bottom: 10px; + p { + padding-top: 10px; + } + } } - - .icon-list div p { - padding-top: 10px; - } - .sprite.small { width: 50px; height: 50px; diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb index 8eed246c5..0c274043a 100644 --- a/app/views/site/welcome.html.erb +++ b/app/views/site/welcome.html.erb @@ -8,8 +8,9 @@

<%= t "welcome_page.introduction_html" %>

+

<%= t "welcome_page.whats_on_the_map.title" %>

+
-

<%= t "welcome_page.whats_on_the_map.title" %>

@@ -24,35 +25,31 @@
-
-

<%= t "welcome_page.basic_terms.title" %>

-

<%= t "welcome_page.basic_terms.paragraph_1_html" %>

-
-
- -

<%= t "welcome_page.basic_terms.editor_html" %>

-
-
- -

<%= t "welcome_page.basic_terms.node_html" %>

-
-
- -

<%= t "welcome_page.basic_terms.way_html" %>

-
-
- -

<%= t "welcome_page.basic_terms.changeset_html" %>

-
+

<%= t "welcome_page.basic_terms.title" %>

+ +

<%= t "welcome_page.basic_terms.paragraph_1_html" %>

+ +
+
+ +

<%= t "welcome_page.basic_terms.editor_html" %>

+
+
+ +

<%= t "welcome_page.basic_terms.node_html" %>

+
+
+ +

<%= t "welcome_page.basic_terms.way_html" %>

+
+
+ +

<%= t "welcome_page.basic_terms.changeset_html" %>

-
-

<%= t "welcome_page.questions.title" %>

-

- <%= t "welcome_page.questions.paragraph_1_html" %> -

-
+

<%= t "welcome_page.questions.title" %>

+

<%= t "welcome_page.questions.paragraph_1_html" %>