From 9e2bb4db1565e17eda1847b6a82ad819bdb32203 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Thu, 16 Jan 2014 10:35:04 +0100 Subject: [PATCH] =?utf8?q?Bildschirmbreiten=20f=C3=BCr=20die=20Media-Query?= =?utf8?q?-Weichen=20als=20LESS-Variablen=20definiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/wro.xml | 2 ++ src/main/webapp/less/base.less | 1 - src/main/webapp/less/phone.less | 3 +-- src/main/webapp/less/screen.less | 3 +-- src/main/webapp/less/tablet.less | 3 +-- src/main/webapp/less/tiny.less | 3 +-- src/main/webapp/less/variables.less | 8 ++++++++ 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/WEB-INF/wro.xml b/src/main/webapp/WEB-INF/wro.xml index 8dcf19d8..390b28f1 100644 --- a/src/main/webapp/WEB-INF/wro.xml +++ b/src/main/webapp/WEB-INF/wro.xml @@ -1,11 +1,13 @@ + /less/variables.less /less/base.less /js/prettify.js + /less/variables.less /less/screen.less /less/tablet.less /less/phone.less diff --git a/src/main/webapp/less/base.less b/src/main/webapp/less/base.less index c8ab1eec..f3a05859 100644 --- a/src/main/webapp/less/base.less +++ b/src/main/webapp/less/base.less @@ -1,4 +1,3 @@ -@import 'variables.less'; @import 'base/browserreset.less'; @import 'base/fonts.less'; @import 'base/util.less'; diff --git a/src/main/webapp/less/phone.less b/src/main/webapp/less/phone.less index 86d429b6..f14a170c 100644 --- a/src/main/webapp/less/phone.less +++ b/src/main/webapp/less/phone.less @@ -1,6 +1,5 @@ -@media screen and (max-width: 599px) +@media screen and (max-width: @maxphone) { - @import 'variables.less'; @import 'phone/typo.less'; @import 'phone/navigation.less'; } diff --git a/src/main/webapp/less/screen.less b/src/main/webapp/less/screen.less index 110dc86d..eae175a4 100644 --- a/src/main/webapp/less/screen.less +++ b/src/main/webapp/less/screen.less @@ -1,6 +1,5 @@ -@media screen and (min-width: 750px) +@media screen and (min-width: @minscreen) { - @import 'variables.less'; @import 'screen/typo.less'; @import 'screen/layout.less'; @import 'screen/head.less'; diff --git a/src/main/webapp/less/tablet.less b/src/main/webapp/less/tablet.less index 60456d96..7bd3ac64 100644 --- a/src/main/webapp/less/tablet.less +++ b/src/main/webapp/less/tablet.less @@ -1,6 +1,5 @@ -@media screen and (min-width: 750px) and (max-width: 939px) +@media screen and (min-width: @minscreen) and (max-width: @maxtablet) { - @import 'variables.less'; @import 'tablet/layout.less'; @import 'tablet/footer.less'; } diff --git a/src/main/webapp/less/tiny.less b/src/main/webapp/less/tiny.less index ef1470b5..3d339444 100644 --- a/src/main/webapp/less/tiny.less +++ b/src/main/webapp/less/tiny.less @@ -1,6 +1,5 @@ -@media screen and (max-width: 399px) +@media screen and (max-width: @maxtiny) { - @import 'variables.less'; @import 'tiny/typo.less'; @import 'tiny/navigation.less'; } diff --git a/src/main/webapp/less/variables.less b/src/main/webapp/less/variables.less index cdb90c79..19058314 100644 --- a/src/main/webapp/less/variables.less +++ b/src/main/webapp/less/variables.less @@ -17,6 +17,14 @@ @fehlerhell: tint(@fehler, 70%); +/** Bildschirmbreiten für Media-Query */ + +@minscreen: 750px; +@maxtablet: 939px; +@maxphone: 599px; +@maxtiny: 399px; + + /** Schriften */ .droid () -- 2.20.1