From 0e42efd32b881104ec25be874d43bb0cec22a588 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sun, 13 Aug 2017 19:14:54 -0500 Subject: [PATCH] Fix core styles/javascript for base template --- tailbone/templates/base.mako | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/tailbone/templates/base.mako b/tailbone/templates/base.mako index c4f8b01d..22fedede 100644 --- a/tailbone/templates/base.mako +++ b/tailbone/templates/base.mako @@ -121,9 +121,9 @@ <%def name="favicon()"> <%def name="header_core()"> - ${base.core_javascript()} + ${self.core_javascript()} ${self.extra_javascript()} - ${base.core_styles(jquery_theme=self.jquery_theme)} + ${self.core_styles()} ${self.extra_styles()} @@ -143,13 +143,9 @@ <%def name="extra_javascript()"> -<%def name="core_styles(jquery_theme=None)"> +<%def name="core_styles()"> ${h.stylesheet_link(request.static_url('tailbone:static/css/normalize.css'))} - % if jquery_theme: - ${jquery_theme()} - % else: - ${self.jquery_dark_hive_theme()} - % endif + ${self.jquery_theme()} ${h.stylesheet_link(request.static_url('tailbone:static/css/jquery.ui.menubar.css'))} ${h.stylesheet_link(request.static_url('tailbone:static/css/jquery.loadmask.css'))} ${h.stylesheet_link(request.static_url('tailbone:static/css/jquery.ui.timepicker.css'))} @@ -162,14 +158,10 @@ ${h.stylesheet_link(request.static_url('tailbone:static/css/diffs.css'))} -<%def name="jquery_dark_hive_theme()"> +<%def name="jquery_theme()"> ${h.stylesheet_link('https://code.jquery.com/ui/1.11.4/themes/dark-hive/jquery-ui.css')} -## <%def name="jquery_smoothness_theme()"> -## ${h.stylesheet_link('https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.min.css')} -## - <%def name="extra_styles()"> <%def name="head_tags()">