projects
/
website
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5b59959
)
Basis-Layout im Hinblick auf kleine Bildschirme überarbeitet
author
Kai Moritz
<kai@juplo.de>
Mon, 13 Jan 2014 13:04:09 +0000
(14:04 +0100)
committer
Kai Moritz
<kai@juplo.de>
Tue, 19 Jan 2016 16:45:40 +0000
(17:45 +0100)
src/main/webapp/WEB-INF/templates/html5page.jsp
patch
|
blob
|
history
src/main/webapp/WEB-INF/wro.xml
patch
|
blob
|
history
src/main/webapp/less/base/footer.less
patch
|
blob
|
history
src/main/webapp/less/base/head.less
patch
|
blob
|
history
src/main/webapp/less/base/navigation.less
patch
|
blob
|
history
src/main/webapp/less/base/typo.less
patch
|
blob
|
history
src/main/webapp/less/phone/navigation.less
patch
|
blob
|
history
src/main/webapp/less/phone/typo.less
patch
|
blob
|
history
src/main/webapp/less/screen/footer.less
patch
|
blob
|
history
src/main/webapp/less/screen/navigation.less
patch
|
blob
|
history
src/main/webapp/less/screen/typo.less
[new file with mode: 0644]
patch
|
blob
diff --git
a/src/main/webapp/WEB-INF/templates/html5page.jsp
b/src/main/webapp/WEB-INF/templates/html5page.jsp
index
de699e2
..
2e5cc80
100644
(file)
--- a/
src/main/webapp/WEB-INF/templates/html5page.jsp
+++ b/
src/main/webapp/WEB-INF/templates/html5page.jsp
@@
-24,7
+24,7
@@
<t:insertAttribute name="breadcrumb"/>
</ol>
<a class="hide" href="#navigation">Jump to navigation</a>
<t:insertAttribute name="breadcrumb"/>
</ol>
<a class="hide" href="#navigation">Jump to navigation</a>
- <
div class="b"></div
>
+ <
hr class="b" /
>
</div>
<main class="content cf">
<article id="content" class="main">
</div>
<main class="content cf">
<article id="content" class="main">
diff --git
a/src/main/webapp/WEB-INF/wro.xml
b/src/main/webapp/WEB-INF/wro.xml
index
9e8990b
..
db20270
100644
(file)
--- a/
src/main/webapp/WEB-INF/wro.xml
+++ b/
src/main/webapp/WEB-INF/wro.xml
@@
-16,6
+16,7
@@
</group>
<group name="screen">
</group>
<group name="screen">
+ <css>/less/screen/typo.less</css>
<css>/less/screen/layout.less</css>
<css>/less/screen/head.less</css>
<css>/less/screen/navigation.less</css>
<css>/less/screen/layout.less</css>
<css>/less/screen/head.less</css>
<css>/less/screen/navigation.less</css>
diff --git
a/src/main/webapp/less/base/footer.less
b/src/main/webapp/less/base/footer.less
index
10ba196
..
16d95a8
100644
(file)
--- 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;
{
font-size: 137.5%; /** 22 px */
float: left;
- margin:
0 1em 1em
0;
+ margin:
.5em 1em 0
0;
}
#footerlinks #copyright
{
}
#footerlinks #copyright
{
- float: right;
color: @schrift;
margin: 0;
color: @schrift;
margin: 0;
+ width: 100%;
}
#footerlinks a.f
{
}
#footerlinks a.f
{
diff --git
a/src/main/webapp/less/base/head.less
b/src/main/webapp/less/base/head.less
index
6c9da2d
..
750995a
100644
(file)
--- a/
src/main/webapp/less/base/head.less
+++ b/
src/main/webapp/less/base/head.less
@@
-23,7
+23,6
@@
}
#slogan
{
}
#slogan
{
+ display: block;
color: @normal;
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
4cfdc9c
..
60874ab
100644
(file)
--- 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;
#breadcrumb strong.b.title
{
float: left;
- margin: 0 0.5em
.6em
0;
+ margin: 0 0.5em
0
0;
}
#breadcrumb ol.b
{
}
#breadcrumb ol.b
{
@@
-85,13
+85,15
@@
h2.nav
#breadcrumb a.hide
{
position: static;
#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;
}
clear: both;
}
diff --git
a/src/main/webapp/less/base/typo.less
b/src/main/webapp/less/base/typo.less
index
2d6c284
..
a8d2add
100644
(file)
--- 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;
.droid;
letter-spacing: 0;
line-height: 1.5em;
- padding:
1em 2em 1em 3
em;
+ padding:
.5em 1em 1em 1.5
em;
background-color: @hintergrund;
}
h1, h2, h3, h4, h5, h6
background-color: @hintergrund;
}
h1, h2, h3, h4, h5, h6
@@
-18,10
+18,10
@@
h1, h2, h3, h4, h5, h6
}
h1
{
}
h1
{
- font-size: 1
87.5%; /** 3
0 px */
- line-height: 1em; /**
3
0px */
- padding: 0 0 .4em 0; /** 0 0
12
px 0 */
- margin: 1em 0 .3em 0; /**
30px 0 9
px 0 */
+ font-size: 1
25%; /** 2
0 px */
+ line-height: 1em; /**
2
0px */
+ padding: 0 0 .4em 0; /** 0 0
8
px 0 */
+ margin: 1em 0 .3em 0; /**
20px 0 6
px 0 */
}
h2
{
}
h2
{
diff --git
a/src/main/webapp/less/phone/navigation.less
b/src/main/webapp/less/phone/navigation.less
index
6a8f050
..
2db2b0a
100644
(file)
--- 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;
}
{
display: none;
}
-#breadcrumb a.hide
-{
- margin: 0;
-}
#menu,
#submenu
#menu,
#submenu
diff --git
a/src/main/webapp/less/phone/typo.less
b/src/main/webapp/less/phone/typo.less
index
a8f1489
..
88943c2
100644
(file)
--- 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 */
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
513fdd2
..
c11be8c
100644
(file)
--- a/
src/main/webapp/less/screen/footer.less
+++ b/
src/main/webapp/less/screen/footer.less
@@
-29,6
+29,7
@@
{
position: absolute;
float: none;
{
position: absolute;
float: none;
+ width: auto;
right: .625em;
top: -1em; /** 30px */
line-height: 1.4em; /* 42px */
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
52c2b43
..
e393589
100644
(file)
--- a/
src/main/webapp/less/screen/navigation.less
+++ b/
src/main/webapp/less/screen/navigation.less
@@
-66,6
+66,10
@@
{
position: absolute;
}
{
position: absolute;
}
+#breadcrumb > hr.b
+{
+ display: none;
+}
#nav > h1.nav,
#nav > h2.nav.menu
#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
(file)
index 0000000..
1a1b226
--- /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 */
+}