# HG changeset patch # User Thierry Florac # Date 1526626022 -7200 # Node ID 2fd0a1c3e4e585f56a0e4dd6d5912188c05d3b53 # Parent 247403469d278d378d6c48cf0a5ff32b6e478e83 Don't make default skin use MyAMS CSS diff -r 247403469d27 -r 2fd0a1c3e4e5 src/pyams_default_theme/__init__.py --- a/src/pyams_default_theme/__init__.py Fri Apr 27 10:44:54 2018 +0200 +++ b/src/pyams_default_theme/__init__.py Fri May 18 08:47:02 2018 +0200 @@ -14,7 +14,7 @@ from fanstatic import Resource, Library -from pyams_skin import myams_css, myams +from pyams_skin import myams_js, bootstrap_css, bootstrap from pyramid.i18n import TranslationStringFactory _ = TranslationStringFactory('pyams_default_theme') @@ -24,11 +24,11 @@ pyams_default_theme_css = Resource(library, 'css/pyams-default.css', minified='css/pyams-default.min.css', - depends=[myams_css, ]) + depends=[bootstrap_css, ]) pyams_default_theme = Resource(library, 'js/pyams-default.js', minified='js/pyams-default.min.js', - depends=[myams, pyams_default_theme_css], + depends=[bootstrap, myams_js, pyams_default_theme_css], bottom=True)