cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2023-08-10 18:06:20 +01:00
commit a02e37250b
2 changed files with 14 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/assets/stylesheets/common.scss
View file

@ -1244,17 +1244,6 @@ div.secondary-actions {
text-align: center; text-align: center;
} }
/* Create a single-line dl */
dl.dl-inline {
dt, dd {
display: inline-block;
}
dd {
margin-right: 1em;
}
}
/* Rules for rich text */ /* Rules for rich text */
.richtext, .richtext,

28
app/views/users/show.html.erb
View file

@ -118,12 +118,12 @@
<div class='text-muted'> <div class='text-muted'>
<small> <small>
<dl class="dl-inline"> <dl class="list-inline">
<dt><%= t ".mapper since" %></dt> <dt class="list-inline-item m-0"><%= t ".mapper since" %></dt>
<dd><%= l @user.created_at.to_date, :format => :long %></dd> <dd class="list-inline-item"><%= l @user.created_at.to_date, :format => :long %></dd>
<% unless @user.terms_agreed %> <% unless @user.terms_agreed %>
<dt><%= t ".ct status" %></dt> <dt class="list-inline-item m-0"><%= t ".ct status" %></dt>
<dd> <dd class="list-inline-item">
<% if @user.terms_seen? -%> <% if @user.terms_seen? -%>
<%= t ".ct declined" %> <%= t ".ct declined" %>
<% else -%> <% else -%>
@ -188,17 +188,17 @@
<% if current_user and current_user.administrator? -%> <% if current_user and current_user.administrator? -%>
<div class='text-muted'> <div class='text-muted'>
<small> <small>
<dl class='dl-inline'> <dl class="list-inline">
<dt><%= t ".email address" %></dt> <dt class="list-inline-item m-0"><%= t ".email address" %></dt>
<dd><%= @user.email %></dd> <dd class="list-inline-item"><%= @user.email %></dd>
<% unless @user.creation_ip.nil? -%> <% unless @user.creation_ip.nil? -%>
<dt><%= t ".created from" %></dt> <dt class="list-inline-item m-0"><%= t ".created from" %></dt>
<dd><%= @user.creation_ip %></dd> <dd class="list-inline-item"><%= @user.creation_ip %></dd>
<% end -%> <% end -%>
<dt><%= t ".status" %></dt> <dt class="list-inline-item m-0"><%= t ".status" %></dt>
<dd><%= @user.status.capitalize %></dd> <dd class="list-inline-item"><%= @user.status.capitalize %></dd>
<dt><%= t ".spam score" %></dt> <dt class="list-inline-item m-0"><%= t ".spam score" %></dt>
<dd><%= @user.spam_score %></dd> <dd class="list-inline-item"><%= @user.spam_score %></dd>
</dl> </dl>
</small> </small>
</div> </div>