From 62baa4283e485b8d28c3e1cc429decb188dab9ab Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Tue, 24 Sep 2013 23:01:03 +0200 Subject: [PATCH] Typo Fertig? Rest mit lesscss!! --- src/main/webapp/css/base/typo.css | 69 +++++++++++++++++-------------- src/main/webapp/index.jsp | 6 +-- 2 files changed, 40 insertions(+), 35 deletions(-) diff --git a/src/main/webapp/css/base/typo.css b/src/main/webapp/css/base/typo.css index 02cdab22..1403333f 100644 --- a/src/main/webapp/css/base/typo.css +++ b/src/main/webapp/css/base/typo.css @@ -13,7 +13,7 @@ body font-family: 'DroidSerif', 'Times New Roman', 'Palatino Linotype' , serif; letter-spacing: 0; line-height: 1.5em; - padding: 1em; + padding: 1em 3em 1em 5em; background-color: #fff; } h1, h2, h3, h4, h5, h6 @@ -21,14 +21,15 @@ h1, h2, h3, h4, h5, h6 font-family: 'BPreplay', Helvetica, Arial, sans-serif; letter-spacing: 0; font-weight: bold; + color: #0ACF00; margin: 1em 0 .5em 0; /** 16px 0 8px 0 */ } h1 { - font-size: 137.5%; /** 22 px */ - line-height: 1em; /** 22px */ - padding: 0 0 .4545454545454545em 0; /** 0 0 10px 0 */ - margin: 3em 0 .363636363636em 0; /** 66px 0 8px 0 */ + 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 */ } h2 { @@ -45,6 +46,31 @@ h4 font-size: 87.5%; /** 14px */ line-height: 1.5em; /** 21px */ } +h1 a, h2 a, h3 a, h4 a +{ + color: #0ACF00; + border-style: none; +} +h1 a:hover, +h2 a:hover, +h3 a:hover, +h4 a:hover +{ + color: #078600; + border-bottom: 1px solid #078600; +} +h1 a:focus, +h2 a:focus, +h3 a:focus, +h4 a:focus, +h1 a:active, +h2 a:active, +h3 a:active, +h4 a:active +{ + color: #2D9B27; + border-bottom: 1px solid #2D9B27; +} p { line-height: 1.5em; /** 21px */ @@ -66,8 +92,6 @@ ol } li { - font-size: 87.5%; /** 14px */ - line-height: 1.5em; /** 20px */ padding-bottom: .25em; /** 2px */ } table, th, td @@ -87,27 +111,16 @@ hr } a { - border-bottom: 1px dotted #000; + color: #078600; + border-bottom: 1px dashed #078600; } -a:hover, -h1 a:hover -h2 a:hover -h3 a:hover -h4 a:hover +a:hover { - color: #0ACF00; - border-bottom: 1px solid #0ACF00; + color: #077600; + border-bottom: 1px solid #077600; } a:focus, -h1 a:focus, -h2 a:focus, -h3 a:focus, -h4 a:focus, -a:active, -h1 a:active, -h2 a:active, -h3 a:active, -h4 a:active +a:active { color: #078600; border-bottom: 1px solid #078600; @@ -116,12 +129,4 @@ a:visited { border-bottom: 1px dotted #077600; } -h1 a, -h2 a, -h3 a, -h4 a -{ - color: #000; - border-style: none; -} diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index d35a1953..6e555b9f 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -19,15 +19,15 @@

Branding

- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do + Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim - ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut + ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

-

H1:ÄäÖöÜüß@€¢

+

H1:ÄäÖöÜüß@€¢Link

ÄäÖöÜüß@€¢

-- 2.20.1