Mercurial > hg > nginx-site
changeset 1308:f0383f5cfbb8
Design: reworked main layout.
| author | Valentin Bartenev <vbart@nginx.com> |
|---|---|
| date | Fri, 26 Sep 2014 19:12:57 +0400 |
| parents | c9e57a486a4b |
| children | 59f7fb43e39c |
| files | binary/nginx.clean.gif binary/nginx.gif binary/nginx.png xsls/body.xsls xsls/style.xsls |
| diffstat | 5 files changed, 53 insertions(+), 54 deletions(-) [+] |
line wrap: on
line diff
--- a/xsls/body.xsls Fri Sep 26 17:34:29 2014 +0400 +++ b/xsls/body.xsls Fri Sep 26 19:12:57 2014 +0400 @@ -16,53 +16,33 @@ } <body> - <table width="100%"> - <tr> - <td width="70%"> - <div id="banner"> - X:if "@lang = 'he'" { X:attribute "class" { X:text{ltr} } } - <center> - <table> - <tr> - <td align="center"> - <strong>Join our upcoming user conference, - <a href="http://nginx.com/nginxconf/?utm_source=nginxorg&utm_medium=banner&utm_campaign=nginxconf2014" - onClick="ga('send', 'event', 'banner', 'click', 'nginxconf14');">nginx.conf 2014</a>.</strong> - </td> - </tr> - <tr> - <td align="center"> - <i>Learn, share, and celebrate 10 years of NGINX! Oct. 20-22, - Hyatt Regency San Francisco Airport.</i> - </td> - </tr> - </table> - </center> - </div> - </td> - <td align="right"> + + <div id="banner"> + X:if "@lang = 'he'" { X:attribute "class" { X:text{ltr} } } + <strong>Join our upcoming user conference, + <a href="http://nginx.com/nginxconf/?utm_source=nginxorg&utm_medium=banner&utm_campaign=nginxconf2014" onClick="ga('send', 'event', 'banner', 'click', 'nginxconf14');">nginx.conf 2014</a></strong><br/> + <em>Learn, share, and celebrate 10 years of NGINX! Oct. 20-22, + Hyatt Regency San Francisco Airport.</em> + </div> + + <div id="main"> + <div id="menu"> + <h1> X:if "@lang = 'he'" { X:attribute "align" { X:text{left} } } - <a href="http://nginx.org"> - <img src="http://nginx.org/nginx.gif" alt="nginx" border="0"/> + <a href="/"> + <img src="/nginx.png" alt="nginx" /> </a> - </td> - </tr> - - <tr> - <td width="70%"><center><h3> - !{@name} X:if "$YEAR" { X:text{: } !{$YEAR} } - </h3></center></td> + </h1> + <div> + !! "document(concat($XML, '/menu.xml')) + /menus/menu[@lang = $lang]/item"; + </div> + </div> - <td rowspan="2" align="{$MENU_ALIGN}" valign="top"> - <br/> - - !! "document(concat($XML, '/menu.xml')) - /menus/menu[@lang = $lang]/item"; - </td> - - </tr> - - <tr><td valign="top"> + <div id="content"> + <h2> + !{@name} X:if "$YEAR" { X:text{: } !{$YEAR} } + </h2> X:if "$ORIGIN and document(concat($XML, '/', $ORIGIN))/*/@rev and (not(@rev) or @@ -130,10 +110,8 @@ </td></tr></table> } - - </td></tr> - - </table> + </div> + </div> </body> }
--- a/xsls/style.xsls Fri Sep 26 17:34:29 2014 +0400 +++ b/xsls/style.xsls Fri Sep 26 19:12:57 2014 +0400 @@ -11,8 +11,31 @@ body { background: white; color: black; font-family: Georgia, serif; + text-align: center; margin: 0; - padding: .5em .5em .5em 1.5em; } + padding: 0; } + #banner { background: black; + color: #F2F2F2; + padding: .3em 0; + box-shadow: 0 5px 10px black; } + #banner a { color: #00B140; } + #main { text-align: left; + margin: 0 auto; + min-width: 32em; + max-width: 64em; } + #menu { float: right; + width: 11em; + padding: 0 .5em 1em .5em; + border-left: 2px solid #DDD; } + #content { margin-right: 13.5em; + padding: 0 .2em 0 1.5em; } + h1 { display: block; + font-size: 3em; + text-align: left; + margin: 0; + margin-bottom: .5em; } + h1 img { width: 100%; } + h2 { text-align: center; } p { text-align: justify; } table.news p { margin-top: 0; } table.news td { vertical-align: baseline; } @@ -21,11 +44,10 @@ white-space: nowrap; } table.donors td { vertical-align: baseline; } table.donors li { text-align: left; } - div.directive, #banner { - background: #F2F2F2; + div.directive { background: #F2F2F2; margin: 1em 0 1em -1em; - padding: .7em .7em .7em 1em; } - div.directive { border-top: 2px solid #DDD; } + padding: .7em .7em .7em 1em; + border-top: 2px solid #DDD; } div.directive th { padding-left: 0; padding-right: .5em; vertical-align: baseline; @@ -36,7 +58,6 @@ margin: 0; } div.directive p { margin: .5em 0 0 .1em; font-size: .8em; } - #banner { margin: 0 0 0 -1em; } a.notrans { color: gray; text-decoration:none; } span.initial { font-size: 200%;