Use bootstrap text-muted in place of custom deemphasze class
This avoids changing anything related to forms, since they will be switched over to bootstrap separately.
This commit is contained in:
parent
9f993fe8c8
commit
1977e66ace
15 changed files with 32 additions and 35 deletions
|
@ -7,7 +7,7 @@
|
|||
<%= tag.div :class => "contact-activity clearfix", :data => { :user => user_data } do %>
|
||||
<%= user_thumbnail contact %>
|
||||
<div class='activity-details'>
|
||||
<p class='deemphasize'>
|
||||
<p class='text-muted'>
|
||||
<%= link_to contact.display_name, user_path(contact) %>
|
||||
<% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %>
|
||||
<% distance = @user.distance(contact) %>
|
||||
|
@ -31,7 +31,7 @@
|
|||
<% end %>
|
||||
</p>
|
||||
|
||||
<ul class='secondary-actions clearfix deemphasize'>
|
||||
<ul class='secondary-actions clearfix text-muted'>
|
||||
<li><%= link_to t("users.show.send message"), new_message_path(contact) %></li>
|
||||
<li>
|
||||
<% if current_user.is_friends_with?(contact) %>
|
||||
|
|
|
@ -20,11 +20,11 @@
|
|||
<% else %>
|
||||
<h1>
|
||||
<%= t ".introduction_1" %>
|
||||
<span class="deemphasize">
|
||||
<span class="text-muted">
|
||||
<%= t ".introduction_2" %>
|
||||
</span>
|
||||
</h1>
|
||||
|
||||
<p class='deemphasize'><%= t ".reconfirm_html",
|
||||
:reconfirm => url_for(:action => "confirm_resend") %></p>
|
||||
<p class='text-muted'><%= t ".reconfirm_html",
|
||||
:reconfirm => url_for(:action => "confirm_resend") %></p>
|
||||
<% end %>
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
<%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
|
||||
<%= hidden_field_tag("referer", h(params[:referer])) %>
|
||||
|
||||
<p class='deemphasize'><%= t ".no account" %> <%= link_to t(".register now"), :action => :new, :referer => params[:referer] %></p>
|
||||
<p class='text-muted'><%= t ".no account" %> <%= link_to t(".register now"), :action => :new, :referer => params[:referer] %></p>
|
||||
|
||||
<div id="loginForm" class="standard-form">
|
||||
|
||||
|
|
|
@ -147,7 +147,7 @@
|
|||
|
||||
<% end %>
|
||||
|
||||
<p class='deemphasize'>
|
||||
<p class='text-muted'>
|
||||
<small>
|
||||
<%= t ".mapper since" %> <%= l @user.creation_time.to_date, :format => :long %>
|
||||
<% unless @user.terms_agreed %>
|
||||
|
@ -168,7 +168,7 @@
|
|||
</div>
|
||||
|
||||
<% if current_user and current_user.administrator? -%>
|
||||
<div class='admin-user-info deemphasize'>
|
||||
<div class='admin-user-info text-muted'>
|
||||
<small><b><%= t ".email address" %></b> <%= @user.email %></small>
|
||||
<% unless @user.creation_ip.nil? -%>
|
||||
<small><b><%= t ".created from" %></b> <%= @user.creation_ip %></small>
|
||||
|
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
<%= form_tag({ :action => "save" }, { :class => "standard-form fillL" }) do %>
|
||||
<!-- legale is <%= @legale %> -->
|
||||
<p class="deemphasize"><%= t ".read and accept with tou" %></p>
|
||||
<p class="text-muted"><%= t ".read and accept with tou" %></p>
|
||||
<h4>
|
||||
<%= t ".heading_ct" %>
|
||||
</h4>
|
||||
<div class='standard-form-row horizontal-list clearfix'>
|
||||
<p class="deemphasize"><%= t ".contributor_terms_explain" %></p>
|
||||
<p class="text-muted"><%= t ".contributor_terms_explain" %></p>
|
||||
<label class="standard-label">
|
||||
<%= t ".legale_select" %>
|
||||
</label>
|
||||
|
@ -34,7 +34,7 @@
|
|||
</div>
|
||||
|
||||
<div>
|
||||
<p id="contributorGuidance" class="deemphasize">
|
||||
<p id="contributorGuidance" class="text-muted">
|
||||
<%= t ".guidance_html",
|
||||
:summary => "https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary",
|
||||
:translations => "https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations" %>
|
||||
|
@ -50,7 +50,7 @@
|
|||
<h4>
|
||||
<%= t "layouts.tou" %>
|
||||
</h4>
|
||||
<p class="deemphasize"><%= t ".tou_explain_html", :tou_link => link_to(t("layouts.tou"), "https://wiki.osmfoundation.org/wiki/Terms_of_Use", :target => :new) %></p>
|
||||
<p class="text-muted"><%= t ".tou_explain_html", :tou_link => link_to(t("layouts.tou"), "https://wiki.osmfoundation.org/wiki/Terms_of_Use", :target => :new) %></p>
|
||||
<div class="standard-form-row">
|
||||
<label for="read_tou">
|
||||
<%= check_box_tag "read_tou" %>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue