From fdc5eae5779d165192dc4391ddd6881b00f2c6db Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Wed, 3 Oct 2018 17:28:46 +0200
Subject: [PATCH] Anomalie #6355
---
desktop.php | 11 ++++++-----
js/resources/css/amda.css | 5 +++++
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/desktop.php b/desktop.php
index 54218fc..f7128e3 100644
--- a/desktop.php
+++ b/desktop.php
@@ -24,22 +24,23 @@
<meta http-equiv="EXPIRES" content="-1">
<title><?php if (defined('TITLE')) { echo TITLE; } else { echo 'AMDANEW'; } ?></title>
-
+ <!-- Important ! the order of css loading : ext-all.css - should be the first -->
+ <link rel="stylesheet" type="text/css" href="js/lib/ext/resources/css/ext-all.css" />
<link rel="stylesheet" type="text/css" href="js/resources/css/desktop.css" />
<link rel="stylesheet" type="text/css" href="js/resources/css/amda.css" />
- <link rel="stylesheet" type="text/css" href="js/lib/ext/resources/css/ext-all.css" />
+
<link rel="icon" href="favicon.ico" type="image/x-icon">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<!-- <script type="text/javascript" src="js/lib/ext/builds/ext-core.js"></script> -->
<!-- <script type="text/javascript" src="js/lib/ext/bootstrap.js"></script> -->
<!-- <script type="text/javascript" src="js/lib/ext/ext-all-debug-w-comments.js"></script> -->
- <script type="text/javascript" src="js/lib/ext/ext-all.js"></script>
-<!-- <script type="text/javascript" src="js/lib/ext/ext-all-dev.js"> -->
+ <script type="text/javascript" src="js/lib/ext/ext-all.js"></script>
+<!-- <script type="text/javascript" src="js/lib/ext/ext-all-dev.js"></script> -->
<!-- <script type="text/javascript" src="js/lib/ext-override.js"></script> -->
<!-- Direct API -->
- <script type="text/javascript" src="php/api.php"></script>
+ <script type="text/javascript" src="php/api.php"></script>
<!-- <script src="help/movies/Resources/scripts/prototype.js" language="JavaScript" type="text/javascript"></script>
diff --git a/js/resources/css/amda.css b/js/resources/css/amda.css
index 147c347..35817fc 100644
--- a/js/resources/css/amda.css
+++ b/js/resources/css/amda.css
@@ -1,5 +1,10 @@
/* This is amda specific stylesheet*/
+/* Safari 11 fieldset collapse/expose bug */
+.x-fieldset {
+ overflow : visible;
+}
+
.window-active .x-window-header {
background-color:#6c0985;
}
--
libgit2 0.21.2