From 78fb5f460e2480622f29a1b3e3d8165f86f255d8 Mon Sep 17 00:00:00 2001 From: LouisGac Date: Tue, 7 Aug 2018 12:51:35 +0200 Subject: [PATCH] Fixed issue #13669: Stylesheet missing in themes/survey fruity --- themes/survey/bootswatch/config.xml | 1 - themes/survey/bootswatch/css/ajaxify.css | 24 ------------------------ themes/survey/fruity/config.xml | 6 +++++- themes/survey/vanilla/config.xml | 5 +++++ 4 files changed, 10 insertions(+), 26 deletions(-) delete mode 100644 themes/survey/bootswatch/css/ajaxify.css diff --git a/themes/survey/bootswatch/config.xml b/themes/survey/bootswatch/config.xml index 64c6f1177d6..e3d74ca16ab 100644 --- a/themes/survey/bootswatch/config.xml +++ b/themes/survey/bootswatch/config.xml @@ -32,7 +32,6 @@ --> - css/ajaxify.css css/theme.css css/custom.css diff --git a/themes/survey/bootswatch/css/ajaxify.css b/themes/survey/bootswatch/css/ajaxify.css deleted file mode 100644 index 0fb98747256..00000000000 --- a/themes/survey/bootswatch/css/ajaxify.css +++ /dev/null @@ -1,24 +0,0 @@ -.ajax_loading_indicator { - height: 6px; - position: fixed; - display:none; - top: 1px; - left: 0; - width: 100%; - width: 100vw; - z-index: 20000; - transition: opacity 500ms linear; - transition-delay: 1000ms; -} - - -.ajax_loading_indicator .ajax_loading_indicator { - display: none; - height: 8px; - border-radius: 1px; - -webkit-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; - /* Safari */ - -webkit-transition: width 1.6s; - transition: width 1.6s; -} diff --git a/themes/survey/fruity/config.xml b/themes/survey/fruity/config.xml index ff3c0d92b5c..dc08d91ce9f 100644 --- a/themes/survey/fruity/config.xml +++ b/themes/survey/fruity/config.xml @@ -29,10 +29,14 @@ Here the list of the css/js files to add to the template package. About packages in Yii: http://www.yiiframework.com/doc/api/1.1/CClientScript#packages-detail "css/variations/sea_green.css" will be updated via the theme variation options + + NOTE: The "add" tag also count as a "replace" tag. + Eg: css/theme.css will replace the vanilla css/theme.css + But, all files that are already added in vanilla will be also added here. + Eg: css/ajaxify.css is already added in vanilla, it doen't exist in this theme, so ne need to add it here. --> - css/ajaxify.css css/animate.css css/variations/sea_green.css css/theme.css diff --git a/themes/survey/vanilla/config.xml b/themes/survey/vanilla/config.xml index aa30f463dfd..a482e833219 100755 --- a/themes/survey/vanilla/config.xml +++ b/themes/survey/vanilla/config.xml @@ -29,6 +29,11 @@