Module:Sidebar: Difference between revisions

← Older edit

@@ Line 53: / Line 53: @@
 end
--- do we want a navbar
--- will be wanted later for finding hlist
 local function has_navbar(navbar_mode, sidebar_name)
 	return navbar_mode ~= cfg.i18n.navbar_none and
@@ Line 87: / Line 85: @@
 -- there are a lot of list classes in the wild, so we add their TemplateStyles
 local function add_list_styles(args)
+	local frame = mw.getCurrentFrame()
 	local function add_list_templatestyles(htmlclass, templatestyles)
-		local frame = mw.getCurrentFrame()
 		if has_list_class(args, htmlclass) then
 			return frame:extensionTag{
@@ Line 97: / Line 95: @@
 		end
 	end
-	-- TODO: get hlist to the point where we can turn this on
-	-- see [[MediaWiki talk:Common.css/to do#Hlist]]
+	local plainlist_styles = add_list_templatestyles('plainlist', cfg.i18n.plainlist_templatestyles)
-	local plainlist_styles = add_list_templatestyles('plainlist', 'Plainlist/styles.css')
+	local hlist_styles = add_list_templatestyles('hlist', cfg.i18n.hlist_templatestyles)
+	-- a second workaround for [[phab:T303378]]
+	-- when that issue is fixed, we can actually use has_navbar not to emit the
+	-- tag here if we want
+	if has_navbar(args.navbar, args.name) and hlist_styles == '' then
+		hlist_styles = frame:extensionTag{
+			name = 'templatestyles', args = { src = cfg.i18n.hlist_templatestyles}
+		}
+	end
-	return plainlist_styles
+	-- hlist -> plainlist is best-effort to preserve old Common.css ordering. [hlist_note]
+	return hlist_styles .. plainlist_styles
 end
@@ Line 340: / Line 348: @@
 	return table.concat({
+		add_list_styles(args), -- see [hlist_note] above about ordering
 		base_templatestyles,
 		templatestyles,
 		child_templatestyles,
 		grandchild_templatestyles,
-		add_list_styles(args),
 		hiding_templatestyles,
 		tostring(root),
@@ Line 375: / Line 383: @@
 		:cssText(args.basestyle)
 		:cssText(args.listtitlestyle)
+		:cssText('color: var(--color-base)')
 		:cssText(args['list' .. num .. 'titlestyle'])
 		:node(title)