diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-17 10:35:16 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-17 10:35:16 +0100 |
| commit | 21e99bf7b6a1855f02f5622cae505fb094ce7e77 (patch) | |
| tree | ff1c7af1dcb667a7d0822721a5458e5e39a89c1e | |
| parent | 742152206bef716b9b6afa688b18b81dc7cb5db2 (diff) | |
| parent | 2bef0e72fe3bf3b33062739563ba27ee11ea53df (diff) | |
| download | Chimère - projet Saclay-21e99bf7b6a1855f02f5622cae505fb094ce7e77.tar.bz2 Chimère - projet Saclay-21e99bf7b6a1855f02f5622cae505fb094ce7e77.zip | |
Merge branch 'master-v3.0' into saclay-v3.0
| -rw-r--r-- | fixtures/initial_data_old.json (renamed from fixtures/initial_data.json) | 0 | ||||
| -rw-r--r-- | static/saclay/css/styles.css | 4 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fixtures/initial_data.json b/fixtures/initial_data_old.json index 814e8e0..814e8e0 100644 --- a/fixtures/initial_data.json +++ b/fixtures/initial_data_old.json diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css index 2c8be22..d350943 100644 --- a/static/saclay/css/styles.css +++ b/static/saclay/css/styles.css @@ -280,7 +280,9 @@ h3.warn{ width:30px; height:30px; top:5px; - background-image: none; + background-image: url("../../chimere/img/close.png"); + background-repeat: no-repeat; + background-position: bottom center; background-color: transparent; border: 0 solid; } |