From 879e9fcd76f65107390bffa7d8c8999cb6c6a853 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Mon, 7 Oct 2013 11:31:12 +0200 Subject: Fix issue #165: @import CSS enlevés MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implique une modification des fichiers metadata.json pour les thèmes : ajout d'un champ "files" répertoriant les fichiers CSS à utiliser --- public/themes/default/metadata.json | 3 ++- public/themes/default/style.css | 3 --- public/themes/flat-design/metadata.json | 3 ++- public/themes/flat-design/style.css | 2 -- 4 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 public/themes/default/style.css delete mode 100644 public/themes/flat-design/style.css (limited to 'public') diff --git a/public/themes/default/metadata.json b/public/themes/default/metadata.json index 0fe31fd90..a69eab7ee 100644 --- a/public/themes/default/metadata.json +++ b/public/themes/default/metadata.json @@ -2,5 +2,6 @@ "name": "Default", "author": "Marien Fressinaud", "description": "Le thème par défaut pour FreshRSS", - "version": 0.1 + "version": 0.1, + "files": ["global.css", "freshrss.css", "fallback.css"] } \ No newline at end of file diff --git a/public/themes/default/style.css b/public/themes/default/style.css deleted file mode 100644 index 7e4f386d9..000000000 --- a/public/themes/default/style.css +++ /dev/null @@ -1,3 +0,0 @@ -@import url('global.css'); -@import url('freshrss.css'); -@import url('fallback.css'); diff --git a/public/themes/flat-design/metadata.json b/public/themes/flat-design/metadata.json index 3147ea53b..6b94d11c2 100644 --- a/public/themes/flat-design/metadata.json +++ b/public/themes/flat-design/metadata.json @@ -2,5 +2,6 @@ "name": "Flat design", "author": "Marien Fressinaud", "description": "Thème plat pour FreshRSS", - "version": 0.1 + "version": 0.1, + "files": ["global.css", "freshrss.css"] } \ No newline at end of file diff --git a/public/themes/flat-design/style.css b/public/themes/flat-design/style.css deleted file mode 100644 index c9d8551f4..000000000 --- a/public/themes/flat-design/style.css +++ /dev/null @@ -1,2 +0,0 @@ -@import url('global.css'); -@import url('freshrss.css'); \ No newline at end of file -- cgit v1.2.3