Merge lp:~xubuntu-website/ubuntu-cdimage/xubuntu-assets into lp:ubuntu-cdimage

[Sean Davis]

Apply Xubuntu per-flavor CSS and favicon (LP: #1835023)

=== modified file 'lib/cdimage/tests/test_tree.py'
--- lib/cdimage/tests/test_tree.py	2019-10-18 23:41:43 +0000
+++ lib/cdimage/tests/test_tree.py	2019-11-15 10:12:08 +0000
@@ -304,6 +304,8 @@
              ["//cdimage.ubuntu.com/include/lubuntu/style.css"]),
             ("lubuntu-next",
              ["//cdimage.ubuntu.com/include/lubuntu/style.css"]),
+            ("xubuntu",
+             ["//cdimage.ubuntu.com/include/xubuntu/style.css"]),
         ):
             self.config["PROJECT"] = project
             publisher = Publisher(self.tree, "daily")
 
=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py	2019-10-16 10:34:22 +0000
+++ lib/cdimage/tree.py	2019-11-15 10:12:08 +0000
@@ -442,6 +442,8 @@
             return ["//releases.ubuntu.com/include/kubuntu.css"]
         if self.project in ("lubuntu", "lubuntu-next"):
             return ["//cdimage.ubuntu.com/include/lubuntu/style.css"]
+        if self.project == "xubuntu":
+            return ["//cdimage.ubuntu.com/include/xubuntu/style.css"]
         else:
             return ["https://assets.ubuntu.com/v1/" +
                     "vanilla-framework-version-1.8.0.min.css"]
@@ -1181,6 +1183,12 @@
                     "href=\"http://cdimage.ubuntu.com/include/lubuntu/"
                     "favicon.png\" />", file=header)
                 header_href = 'https://lubuntu.me/'
+            if self.project == "xubuntu":
+                print(
+                    "<link rel=\"icon\" type=\"image/png\" "
+                    "href=\"http://cdimage.ubuntu.com/include/xubuntu/"
+                    "favicon.png\" />", file=header)
+                header_href = 'https://xubuntu.org/'
             else:
                 header_href = 'http://www.ubuntu.com/'