Merge branch 'master' into v0.9

Conflicts:
	Makefile.example
	archaeological_operations/migrations/0061_regenerate_cached_label.py
	archaeological_warehouse/migrations/0024_generate_cache_lbl_for_containers.py

1 files changed, 11 insertions, 0 deletions

diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 06c80c194..adaf94200 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -410,6 +410,11 @@ a.button{
     color: white;
 }
 
+#validate-button{
+    background-color: #fff;
+    display: inline-block;
+}
+
 .display_details_inline,
 .display_details{
     display:inline-block;
@@ -1490,6 +1495,7 @@ table.table-form td input{
   margin: 10px 0 10px 0;
   width: 100%;
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+  border-collapse: collapse;
 }
 
 .clean-table h4{
@@ -1526,6 +1532,7 @@ table.table-form td input{
   background: #DA2D2D;
   text-align: center;
   padding: 0.2em 0.4em;
+  border-right: 1px solid #fff;
 }
 
 .clean-table tr th.sub {
@@ -1544,3 +1551,7 @@ table.table-form td input{
     display: block;
 }
 
+.external-id{
+    font-family: monospace;
+    font-size: 0.9em;
+}