Merge branch 'master' into tag-colour-preview-rebase

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 2c7d70e11ad99603056546396c017cc7e1711ddc..562eb80fdd2fe1d7d59c5c6fa5c17df6291cf78a 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -347,6 +347,10 @@ $(document).ready(function () {
           });
         }
       });
+      
+      $('.colour-preview-box').each(function () {
+        $(this).css("background-color", $(this).data("colour"));
+      });
     }
 
     page.unload = function () {

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index d3488fe73766cc15e3f04bbdc8fa9d604223d3dd..40c5eaa2a8e91f4362b4852ea389bfefa1085608 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1230,6 +1230,15 @@ tr.turn:hover {
       border-left: 1px solid #ddd;
       background-color: #fff;
     }
+
+    .colour-preview-box {
+      float: right;
+      width: 12px;
+      height: 12px;
+      margin: 4px 0px;
+      border: 1px solid rgba(0, 0, 0, .1); 
+      // add color via inline css on element: background-color: <tag value>;
+    }
   }
 
   .warning {

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e8a36f945f7866ebe73fcc726183822a813122c1..c6ed0f628f7276534428bec1b66aa0ddaa5a3b43 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -279,6 +279,7 @@ en:
       wikidata_link: "The %{page} item on Wikidata"
       wikipedia_link: "The %{page} article on Wikipedia"
       telephone_link: "Call %{phone_number}"
+      colour_preview: "Colour %{colour_value} preview"
     note:
       title: "Note: %{id}"
       new_note: "New Note"