Merge remote-tracking branch 'upstream/pull/5401'

[rails.git] / app / views / preferences / show.html.erb

diff --git a/app/views/preferences/show.html.erb b/app/views/preferences/show.html.erb
index d17c83b7aed9e483047026803a63247d6f20c65a..9bf83cbf1f0f72b846e3c43bbac278703fcef61a 100644 (file)
--- a/app/views/preferences/show.html.erb
+++ b/app/views/preferences/show.html.erb
@@ -14,12 +14,21 @@
   <dt class="col-sm-4"><%= t ".preferred_languages" %></dt>
 
   <dd class="col-sm-8">
-    <ul>
+    <ul class="list-unstyled">
       <% current_user.preferred_languages.each do |locale| %>
         <li><%= locale %></li>
       <% end %>
     </ul>
+  </dd>
 
+  <dt class="col-sm-4"><%= t ".preferred_site_color_scheme" %></dt>
+  <dd class="col-sm-8">
+    <%= t ".site_color_schemes.#{preferred_color_scheme(:site)}" %>
+  </dd>
+
+  <dt class="col-sm-4"><%= t ".preferred_map_color_scheme" %></dt>
+  <dd class="col-sm-8">
+    <%= t ".map_color_schemes.#{preferred_color_scheme(:map)}" %>
   </dd>
 </dl>