From: Saman Bemel-Benrud Date: Tue, 30 Jul 2013 23:08:24 +0000 (-0400) Subject: basic cleanup of welcome osm page. X-Git-Tag: live~4820^2~30 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bbc62406b588221adcbdda71fd167ee3c666c253 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 d335bdeba..f3f6e295e 100644 --- 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 67ebd635a..74e6074b9 100644 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 603f3b753..ad08b6ecd 100644 --- 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"> + inkscape:window-maximized="0" + showguides="true" + inkscape:guide-bbox="true"> + + + + + + + @@ -65,7 +95,7 @@ transform="translate(0,-552.36218)"> - - + + + + + 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" /> + transform="translate(-35,12.5)" + style="fill:#8282a9;fill-opacity:1"> - - - - - - - - - - - - - - - - - - - - - - - - ? + + + + + + diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 09ef07373..13a4d1986 100644 --- 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 78dd51552..8eed246c5 100644 --- a/app/views/site/welcome.html.erb +++ b/app/views/site/welcome.html.erb @@ -6,65 +6,62 @@

<%= t "welcome_page.title" %>

<% end %> -
-

<%= t "welcome_page.introduction_html" %>

-
+

<%= t "welcome_page.introduction_html" %>

-
+

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

-
+

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

-
+

<%= t "welcome_page.whats_on_the_map.off_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.editor_html" %>

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

-

+

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

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

-

+

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

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

+

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

+
-
+

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

-
- -
-

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

+

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

-
- <%= t "welcome_page.start_mapping" %> +
+ <%= t "welcome_page.start_mapping" %>
-
-
+
+

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

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

<%= t "welcome_page.add_a_note.paragraph_2_html" %>

-
+
\ No newline at end of file diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb index 33c528292..f95073df6 100644 --- 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") %>
-

<%= 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' %>

+

<%= 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' %>

<% end %>