From 98959d7288268c8c3b7f062ac343058c4bd60c57 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Mon, 13 Jan 2014 14:04:09 +0100 Subject: [PATCH] =?utf8?q?Basis-Layout=20im=20Hinblick=20auf=20kleine=20Bi?= =?utf8?q?ldschirme=20=C3=BCberarbeitet?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/templates/html5page.jsp | 2 +- src/main/webapp/WEB-INF/wro.xml | 1 + src/main/webapp/less/base/footer.less | 4 ++-- src/main/webapp/less/base/head.less | 3 +-- src/main/webapp/less/base/navigation.less | 14 ++++++++------ src/main/webapp/less/base/typo.less | 10 +++++----- src/main/webapp/less/phone/navigation.less | 6 +----- src/main/webapp/less/phone/typo.less | 1 - src/main/webapp/less/screen/footer.less | 1 + src/main/webapp/less/screen/navigation.less | 4 ++++ src/main/webapp/less/screen/typo.less | 7 +++++++ 11 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 src/main/webapp/less/screen/typo.less diff --git a/src/main/webapp/WEB-INF/templates/html5page.jsp b/src/main/webapp/WEB-INF/templates/html5page.jsp index de699e27..2e5cc80a 100644 --- a/src/main/webapp/WEB-INF/templates/html5page.jsp +++ b/src/main/webapp/WEB-INF/templates/html5page.jsp @@ -24,7 +24,7 @@ Jump to navigation -
+
diff --git a/src/main/webapp/WEB-INF/wro.xml b/src/main/webapp/WEB-INF/wro.xml index 9e8990ba..db202706 100644 --- a/src/main/webapp/WEB-INF/wro.xml +++ b/src/main/webapp/WEB-INF/wro.xml @@ -16,6 +16,7 @@ + /less/screen/typo.less /less/screen/layout.less /less/screen/head.less /less/screen/navigation.less diff --git a/src/main/webapp/less/base/footer.less b/src/main/webapp/less/base/footer.less index 10ba1967..16d95a8e 100644 --- a/src/main/webapp/less/base/footer.less +++ b/src/main/webapp/less/base/footer.less @@ -10,13 +10,13 @@ { font-size: 137.5%; /** 22 px */ float: left; - margin: 0 1em 1em 0; + margin: .5em 1em 0 0; } #footerlinks #copyright { - float: right; color: @schrift; margin: 0; + width: 100%; } #footerlinks a.f { diff --git a/src/main/webapp/less/base/head.less b/src/main/webapp/less/base/head.less index 6c9da2df..750995a6 100644 --- a/src/main/webapp/less/base/head.less +++ b/src/main/webapp/less/base/head.less @@ -23,7 +23,6 @@ } #slogan { + display: block; color: @normal; - white-space: nowrap; - padding-top: 1em; } diff --git a/src/main/webapp/less/base/navigation.less b/src/main/webapp/less/base/navigation.less index 4cfdc9c7..60874ab6 100644 --- a/src/main/webapp/less/base/navigation.less +++ b/src/main/webapp/less/base/navigation.less @@ -45,7 +45,7 @@ h2.nav #breadcrumb strong.b.title { float: left; - margin: 0 0.5em .6em 0; + margin: 0 0.5em 0 0; } #breadcrumb ol.b { @@ -85,13 +85,15 @@ h2.nav #breadcrumb a.hide { position: static; - float: right; - margin: 0 0 0 2em; - white-space: nowrap; } -#breadcrumb div.b +#breadcrumb a.hide:before +{ + content: ""; + display: table; + clear: both; +} +#breadcrumb hr.b { - height: 1px; /** Sonst greift das "clear" nicht unter IE6 */ clear: both; } diff --git a/src/main/webapp/less/base/typo.less b/src/main/webapp/less/base/typo.less index 2d6c2848..a8d2add4 100644 --- a/src/main/webapp/less/base/typo.less +++ b/src/main/webapp/less/base/typo.less @@ -7,7 +7,7 @@ body .droid; letter-spacing: 0; line-height: 1.5em; - padding: 1em 2em 1em 3em; + padding: .5em 1em 1em 1.5em; background-color: @hintergrund; } h1, h2, h3, h4, h5, h6 @@ -18,10 +18,10 @@ h1, h2, h3, h4, h5, h6 } h1 { - font-size: 187.5%; /** 30 px */ - line-height: 1em; /** 30px */ - padding: 0 0 .4em 0; /** 0 0 12px 0 */ - margin: 1em 0 .3em 0; /** 30px 0 9px 0 */ + font-size: 125%; /** 20 px */ + line-height: 1em; /** 20px */ + padding: 0 0 .4em 0; /** 0 0 8px 0 */ + margin: 1em 0 .3em 0; /** 20px 0 6px 0 */ } h2 { diff --git a/src/main/webapp/less/phone/navigation.less b/src/main/webapp/less/phone/navigation.less index 6a8f0509..2db2b0a0 100644 --- a/src/main/webapp/less/phone/navigation.less +++ b/src/main/webapp/less/phone/navigation.less @@ -1,11 +1,7 @@ -#breadcrumb .b +#breadcrumb { display: none; } -#breadcrumb a.hide -{ - margin: 0; -} #menu, #submenu diff --git a/src/main/webapp/less/phone/typo.less b/src/main/webapp/less/phone/typo.less index a8f1489a..88943c2a 100644 --- a/src/main/webapp/less/phone/typo.less +++ b/src/main/webapp/less/phone/typo.less @@ -1,5 +1,4 @@ body { font-size: 87.5%; /** 14px */ - padding: .5em 1em 1em 1.5em; } diff --git a/src/main/webapp/less/screen/footer.less b/src/main/webapp/less/screen/footer.less index 513fdd26..c11be8ce 100644 --- a/src/main/webapp/less/screen/footer.less +++ b/src/main/webapp/less/screen/footer.less @@ -29,6 +29,7 @@ { position: absolute; float: none; + width: auto; right: .625em; top: -1em; /** 30px */ line-height: 1.4em; /* 42px */ diff --git a/src/main/webapp/less/screen/navigation.less b/src/main/webapp/less/screen/navigation.less index 52c2b43a..e393589b 100644 --- a/src/main/webapp/less/screen/navigation.less +++ b/src/main/webapp/less/screen/navigation.less @@ -66,6 +66,10 @@ { position: absolute; } +#breadcrumb > hr.b +{ + display: none; +} #nav > h1.nav, #nav > h2.nav.menu diff --git a/src/main/webapp/less/screen/typo.less b/src/main/webapp/less/screen/typo.less new file mode 100644 index 00000000..1a1b2260 --- /dev/null +++ b/src/main/webapp/less/screen/typo.less @@ -0,0 +1,7 @@ +h1 +{ + font-size: 187.5%; /** 30 px */ + /** line-height: 1em; ** 30px */ + /** padding: 0 0 .4em 0; ** 0 0 12px 0 */ + /** margin: 1em 0 .3em 0; ** 30px 0 9px 0 */ +} -- 2.20.1