From: Tom Hughes Date: Thu, 9 Jan 2020 10:31:37 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/2498' X-Git-Tag: live~2870 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/e39d227dd03f43985e38cd26ce6040772d571271?hp=ffb671b80d3f9105bfbb11ba9f4ef8cf5d0f262a Merge remote-tracking branch 'upstream/pull/2498' --- diff --git a/app/assets/stylesheets/_bootstrap-custom.scss b/app/assets/stylesheets/_bootstrap-custom.scss index c07fc2d07..e502f7db6 100644 --- a/app/assets/stylesheets/_bootstrap-custom.scss +++ b/app/assets/stylesheets/_bootstrap-custom.scss @@ -13,7 +13,7 @@ @import "bootstrap/type"; // @import "bootstrap/images"; // @import "bootstrap/code"; -// @import "bootstrap/grid"; +@import "bootstrap/grid"; // @import "bootstrap/tables"; // @import "bootstrap/forms"; // @import "bootstrap/buttons"; diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index f85a94616..229db3ba3 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -58,36 +58,6 @@ strong { clear: both; } -/* Basic grid */ - -.col0 { float:left; width:04.1666%; } -.col1 { float:left; width:08.3333%; } -.col2 { float:left; width:16.6666%; } -.col3 { float:left; width:25.0000%; } -.col4 { float:left; width:33.3333%; } -.col5 { float:left; width:41.6666%; } -.col6 { float:left; width:50.0000%; } -.col7 { float:left; width:58.3333%; } -.col8 { float:left; width:66.6666%; } -.col9 { float:left; width:75.0000%; } -.col10 { float:left; width:83.3333%; } -.col11 { float:left; width:91.6666%; } -.col12 { width:100%; } - -.margin0 { margin-left:04.1666%; } -.margin1 { margin-left:08.3333%; } -.margin2 { margin-left:16.6666%; } -.margin3 { margin-left:25.0000%; } -.margin4 { margin-left:33.3333%; } -.margin5 { margin-left:41.6666%; } -.margin6 { margin-left:50.0000%; } -.margin7 { margin-left:58.3333%; } -.margin8 { margin-left:66.6666%; } -.margin9 { margin-left:75.0000%; } -.margin10 { margin-left:83.3333%; } -.margin11 { margin-left:91.6666%; } -.margin12 { margin-left:100.0000%; } - .fillL { background-color: white; } /* Default rules for the body of every page */ @@ -1391,19 +1361,6 @@ tr.turn:hover { /* Overrides for pages that use new layout conventions */ -.users-new, -.users-create, -.users-terms { - .content-body .content-inner { - padding: 0; - - .message { - margin-top: 80px; - padding: 20px; - } - } -} - .users-new, .users-create, .users-terms, @@ -2607,11 +2564,6 @@ input.richtext_title[type="text"] { text-decoration: none; } - .note-box { - margin-top: 20px; - background-color: $offwhite; - } - .icon.note { background-color: #333; border-radius: 4px; diff --git a/app/assets/stylesheets/small.scss b/app/assets/stylesheets/small.scss index 12e21c7d8..f6126391a 100644 --- a/app/assets/stylesheets/small.scss +++ b/app/assets/stylesheets/small.scss @@ -182,19 +182,6 @@ body.small { top: auto; } - /* Rules for the sign-up page */ - - &.user-new, - &.user-create { - .col6 { - width: 100%; - } - - .aside { - display: none; - } - } - &.site-about #content .attr h1 { font-size: 28px; } diff --git a/app/views/site/fixthemap.html.erb b/app/views/site/fixthemap.html.erb index 4bb478c7e..3c82e2374 100644 --- a/app/views/site/fixthemap.html.erb +++ b/app/views/site/fixthemap.html.erb @@ -7,31 +7,30 @@ <% end %>

<%= t "layouts.intro_header" %>

-

<%= t "layouts.intro_text" %>

<%= t ".how_to_help.title" %>

-
-
-

<%= t ".how_to_help.join_the_community.title" %>

- <%= t ".how_to_help.join_the_community.explanation_html" %> -
- +
+
+
+
<%= t ".how_to_help.join_the_community.title" %>
+

<%= t ".how_to_help.join_the_community.explanation_html" %>

+

+ +

+
+
+
<%= t "site.welcome.add_a_note.title" %>
+

<%= t "site.welcome.add_a_note.paragraph_1_html" %>

+

<%= t ".how_to_help.add_a_note.instructions_html", :map_url => root_path %>

-
-
-

<%= t "site.welcome.add_a_note.title" %>

-

<%= t "site.welcome.add_a_note.paragraph_1_html" %>

-

<%= t ".how_to_help.add_a_note.instructions_html", :map_url => root_path %>

<%= t ".other_concerns.title" %>

<%= t ".other_concerns.explanation_html" %>

-
-

