summaryrefslogtreecommitdiff
path: root/ishtar_common/static
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2014-11-28 11:30:02 +0100
committerÉtienne Loks <etienne.loks@proxience.com>2014-11-28 11:30:02 +0100
commita62abdcb0c6daa71bc8bef293c20d911a63ccc60 (patch)
treefc3cb300358ed90b4d08dac9a274bcc124dcec01 /ishtar_common/static
parent9dd0ba91bdd9c76b42f4d6b4791633d7eac95b4a (diff)
downloadIshtar-a62abdcb0c6daa71bc8bef293c20d911a63ccc60.tar.bz2
Ishtar-a62abdcb0c6daa71bc8bef293c20d911a63ccc60.zip
Merge action implementation (person and organization)
Diffstat (limited to 'ishtar_common/static')
-rw-r--r--ishtar_common/static/media/style.css19
1 files changed, 19 insertions, 0 deletions
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 23bc28832..b19366dc1 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -885,6 +885,10 @@ a.remove{
text-align:center;
}
+.form table td.check{
+ text-align:center;
+}
+
.inline-table input[type=text]{
width:60px;
}
@@ -913,3 +917,18 @@ a.remove{
height:50px;
padding:10px;
}
+
+#merge-table{
+ background-color:#fff;
+ width:700px;
+}
+
+#merge-table thead th{
+ text-align:center;
+ font-weight:bold;
+ border-bottom:1px solid #ccc;
+}
+
+#merge-table th.small{
+ width:80px;
+}