summaryrefslogtreecommitdiff
path: root/ishtar_common/static/media
diff options
context:
space:
mode:
authorValérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>2017-04-07 11:40:31 +0200
committerValérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>2017-04-07 11:40:31 +0200
commit655236dd5d04d6527184a58ef8622e75c73f8a65 (patch)
treef773b80964981c231c892ee5255b94285bc5620a /ishtar_common/static/media
parentdc08e5f643562a6ecf3b208c1e2cd44e5350af3c (diff)
parenta4f1766d2217b1a3bc4d1d17625d9d808eed7416 (diff)
downloadIshtar-655236dd5d04d6527184a58ef8622e75c73f8a65.tar.bz2
Ishtar-655236dd5d04d6527184a58ef8622e75c73f8a65.zip
Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar
Conflicts: archaeological_operations/templates/ishtar/sheet_operation.html
Diffstat (limited to 'ishtar_common/static/media')
-rw-r--r--ishtar_common/static/media/style.css15
1 files changed, 15 insertions, 0 deletions
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index adaf94200..011db3652 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -92,6 +92,15 @@ div.form {
border-bottom:1px solid #D14;
}
+.form .select2-container--default .select2-selection--multiple {
+ border: 1px solid #FFF;
+}
+
+.form .select2-container--default.select2-container--focus
+.select2-selection--multiple {
+ border:1px solid #D14;
+}
+
hr.spacer{
clear:both;
border:0;
@@ -315,6 +324,12 @@ ul.list{
line-height:16px;
}
+.centered{
+ text-align: center;
+ width: 100%;
+ display: inline-block;
+}
+
div.nav-button{
cursor:pointer;
width:15px;