<%= t "site.welcome.questions.title" %>

- -

<%= t "site.welcome.questions.paragraph_1_html", :help_url => help_path %>

-
+

<%= t "site.welcome.questions.title" %>

+ +

<%= t "site.welcome.questions.paragraph_1_html", :help_url => help_path %>

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb index dc6a519df..4617935e7 100644 --- a/app/views/site/welcome.html.erb +++ b/app/views/site/welcome.html.erb @@ -10,15 +10,15 @@

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

-
-
-
+
+
+

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

-
-
+
+

<%= t ".whats_on_the_map.off_html" %>

@@ -29,7 +29,7 @@

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

-
+

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

@@ -48,26 +48,24 @@
-
+

<%= t ".rules.title" %>

<%= t ".rules.paragraph_1_html" %>

-
+

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

<%= t ".questions.paragraph_1_html", :help_url => help_path %>

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

<%= t ".start_mapping" %>

-
-
-

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

-

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

-

<%= t ".add_a_note.paragraph_2_html", :map_url => root_path %>

-
+
+

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

+

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

+

<%= t ".add_a_note.paragraph_2_html", :map_url => root_path %>

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index f4ff16408..5acaa4e95 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -8,75 +8,79 @@
<% end %> -<%= form_for current_user, :url => { :action => "create" }, :html => { :class => "standard-form fillL col6 inner22" } do |f| %> - <%= hidden_field_tag("referer", h(@referer)) unless @referer.nil? %> +
+
+

<%= t ".about.header" %>

+ <%= t ".about.html" %> +
-
-
- - <%= f.email_field(:email, :tabindex => 1) %> - <%= f.error_message_on(:email) %> -
-
- - <%= f.email_field(:email_confirmation, :tabindex => 2) %> - <%= f.error_message_on(:email_confirmation) %> -
- <%= t(".not_displayed_publicly_html") %> -
+
+ <%= form_for current_user, :url => { :action => "create" }, :html => { :class => "standard-form" } do |f| %> + <%= hidden_field_tag("referer", h(@referer)) unless @referer.nil? %> -
-
- - <%= f.text_field(:display_name, :tabindex => 3) %> - <%= f.error_message_on(:display_name) %> -
- <%= t ".display name description" %> -
+
+
+ + <%= f.email_field(:email, :tabindex => 1) %> + <%= f.error_message_on(:email) %> +
+
+ + <%= f.email_field(:email_confirmation, :tabindex => 2) %> + <%= f.error_message_on(:email_confirmation) %> +
+ <%= t(".not_displayed_publicly_html") %> +
-
-
- - <%= f.select(:auth_provider, Auth::PROVIDERS, :default => "", :tabindex => 4) %> - <%= f.text_field(:auth_uid, :tabindex => 5) %> - <%= f.error_message_on(:auth_uid) %> -
- <%= t ".auth no password" %> -
+
+
+ + <%= f.text_field(:display_name, :tabindex => 3) %> + <%= f.error_message_on(:display_name) %> +
+ <%= t ".display name description" %> +
-
-
- - <%= f.password_field(:pass_crypt, :tabindex => 6) %> - <%= f.error_message_on(:pass_crypt) %> -
-
- - <%= f.password_field(:pass_crypt_confirmation, :tabindex => 7) %> - <%= f.error_message_on(:pass_crypt_confirmation) %> -
-
+
+
+ + <%= f.select(:auth_provider, Auth::PROVIDERS, :default => "", :tabindex => 4) %> + <%= f.text_field(:auth_uid, :tabindex => 5) %> + <%= f.error_message_on(:auth_uid) %> +
+ <%= t ".auth no password" %> +
-
- <%= link_to t(".use external auth"), "#", :id => "auth_enable" %> -
+
+
+ + <%= f.password_field(:pass_crypt, :tabindex => 6) %> + <%= f.error_message_on(:pass_crypt) %> +
+
+ + <%= f.password_field(:pass_crypt_confirmation, :tabindex => 7) %> + <%= f.error_message_on(:pass_crypt_confirmation) %> +
+
- <%= submit_tag t(".continue"), :tabindex => 8 %> -<% end %> +
+ <%= link_to t(".use external auth"), "#", :id => "auth_enable" %> +
-
-

<%= t ".about.header" %>

- <%= t ".about.html" %> + <%= submit_tag t(".continue"), :tabindex => 8 %> + <% end %> +
diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb index 97c1c7bf7..243ce2863 100644 --- a/app/views/users/terms.html.erb +++ b/app/views/users/terms.html.erb @@ -7,13 +7,13 @@
<% end %> -<%= form_tag({ :action => "save" }, { :class => " inner22 standard-form fillL" }) do %> +<%= form_tag({ :action => "save" }, { :class => "standard-form fillL" }) do %>

<%= t ".read and accept with tou" %>

-