From 1a775090b084d80ab52cd8f2810d2e88f52b03f7 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sat, 1 Jan 2022 20:27:05 +0100
Subject: [PATCH] CSS inclusion fix

---
 lam-packaging/debian/copyright                  |  4 ++--
 lam/copyright                                   |  4 ++--
 lam/lib/account.inc                             | 17 +----------------
 .../105_normalize.css => 010_normalize.css}     |  0
 .../{responsive/110_grid.css => 050_grid.css}   |  0
 .../120_lam.css => 100_lam-responsive.css}      |  0
 6 files changed, 5 insertions(+), 20 deletions(-)
 rename lam/style/{responsive/105_normalize.css => 010_normalize.css} (100%)
 rename lam/style/{responsive/110_grid.css => 050_grid.css} (100%)
 rename lam/style/{responsive/120_lam.css => 100_lam-responsive.css} (100%)

diff --git a/lam-packaging/debian/copyright b/lam-packaging/debian/copyright
index 7a7774d88..7bdd5f4b9 100644
--- a/lam-packaging/debian/copyright
+++ b/lam-packaging/debian/copyright
@@ -1199,7 +1199,7 @@ lib/3rdParty/duo/*.php                                               E  2019  Du
 graphics/webauthn.svg                                                F  2017  Duo Security, Inc.
 templates/lib/600_jquery.magnific-popup.js                           B  2016  Dmitry Semenov
 style/610_magnific-popup.css                                         B  2016  Dmitry Semenov
-style/responsive/105_normalize.css                                   B        Nicolas Gallagher and Jonathan Neal
-style/responsive/110_grid.css                                        B
+style/010_normalize.css                                              B        Nicolas Gallagher and Jonathan Neal
+style/050_grid.css                                                   B
 templates/lib/extra/jstree/*                                         B  2014  Ivan Bozhanov
 style/jstree/*                                                       B  2014  Ivan Bozhanov
diff --git a/lam/copyright b/lam/copyright
index ed853121f..c2efd3c15 100644
--- a/lam/copyright
+++ b/lam/copyright
@@ -1198,7 +1198,7 @@ lib/3rdParty/duo/*.php                                               E  2019  Du
 graphics/webauthn.svg                                                F  2017  Duo Security, Inc.
 templates/lib/600_jquery.magnific-popup.js                           B  2016  Dmitry Semenov
 style/610_magnific-popup.css                                         B  2016  Dmitry Semenov
-style/responsive/105_normalize.css                                   B        Nicolas Gallagher and Jonathan Neal
-style/responsive/110_grid.css                                        B
+style/010_normalize.css                                              B        Nicolas Gallagher and Jonathan Neal
+style/050_grid.css                                                   B
 templates/lib/extra/jstree/*                                         B  2014  Ivan Bozhanov
 style/jstree/*                                                       B  2014  Ivan Bozhanov
diff --git a/lam/lib/account.inc b/lam/lib/account.inc
index 39c050986..22da060cf 100644
--- a/lam/lib/account.inc
+++ b/lam/lib/account.inc
@@ -1869,22 +1869,7 @@ function printHeaderContents($title, $prefix) {
 	echo '<title>';
 	echo $title;
 	echo "</title>\n";
-	// include responsive CSS
-	$cssDirName = dirname(__FILE__) . '/../style/responsive';
-	$cssDir = dir($cssDirName);
-	$cssFiles = array();
-	$cssEntry = $cssDir->read();
-	while ($cssEntry !== false) {
-		if (substr($cssEntry, strlen($cssEntry) - 4, 4) == '.css') {
-			$cssFiles[] = $cssEntry;
-		}
-		$cssEntry = $cssDir->read();
-	}
-	sort($cssFiles);
-	foreach ($cssFiles as $cssEntry) {
-		echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"$prefix/style/responsive/$cssEntry\">\n";
-	}
-	// include all other CSS files
+	// include CSS files
 	$cssDirName = dirname(__FILE__) . '/../style';
 	$cssDir = dir($cssDirName);
 	$cssFiles = array();
diff --git a/lam/style/responsive/105_normalize.css b/lam/style/010_normalize.css
similarity index 100%
rename from lam/style/responsive/105_normalize.css
rename to lam/style/010_normalize.css
diff --git a/lam/style/responsive/110_grid.css b/lam/style/050_grid.css
similarity index 100%
rename from lam/style/responsive/110_grid.css
rename to lam/style/050_grid.css
diff --git a/lam/style/responsive/120_lam.css b/lam/style/100_lam-responsive.css
similarity index 100%
rename from lam/style/responsive/120_lam.css
rename to lam/style/100_lam-responsive.css