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.

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index 87ff8737048a6319c91839416e41f38f23bff4da..ddcce195daba2d5f7724d2b81ab876d51d6efeeb 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -116,7 +116,7 @@ L.OSM.layers = function (options) {
 
       $("<p>")
         .text(I18n.t("javascripts.map.layers.overlays"))
-        .attr("class", "deemphasize")
+        .attr("class", "text-muted")
         .appendTo(overlaySection);
 
       var overlays = $("<ul class='list-unstyled'>")

diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index 8b1446ff8d4a849d3d2f889bd3b4d137cebebaea..c4a5d026580df296205c3c2bb86799bd292b773e 100644 (file)
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -116,7 +116,7 @@ L.OSM.share = function (options) {
           .on("click", select))
       .append(
         $("<p>")
-          .attr("class", "deemphasize")
+          .attr("class", "text-muted")
           .text(I18n.t("javascripts.share.paste_html"))
           .appendTo($linkSection));
 
@@ -147,7 +147,7 @@ L.OSM.share = function (options) {
 
     $("<div>")
       .attr("id", "export-warning")
-      .attr("class", "deemphasize")
+      .attr("class", "text-muted")
       .text(I18n.t("javascripts.share.only_standard_layer"))
       .appendTo($imageSection);
 
@@ -223,7 +223,7 @@ L.OSM.share = function (options) {
       .appendTo($form);
 
     $("<p>")
-      .attr("class", "deemphasize")
+      .attr("class", "text-muted")
       .html(I18n.t("javascripts.share.image_size") + " <span id=\"mapnik_image_width\"></span> x <span id=\"mapnik_image_height\"></span>")
       .appendTo($form);
 

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 39cdaa47a7f5840e37d6959d05c6ef5e86d3f53e..2f7c959c0fbc90c76ce32769988427a148631aab 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -101,6 +101,10 @@ a {
   }
 }
 
+.text-muted a {
+  color: $blue;
+}
+
 /* Rules for the header */
 
 #menu-icon {
@@ -1417,7 +1421,7 @@ tr.turn:hover {
     margin-top: $lineheight/2;
   }
 
-  &.deemphasize {
+  &.deleted {
     background-color: #fee;
   }
 
@@ -1472,7 +1476,7 @@ tr.turn:hover {
       padding-top: $lineheight;
       border-top: 1px solid $grey;
     }
-    &.deemphasize {
+    &.deleted {
       background-color: #fee;
     }
     p {

diff --git a/app/assets/stylesheets/small.scss b/app/assets/stylesheets/small.scss
index 83b112ce7a0241367564379cc3214a68ddd412ee..ed3eb306477bdc0eb0627e44fc460d685417f7b1 100644 (file)
--- a/app/assets/stylesheets/small.scss
+++ b/app/assets/stylesheets/small.scss
@@ -142,13 +142,6 @@ body.small {
     height: 300px !important;
   }
 
-  #userinformation .deemphasize {
-    position: relative;
-    right: auto; left: auto;
-    margin-top: 10px;
-    top: auto;
-  }
-
   &.site-about #content .attr h1 {
     font-size: 28px;
   }

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index afe3f83220c56fc49a7d3e93f3a0064703bad6d7..5a50aa91f5a789d4c6581e6ebd4d32381b86d445 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -34,7 +34,7 @@
           <% @comments.each do |comment| %>
             <% if comment.visible %>
               <li id="c<%= comment.id %>">
-                <small class='deemphasize'>
+                <small class='text-muted'>
                   <%= t(".commented_by",
                         :when => friendly_date_ago(comment.created_at),
                         :exact_time => l(comment.created_at),
@@ -47,7 +47,7 @@
               </li>
             <% elsif current_user and current_user.moderator? %>
               <li id="c<%= comment.id %>">
-                <small class='deemphasize'>
+                <small class='text-muted'>
                   <%= t(".hidden_commented_by",
                         :when => friendly_date_ago(comment.created_at),
                         :exact_time => l(comment.created_at),

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index ffc198b0a52ebf6c05db80184cb3fba30ac84a82..0b91ca1264b4cc4520c607758703b97a187d35dd 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -24,7 +24,7 @@
   <% end -%>
 
   <% if current_user && current_user != @note.author %>
-    <p class="deemphasize"><%= report_link(t(".report"), @note) %></p>
+    <p class="text-muted"><%= report_link(t(".report"), @note) %></p>
   <% end %>
 
   <% if @note_comments.length > 1 %>
@@ -32,7 +32,7 @@
       <ul class="list-unstyled">
         <% @note_comments[1..-1].each do |comment| %>
           <li id="c<%= comment.id %>">
-            <small class='deemphasize'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
+            <small class='text-muted'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
             <%= comment.body.to_html %>
           </li>
         <% end %>

diff --git a/app/views/diary_entries/_diary_comment.html.erb b/app/views/diary_entries/_diary_comment.html.erb
index db48478263968d0103adc44727c3706bdfabe036..9a3ff969dfecbd64fc0e0c987fd12352f22633f5 100644 (file)
--- a/app/views/diary_entries/_diary_comment.html.erb
+++ b/app/views/diary_entries/_diary_comment.html.erb
@@ -1,6 +1,6 @@
-<div class="clearfix diary-comment<%= " deemphasize" unless diary_comment.visible? %>">
+<div class="clearfix diary-comment<%= " text-muted deleted" unless diary_comment.visible? %>">
   <%= user_thumbnail diary_comment.user %>
-  <p class="deemphasize comment-heading" id="comment<%= diary_comment.id %>"><%= t(".comment_from_html", :link_user => (link_to diary_comment.user.display_name, user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %>
+  <p class="text-muted comment-heading" id="comment<%= diary_comment.id %>"><%= t(".comment_from_html", :link_user => (link_to diary_comment.user.display_name, user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %>
     <% if current_user and diary_comment.user.id != current_user.id %>
       | <%= report_link(t(".report"), diary_comment) %>
     <% end %>

diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb
index b0c464718011160ada4c5990be1faf64e3849f2d..48df5d18e06a974c4cfc6d124b353161d4f25799 100644 (file)
--- a/app/views/diary_entries/_diary_entry.html.erb
+++ b/app/views/diary_entries/_diary_entry.html.erb
@@ -1,4 +1,4 @@
-<div class='diary_post<%= " deemphasize" unless diary_entry.visible %> user_<%= diary_entry.user.id %>'>
+<div class='diary_post<%= " text-muted px-3 deleted" unless diary_entry.visible %> user_<%= diary_entry.user.id %>'>
   <div class='post_heading clearfix'>
     <% if !@user %>
       <%= user_thumbnail diary_entry.user %>
@@ -6,7 +6,7 @@
 
     <h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2>
 
-    <small class='deemphasize'>
+    <small class='text-muted'>
       <%= t(".posted_by_html", :link_user => (link_to diary_entry.user.display_name, user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to diary_entry.language.name, :controller => "diary_entries", :action => "index", :display_name => nil, :language => diary_entry.language_code)) %>
     </small>
 

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 5efa6a1bb776b754cb86129622fec24faac88fbf..6472a496720a2f4482e3175916978c23f8123f9c 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,7 +1,7 @@
 <% content_for :heading do %>
 <h2><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h2>
 <p><%= @issue.reportable.model_name.human %> : <%= link_to reportable_title(@issue.reportable), reportable_url(@issue.reportable) %></p>
-<p class="deemphasize">
+<p class="text-muted">
   <small>
     <%= @issue.assigned_role %>
     | <%= t ".reports", :count => @issue.reports.count %>

diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb
index 8980cb8f21cf2aae556845a1c26710f251379ad0..ff15836b7b2596f2ea783a907bd31da480d14cbf 100644 (file)
--- a/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@ -9,7 +9,7 @@
     <% end %>
   </td>
   <td><%= link_to trace.name, :controller => "traces", :action => "show", :display_name => trace.user.display_name, :id => trace.id %>
-    <span class="deemphasize" title="<%= trace.timestamp %>"> ...
+    <span class="text-muted" title="<%= trace.timestamp %>"> ...
       <% if trace.inserted %>
         (<%= t ".count_points", :count => trace.size %>)
       <% end %>

diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb
index d067bd4781b4acc73a53de16a3621c62cf2a3b76..4446c519d4c45012b85d4721b8a5014228092b5f 100644 (file)
--- a/app/views/users/_contact.html.erb
+++ b/app/views/users/_contact.html.erb
@@ -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) %>

diff --git a/app/views/users/confirm.html.erb b/app/views/users/confirm.html.erb
index 3a2e125789a66e818a843ea58d0ba3dff0eaec07..a3902c0a920a0b07ae746b7da70c0c305501228f 100644 (file)
--- a/app/views/users/confirm.html.erb
+++ b/app/views/users/confirm.html.erb
@@ -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 %>

diff --git a/app/views/users/login.html.erb b/app/views/users/login.html.erb
index ac61d7df7bbb02c9b79f80d1b0a41bb7f7672768..365245bf04a929b34bac7dcdd431d5dbdb406c39 100644 (file)
--- a/app/views/users/login.html.erb
+++ b/app/views/users/login.html.erb
@@ -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">
 

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 1332ab6e204f034edc9d7ffa7003f6d5f18947c2..1bd5f8fa5ba531c50225568472ed27a901f80b2b 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -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>

diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb
index 33ca3a3e63e030531c0304cf934d74d8cd7e29ca..bc8b86ef2256a269e25b0a6f8401fb419d3ea166 100644 (file)
--- a/app/views/users/terms.html.erb
+++ b/app/views/users/terms.html.erb
@@ -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" %>