From e3a5f3a574efde4117da8715eb1d293610d3a171 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Wed, 22 Jan 2014 18:12:14 +0100
Subject: [PATCH] =?utf8?q?CSS-Datei=20f=C3=BCr=20das=20Screen-Layout=20opt?=
 =?utf8?q?imiert:=20unn=C3=B6tige=20Dopplungen=20vermieden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/wro.xml  |  3 ---
 src/main/webapp/less/phone.less  | 12 ------------
 src/main/webapp/less/screen.less | 30 ++++++++++++++++++++++++++++++
 src/main/webapp/less/tablet.less |  8 --------
 src/main/webapp/less/tiny.less   |  4 ----
 5 files changed, 30 insertions(+), 27 deletions(-)
 delete mode 100644 src/main/webapp/less/phone.less
 delete mode 100644 src/main/webapp/less/tablet.less
 delete mode 100644 src/main/webapp/less/tiny.less

diff --git a/src/main/webapp/WEB-INF/wro.xml b/src/main/webapp/WEB-INF/wro.xml
index e4e5f541..6ed9a544 100644
--- a/src/main/webapp/WEB-INF/wro.xml
+++ b/src/main/webapp/WEB-INF/wro.xml
@@ -9,9 +9,6 @@
   <group name="screen">
     <css>/less/variables.less</css>
     <css>/less/screen.less</css>
-    <css>/less/tablet.less</css>
-    <css>/less/phone.less</css>
-    <css>/less/tiny.less</css>
   </group>
 
   <!-- Diese werden nur für die explizite Auswahl eines Stylings benötigt -->
diff --git a/src/main/webapp/less/phone.less b/src/main/webapp/less/phone.less
deleted file mode 100644
index 9016b7ca..00000000
--- a/src/main/webapp/less/phone.less
+++ /dev/null
@@ -1,12 +0,0 @@
-@media (max-width: @maxphone)
-{
-  @import 'screen/head.less';
-  @import 'screen/navigation-submenu.less';
-  @import 'screen/footer-sticky.less';
-  @import 'tablet/head.less';
-  @import 'phone/typo.less';
-  @import 'phone/layout.less';
-  @import 'phone/head.less';
-  @import 'phone/navigation.less';
-  @import 'phone/footer.less';
-}
diff --git a/src/main/webapp/less/screen.less b/src/main/webapp/less/screen.less
index 5e0c701d..c2c89852 100644
--- a/src/main/webapp/less/screen.less
+++ b/src/main/webapp/less/screen.less
@@ -1,3 +1,7 @@
+@import 'screen/head.less';
+@import 'screen/navigation-submenu.less';
+@import 'screen/footer-sticky.less';
+
 @media (min-width: @minscreen)
 {
   @import 'screen/typo.less';
@@ -8,4 +12,30 @@
   @import 'screen/marginal.less';
   @import 'screen/footer.less';
   @import 'screen/footer-sticky.less';
+  @media (max-width: @maxtablet)
+  {
+    @import 'tablet/typo.less';
+    @import 'tablet/layout.less';
+    @import 'tablet/navigation.less';
+    @import 'tablet/footer.less';
+  }
+}
+
+@media (max-width: @maxtablet)
+{
+  @import 'tablet/head.less';
+}
+
+@media (max-width: @maxphone)
+{
+  @import 'phone/typo.less';
+  @import 'phone/layout.less';
+  @import 'phone/head.less';
+  @import 'phone/navigation.less';
+  @import 'phone/footer.less';
+}
+
+@media (max-width: @maxtiny)
+{
+  @import 'tiny/layout.less';
 }
diff --git a/src/main/webapp/less/tablet.less b/src/main/webapp/less/tablet.less
deleted file mode 100644
index c7e57dd7..00000000
--- a/src/main/webapp/less/tablet.less
+++ /dev/null
@@ -1,8 +0,0 @@
-@media screen and (min-width: @minscreen) and (max-width: @maxtablet)
-{
-  @import 'tablet/typo.less';
-  @import 'tablet/layout.less';
-  @import 'tablet/head.less';
-  @import 'tablet/navigation.less';
-  @import 'tablet/footer.less';
-}
diff --git a/src/main/webapp/less/tiny.less b/src/main/webapp/less/tiny.less
deleted file mode 100644
index 13132b05..00000000
--- a/src/main/webapp/less/tiny.less
+++ /dev/null
@@ -1,4 +0,0 @@
-@media (max-width: @maxtiny)
-{
-  @import 'tiny/layout.less';
-}
-- 
2.20.1