From 3fbc49bd9d9e1634ebab5fefc3e8c7609bd04a42 Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Sun, 18 Nov 2018 14:44:51 +0100 Subject: Port CSS fixes --- source/99_result/branches.xsl | 5 +++-- source/99_result/leaves.xsl | 5 +++-- source/99_result/main.css | 44 ++++++++++++++++++++++++++----------------- source/99_result/start.xsl | 5 +++-- 4 files changed, 36 insertions(+), 23 deletions(-) diff --git a/source/99_result/branches.xsl b/source/99_result/branches.xsl index ec639c3..94273ac 100644 --- a/source/99_result/branches.xsl +++ b/source/99_result/branches.xsl @@ -24,12 +24,13 @@

- » + + » +

-

diff --git a/source/99_result/leaves.xsl b/source/99_result/leaves.xsl index 3f22aa1..fb564f6 100644 --- a/source/99_result/leaves.xsl +++ b/source/99_result/leaves.xsl @@ -23,12 +23,13 @@

- » + + » +

-

diff --git a/source/99_result/main.css b/source/99_result/main.css index 95de458..99af16a 100644 --- a/source/99_result/main.css +++ b/source/99_result/main.css @@ -1,10 +1,12 @@ -@font-face{font-family:'Vollkorn';font-style:normal;src:local('Vollkorn Regular'), local('Vollkorn-Regular'), url(https://static.kummerlaender.eu/font/Vollkorn-Regular.woff2) format('woff2'), url(https://static.kummerlaender.eu/font/Vollkorn-Regular.woff) format('woff'), url(https://static.kummerlaender.eu/font/Vollkorn-Regular.ttf) format('truetype')} -@font-face{font-family:'Vollkorn';font-style:italic;src:local('Vollkorn Italic'), local('Vollkorn-Italic'), url(https://static.kummerlaender.eu/font/Vollkorn-Italic.woff2) format('woff2'), url(https://static.kummerlaender.eu/font/Vollkorn-Italic.woff) format('woff'), url(https://static.kummerlaender.eu/font/Vollkorn-Italic.ttf) format('truetype')} -@font-face{font-family:'Oswald Regular';font-style:normal;src:local('Oswald Regular'), url(https://static.kummerlaender.eu/font/Oswald-Regular.woff2) format('woff2'), url(https://static.kummerlaender.eu/font/Oswald-Regular.woff) format('woff'), url(https://static.kummerlaender.eu/font/Oswald-Regular.ttf) format('truetype')} +@font-face{font-family:'Vollkorn';font-style:normal;font-weight:normal;src:local('Vollkorn'), url(https://static.kummerlaender.eu/font/Vollkorn-Regular.woff2) format('woff2'), url(https://static.kummerlaender.eu/font/Vollkorn-Regular.woff) format('woff'), url(https://static.kummerlaender.eu/font/Vollkorn-Regular.ttf) format('truetype')} +@font-face{font-family:'Vollkorn';font-style:italic;font-weight:normal;src:local('Vollkorn'), url(https://static.kummerlaender.eu/font/Vollkorn-Italic.woff2) format('woff2'), url(https://static.kummerlaender.eu/font/Vollkorn-Italic.woff) format('woff'), url(https://static.kummerlaender.eu/font/Vollkorn-Italic.ttf) format('truetype')} +@font-face{font-family:'Oswald';font-style:normal;font-weight:normal;src:local('Oswald'), url(https://static.kummerlaender.eu/font/Oswald-Regular.woff2) format('woff2'), url(https://static.kummerlaender.eu/font/Oswald-Regular.woff) format('woff'), url(https://static.kummerlaender.eu/font/Oswald-Regular.ttf) format('truetype')} +@font-face{font-family:'Oswald';font-style:normal;font-weight:bold;src:local('Oswald'), url(https://static.kummerlaender.eu/font/Oswald-Bold.woff2) format('woff2'), url(https://static.kummerlaender.eu/font/Oswald-Bold.woff) format('woff'), url(https://static.kummerlaender.eu/font/Oswald-Bold.ttf) format('truetype')} + body{margin:0;padding:0;font-size:1.1em;font-family:'Vollkorn',sans-serif;color:#272828;word-wrap:break-word} a, a:visited{text-decoration:underline;color:#272828} a:hover{color:black} -h1, h2{font-family:'Oswald Regular',sans-serif;margin:0;color:#272828;font-weight:bold} +h1, h2{font-family:'Oswald',sans-serif;margin:0;color:#272828;font-weight:bold} h1 a, h2 a{text-decoration:none} p{margin:0 0 .5em 0;text-align:justify;line-height:1.75em} ul{margin:0;padding:0;list-style:none} @@ -13,18 +15,17 @@ pre{font-family:monospace;padding:1em;border-radius:.75em;color:#f8f8f2;backgrou code{font-family:monospace;margin:0 .1em;padding:0 .5em;border:.1em solid #e3e8e8;background-color:#f8f8f8;border-radius:.3em} sup{vertical-align:baseline;position:relative;top:-0.4em} sub{vertical-align:baseline;position:relative;top:0.4em} -.full{width:100%} -.center{width:45em;margin:0 auto;overflow:hidden} -.border_bottom{border-bottom:.3em solid #e3e8e8} -.border_top{border-top:.3em solid #e3e8e8} -#navigation{font-family:'Oswald Regular',sans-serif;padding:2em 0 0 0} + +#navigation{font-family:'Oswald',sans-serif;padding:2em 0 0 0} #navigation h1{font-size:1.1em;line-height:1.5em;font-weight:bold;float:left;padding:0 .2em 0 0;margin:0} #navigation ul{float:right;font-size:1.1em} + #content p{margin-bottom:.7em;text-align:justify} -#content h2{font-size:1.4em;margin:0;color:#F80} -#content h2 a, h2 span{font-size:.8em;text-decoration:none !important;color:#272828;font-weight:normal;display:inline-block;vertical-align:middle;max-width:95%} +#content h2{font:normal 1.2em 'Oswald',sans-serif;line-height:1em;margin:0;text-align:left} +#content h2 .arrow{font:bold 1.4em 'Oswald',sans-serif;color:#F80} +#content h2 a{text-decoration:none !important;display:inline-block;vertical-align:middle;max-width:95%} #content h2 a:hover{text-decoration:underline !important} -#content h3, #content h4{font-size:1.05em;font-family:'Oswald Regular',sans-serif;font-weight:normal;padding-bottom:.2em;margin:.8em 0 .5em 0;border-bottom:.1em solid #e3e8e8} +#content h3, #content h4{font-size:1.05em;font-family:'Oswald',sans-serif;font-weight:normal;padding-bottom:.2em;margin:.8em 0 .5em 0;border-bottom:.1em solid #e3e8e8} #content .article{border-bottom:.3em dotted #e3e8e8;padding-bottom:.5em;margin-top:1em;text-align:justify} #content .article:last-child{border:none} #content .article a{text-decoration:underline;color:#272828} @@ -43,10 +44,16 @@ sub{vertical-align:baseline;position:relative;top:0.4em} #content img.clear{border:0;max-width:100%} #content p.math{padding:0.5em;line-height:0;text-align:center} #content span.math{line-height:0} -#footer{font-family:'Oswald Regular',sans-serif;padding-top:.3em} + +#footer{font-family:'Oswald',sans-serif;padding-top:.3em} #footer a{text-decoration:none;color:#272828} #footer a:hover{text-decoration:underline} #footer ul{float:right;padding:0} + +.full{width:100%} +.center{width:45em;margin:0 auto;overflow:hidden} +.border_bottom{border-bottom:.3em solid #e3e8e8} +.border_top{border-top:.3em solid #e3e8e8} .columns{column-count:2;-moz-column-count:2;-webkit-column-count:2;column-gap:1em;-moz-column-gap:1em;-webkit-column-gap:1em} .column{-webkit-column-break-inside:avoid;break-inside:avoid-column;overflow:hidden} .buttonlist{overflow:hidden} @@ -56,13 +63,14 @@ sub{vertical-align:baseline;position:relative;top:0.4em} .prettylist li{display:block;padding:.5em 0;column-break-inside:avoid;-webkit-column-break-inside:avoid;-moz-column-break-inside:avoid;overflow:hidden} .prettylist li a{margin-left:.2em;color:#272828;text-decoration:none} .prettylist li a:hover{text-decoration:underline} -.prettylist li span.title{font-family:'Oswald Regular',sans-serif;font-weight:normal} -.prettylist li span.arrow{font-family:'Oswald Regular',sans-serif;font-style:normal;font-size:1.4em;color:#F80} +.prettylist li span.title{font-family:'Oswald',sans-serif;font-weight:normal} +.prettylist li span.arrow{font-family:'Oswald',sans-serif;font-style:normal;font-size:1.4em;color:#F80} .prettylist li span.text{display:block;line-height:1.75em;text-align:justify} .menuhead{border-bottom:0.1em solid #e3e8e8;overflow:hidden;padding:0;margin-top:0.8em} -.menuhead h3{float:left;font-family:'Oswald Regular',sans-serif;padding:0.4em 0 0 0;margin:0 !important;border:none !important} +.menuhead h3{float:left;font-family:'Oswald',sans-serif;padding:0.4em 0 0 0;margin:0 !important;border:none !important} .menuhead ul{float:right;padding:0;font-size:1.1em} -@media screen and (max-width:46em){ + +@media screen and (max-width:51em){ #content .article h2 a{max-width:90%} #navigation{padding:.3em 0 0 0} .center{width:98%} @@ -72,4 +80,6 @@ sub{vertical-align:baseline;position:relative;top:0.4em} @media screen and (max-width:30em){ #navigation h1{float:none} #navigation ul{float:none} + #content p{text-align:left} + #content img{float:none !important} } diff --git a/source/99_result/start.xsl b/source/99_result/start.xsl index aceb044..34be5cc 100644 --- a/source/99_result/start.xsl +++ b/source/99_result/start.xsl @@ -21,12 +21,13 @@

- » + + » +

-

-- cgit v1.2.3