From f220ff25d4c77b8841843906b95319ac43518a90 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Th=C3=A9r=C3=A8se=20Godefroy?= Date: Sun, 8 Aug 2021 19:31:02 +0200 Subject: [PATCH] main.css & main.rtl.css: sync with enc (up to 697a6df). --- static/css/main.css | 99 ++++++++++++++++++++++++++++++----------- static/css/main.rtl.css | 22 ++++++++- 2 files changed, 92 insertions(+), 29 deletions(-) diff --git a/static/css/main.css b/static/css/main.css index cb27f82..a67bb78 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -177,6 +177,23 @@ small { font-size: 0.85em; } +code, +kbd, +samp { + font-family: monospace; + padding: 0 .2em; +} +code, +kbd { + display: inline-block; +} + +/* Prevent wrapping within anchor links. */ +a[href^="#section"], +a[href^="#step"] { + white-space: nowrap; +} + #header #fsf-intro { font-size: .7em; } @@ -185,6 +202,7 @@ small { font-size: 125%; } + /* Colours */ @@ -208,23 +226,10 @@ b, i, em { color: #905300; } -/* Commands and options */ code, kbd, samp { color: #905300; - font-family: monospace; - padding: 0 .2em; -} -code, -kbd { - display: inline-block; -} - -/* Prevent wrapping within anchor links. */ -a[href^="#section"], -a[href^="#step"] { - white-space: nowrap; } /* Guide Sections Background */ @@ -351,8 +356,8 @@ a[href^="#step"] { margin-bottom: 1.3em; } -.section-intro p { - margin: 0.5em 3.5em; +.section-intro p { + margin: 0.5em 7.5%; } .section-intro h2, @@ -371,8 +376,10 @@ a[href^="#step"] { .section-intro p.image { text-align: center; } -.section-intro p.image > img { max-width: 100%; } - +.section-intro p.image > img { + max-width: 100%; + height: auto; +} .step { padding: .5em 0; @@ -414,6 +421,7 @@ a[href^="#step"] { /* Images */ +/* ul.images:before, ul.images:after { content: " "; display: table; @@ -436,17 +444,37 @@ ul.images li > img { max-width: 600px; height: auto; } - -.sidebar > p > img { - width: 100%; - max-width: 600px; - height: auto; -} +*/ .share-logo { margin-bottom: 6px; } +p.large { + width: 600px; + border: 1px solid #aaa; +} + +p.medium { + width: 350px; +} + +p.small { + width: 250px; +} + +p.float, +.sidebar > p { + max-width: 100%; + margin: 0 auto 1.5em; +} + +p.float img, +.sidebar > p img { + width: 100%; + height: auto; +} + /* Troubleshooting panel and dropdown */ .troubleshooting { @@ -762,7 +790,9 @@ input[type='reset']:hover { .section-intro p { margin: 0.5em 0; } - + .section-intro p.float { + margin: 0.5em auto; + } } @@ -787,6 +817,15 @@ input[type='reset']:hover { } +@media (min-width:800px) { + + p.float.small { + float:right; + margin:0 7.5% 20px 30px; + } + +} + @media only screen and (min-width: 950px) { .row > div, @@ -868,12 +907,18 @@ input[type='reset']:hover { height: auto; } - .row .sidebar > p > img { - width: 80%; - height: auto; + .row .sidebar > p.medium { + margin: 0; } #workshops-image { width: 100%; } + + p.float.medium { + float: right; + max-width: 40%; + margin: 0 7.5% 20px 30px; + } + } diff --git a/static/css/main.rtl.css b/static/css/main.rtl.css index 1ca4ea9..1db75c2 100644 --- a/static/css/main.rtl.css +++ b/static/css/main.rtl.css @@ -23,12 +23,16 @@ margin-left: 0; margin-right: 4em; } +.dropdown > h4.expanded { + border-radius: 3px 0 0 3px; +} + /* ========================================================================== Media Queries ========================================================================== */ -@media only screen and (min-width: 600px) and (max-width: 899px) { +@media only screen and (min-width: 600px) and (max-width: 949px) { #header .intro { float: left; @@ -42,7 +46,16 @@ } -@media only screen and (min-width: 900px) { +@media (min-width:800px) { + + p.float.small { + float: left; + margin: 0 30px 20px 7.5%; + } + +} + +@media only screen and (min-width: 950px) { .nav ul.lang { margin: 0 0.5em 0 0; @@ -83,4 +96,9 @@ margin: 0 0 1em 3%; } + p.float.medium { + float:left; + margin:0 30px 20px 7.5%; + } + } -- 2.25.1