From 1c17be10ae9f8d7e23cfe9ae4ac2b40c585a1272 Mon Sep 17 00:00:00 2001 From: opi Date: Wed, 27 May 2015 17:58:49 +0200 Subject: [PATCH] Responsive, 1ere passe. --- Services.mdwn | 10 +- ikiwiki.setup | 6 +- index.mdwn | 4 - local.css | 312 ++++++++++++++++++--------------------- templates/page.tmpl | 348 +++++++++++++++++++++++--------------------- 5 files changed, 336 insertions(+), 344 deletions(-) diff --git a/Services.mdwn b/Services.mdwn index 7339fa4..9d59bd4 100644 --- a/Services.mdwn +++ b/Services.mdwn @@ -10,20 +10,14 @@ var content = d3.select("#content"); var consensus_figure = content.append("figure") - .style("margin", "0") - .style("width", "45%") - .style("float", "left") - .style("text-align", "center"); + .attr('class', 'graph graph-consensus') consensus_figure.append("span") .attr("id", "consensus-pie"); consensus_figure.append("figcaption") .text(L10n.consensus_weight); var exit_figure = content.append("figure") - .style("margin", "0 5% 0 0") - .style("width", "44%") - .style("float", "left") - .style("text-align", "center"); + .attr('class', 'graph graph-exit') exit_figure.append("span") .attr("id", "exit-pie"); exit_figure.append("figcaption") diff --git a/ikiwiki.setup b/ikiwiki.setup index 7e81546..ad61bef 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -1,10 +1,10 @@ # IkiWiki::Setup::Yaml - YAML formatted setup file # # Setup file for ikiwiki. -# +# # Passing this to ikiwiki --setup will make ikiwiki generate # wrappers and build the wiki. -# +# # Remember to re-run ikiwiki --setup any time you edit this file. # # name of the wiki @@ -61,7 +61,7 @@ discussion: '0' # name of Discussion pages discussionpage: Discussion # generate HTML5? -html5: '0' +html5: '1' # only send cookies over SSL connections? sslcookie: '0' # extension to use for new pages diff --git a/index.mdwn b/index.mdwn index 6f94cf1..d9756ae 100644 --- a/index.mdwn +++ b/index.mdwn @@ -1,9 +1,5 @@ [[!meta title="Nos oignons : nœuds de sortie Tor financés par la communauté"]] -[[!meta stylesheet="assets/home" rel="stylesheet"]] -
-
-
Nœuds de sortie Tor financés par la communauté. [[En savoir plus…|À_propos]]
Tor exit nodes funded by the community. [[Learn more…|À_propos.en]]
diff --git a/local.css b/local.css index e36a4d9..c3c3c90 100644 --- a/local.css +++ b/local.css @@ -31,16 +31,32 @@ src: local('Inconsolata'), local('Inconsolata-Regular'), url(assets/Inconsolata/Inconsolata.otf) format('opentype'); } +/* http://www.paulirish.com/2012/box-sizing-border-box-ftw/ */ +/* apply a natural box layout model to all elements, but allowing components to change */ html { - overflow: auto; + box-sizing: border-box; +} +*, *:before, *:after { + box-sizing: inherit; +} + +img, +table { + max-width: 100%; + height: auto; +} + + +html { + /*overflow: auto;*/ } body { margin: 0; padding: 0; font-family: "Open Sans", sans-serif; - color: #b3b3b3; - background: url(assets/tile.png) fixed; + color: #111; + background: #fff url(assets/tile.png) fixed; } code, @@ -57,175 +73,138 @@ thead td { text-decoration: underline; } -.page { - overflow: hidden; - max-width: 54em; + +.body-wrapper { + max-width: 70em; margin: 0 auto 0 auto; box-shadow: 0 0 0.6em 0 #333366; - background: #f5f5f5; -} - -/* {{{ .pageheader */ -.pageheader { - position: fixed; - width: 54em; /* same as .page:max-width */ - height: 100px; - padding: 0; - background: white url(assets/filet.png) no-repeat 99% 90px; - box-shadow: 0 10px 15px 0px white; - z-index: 120; -} - -.pageheader .header { - font-size: 120%; - margin-left: 394px; -} - -.pageheader .header > span { - display: block; - height: 100px; - padding-top: 22px; + background: white; } - -.pageheader .parentlinks { - display: block; -} - -.pageheader a, -.pageheader .parentlinks a { - color: #ffa430; /* was: #eeeeaa */ - text-decoration: none; -} - -.pageheader a:hover { - text-decoration: underline; +@media screen and (min-width: 45em) { + .menu, + .main { + display: table-cell; + } + .menu { + width: 20%; + max-width: 15em; + min-width: 11em; + } + .main { + } } -.pageheader .title { - position: absolute; - bottom: 27px; - left: 392px; - font-size: 160%; - color: black; -} -.pageheader .title .translationstatus { - display: none; +header { + padding: 1em 0; + border-bottom: solid 1px #ccc; } -.parentlinks > a { +#logo { + display: block; width: 394px; /* same as .pageheader .header:margin-left */ height: 100px; + max-width: 100%; background: url(assets/logo-nos-oignons-blanc.png) no-repeat top left; - position: absolute; - left: 0; - top: 0; + background-size: 100%; } -.parentlinks > a span { +#logo span { display: none; } -.parentlinks .parentlinksep + a { - width: auto; - height: auto; - background: transparent; - display: inline; - position: static; +/* {{{ .actions */ +.actions { + font-size: 80%; + text-align: right; } - -.parentlinks .parentlinksep + a + .parentlinksep + a { - background: url(assets/ariane-sep.png) no-repeat 0% 50%; - padding-left: 20px; +.actions ul { + height: auto; } -.parentlinks .parentlinksep + a span { - display: inline; +.breadcrumb, +.breadcrumb a { + text-decoration: none; + color: #b3b3b3; } - -.parentlinks .parentlinksep { - display: none; +.breadcrumb a:hover { + text-decoration: none; + color: #57075f; } - -/* {{{ .actions */ -.actions { - font-size: 80%; - text-align: right; +.breadcrumb a + a:before { + content:"▸"; + display: inline-block; + vertical-align: top; + margin: -1px 0.5em 0; + color: #b3b3b3; } +.breadcrumb a + a:hover:before {} /* .actions }}} */ /* {{{ #otherlanguages */ +#otherlanguages { + float: right; + font-size: 0.9em; +} #otherlanguages, -#otherlanguages ul li a { - color: #57075f; - background: white; +#otherlanguages a { + color: #b3b3b3; + /*background: white;*/ +} +#otherlanguages a:hover { + color: #57075f; } +#otherlanguages ul { + padding: 0; +} #otherlanguages ul li { - margin-left: 1em; + /*margin-left: 1em;*/ } #otherlanguages .langstatus { - display: none; + /*display: none;*/ } -.pageheader #otherlanguages { - border: none; - position: absolute; - bottom: 1.2em; - right: 0; - z-index: 300; - font-size: 80%; -} -/* #otherlanguages }}} */ -/* .pageheader }}} */ -#pagebody { - position: relative; - min-height: 756px; - margin: 0 0 0 11.44em; /* same as .sidebar:width */ - padding: 100px 2em 1em 2em; - z-index: 110; +main { background: white url(assets/background.png) no-repeat bottom center; - color: black; - border-left: solid 1px #ccc; + background-size: 50%; + color: #111; } -/* {{{ .sidebar */ -.sidebar { - position: fixed; - overflow: hidden; - top: 100px; /* same as .header:height */ - width: 11.44em; - margin: 0; - padding: 0; + +.menu { + padding: 1em 0; border: none; - z-index: 200; background: #f5f5f5; - border-top: solid 1px #ccc; - padding-top: 30px; +} +@media screen and (max-width: 45em) { + .menu { + border-bottom: solid 1px #ccc; + } } -.sidebar ul { +.menu ul { margin: 0; } -.sidebar ul { +.menu ul { padding: 0; list-style: none; background: transparent; } -.sidebar li { +.menu li { text-align: left; } -.sidebar ul li .selflink { +.menu ul li .selflink { color: #57075f; font-weight: bold; } -.sidebar ul li > span, -.sidebar ul li > a { +.menu ul li > span, +.menu ul li > a { display: block; padding: 0.3em 0.5em; text-decoration: none; @@ -236,71 +215,62 @@ thead td { font-size: 100%; } -.sidebar ul li .selflink:hover { - border-top: 1px dotted #57075f; - border-bottom: 1px dotted #57075f; - background: #eeeeee; -} -.sidebar a:hover { - border-top: 1px dotted #57075f; - border-bottom: 1px dotted #57075f; +.menu a:hover { color: #57075f; background: #eeeeee; text-decoration: none; } -/* .sidebar }}} */ -/* {{{ #content */ -#content { - padding-top: 1em; - overflow: auto; + + +main { + padding: 1em; } -#content a { +main a { color: #57075f; text-decoration: underline; } -#content a:hover { +main a:hover { text-decoration: underline; } -#content p { - text-align: justify; +main p { margin: 1em 0 1em 0; } -#content hr { +main hr { border: none; border-bottom: dotted 2px #bbbbbb; margin: 2em auto; } -#content h1 { +main h1 { font-size: 180%; font-weight: bold; color: #ffa430; text-shadow: 2px 2px 1px #444; } -#content h2, -#content .header { +main h2, +main .header { font-size: 140%; font-weight: bold; } -#content h2 + p { +main h2 + p { margin-top: 0.75em; } -#content h3 { +main h3 { font-size: 120%; font-weight: bold; margin-bottom: 0; padding-bottom: 0; } -#content h3 + p { +main h3 + p { margin-top: 0.5em; } h2 sup, @@ -308,58 +278,59 @@ h3 sup { font-weight: normal; } -#content blockquote { +main blockquote { border-left: 2px solid #A756AF; margin: 0.5em 0; padding: 0.5em 0 0.5em 1em; } -#content blockquote p {margin: 0;} -#content blockquote p + p {margin-top: 1em;} +main blockquote p {margin: 0;} +main blockquote p + p {margin-top: 1em;} -#content table { + +main table { border-top: solid 1px #aaa; border-bottom: solid 1px #aaa; border-collapse: collapse; } -#content table th { +main table th { background: #fafafa; padding: 0.1em 0.5em; border-bottom: solid 1px #aaaaaa; color: #555555; } -#content table td { +main table td { padding: 0.1em 0.5em; border-top: solid 1px #ccc; } -#content .header a { +main .header a { text-decoration: none; } -#content .feedlink a { +main .feedlink a { text-decoration: none; } -#content .feedlink { +main .feedlink { text-align: right; margin-top: -2.8em; min-height: 2.8em; } -#content .feedlink .feedbutton { +main .feedlink .feedbutton { font-size: 80%; color: #57075f !important; background: transparent; border: none; } -#content .feedlink .feedbutton:hover { +main .feedlink .feedbutton:hover { color: #57075f !important; background: transparent; text-decoration: underline; } -#content .footnotes { +main .footnotes { font-size: 80%; } @@ -369,7 +340,17 @@ h3 sup { width: 49.5%; } -/* #content }}} */ +/* main }}} */ + + +.graph { + display: inline-block; + vertical-align: top; + width: 45%; + margin: 1em 1%; + min-width: 20em; + text-align: center; +} /* Paypal donation forms */ .paypal-donation { @@ -377,6 +358,7 @@ h3 sup { vertical-align: top; width:45%; padding-right: 4%; + min-width: 20em; } .paypal-donation h4 { margin: 0 0 0.5em 0; @@ -539,24 +521,20 @@ h3 sup { /* {{{ #footer */ #footer { - position: relative; margin: 0; padding: 0.5em 0; text-align: center; color: white; background: #57075f; - z-index: 400; } - -#footer #pageinfo { - position: relative; - margin: auto; - padding: 0.1em 2em; - border-top: none; +#footer > div { + margin-top: 1em; } + #footer a { color: white; + text-decoration: none; } #footer a:hover { @@ -577,7 +555,7 @@ h3 sup { /* {{{ @media print */ @media print { - .sidebar, + .menu, .actions, .feedlink, #backlinks, @@ -620,7 +598,7 @@ h3 sup { .pageheader a, .pageheader .parentlinks a { - color: black; + color: #111; } .pageheader, @@ -642,14 +620,14 @@ h3 sup { display: inline; } - #content h1 { - color: black; + main h1 { + color: #111; text-shadow: none; border-bottom: solid #ccc 1px; } - #content a:link:after, - #content a:visited:after { + main a:link:after, + main a:visited:after { content:" [" attr(href) "] "; } diff --git a/templates/page.tmpl b/templates/page.tmpl index a28b9f0..5c185a0 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -11,184 +11,208 @@ -<TMPL_VAR TITLE> + <TMPL_VAR TITLE> - + - + - + - + - + - + - + - + - - -
- -
- - - - -
- -
- -
- -
- - - -
- - - - -
Comments on this page are closed.
-
-
-
-
- - - - - - - -
- - - - - - - -
- - - + +
+ +
+ + + + + + +
+ + + + + + +
+ + + +
+ + + + + + +

+ + +  (%) + +

+ + + + + + + + + + +
+ +
+ + + + + +
+ +
+ + + + +
+ Nos oignons est une initiative indépendante du project Tor.
+ Tor et le Onion Logo sont des marques déposées par The Tor Project, Inc. +
+ +
+ Dernière modification : + +
+ + + + + + + + + + + +
+ + + + -- 2.39.2