résolution du conflit de canard
This commit is contained in:
commit
811a3efb94
|
@ -2,13 +2,13 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
</head>
|
||||
<body class="page-accueil"><<<<<<< HEAD
|
||||
<title>Ma monnaie libre</title>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
|
||||
<link rel="stylesheet" type="text/css" href="themes/attilax/layout.css">
|
||||
<link rel="stylesheet" type="text/css" href="themes/attilax/decoration.css">
|
||||
</head>
|
||||
<body class="page-accueil">
|
||||
<header>
|
||||
<h1> <a href="."> <span> Ma monnaie libre </span> </a> </h1>
|
||||
</header>
|
||||
|
@ -44,5 +44,6 @@
|
|||
<p><img src="img/qrcodeg1cotiz.png" alt="Clef publique d'Attilax"></p>
|
||||
<p>site publié sous licence libre CC-By-SA</p>
|
||||
</footer>
|
||||
>>>>>>> 4ee4ea682ea20d9821300acfab37756f7574ed08
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
</head>
|
||||
<body class="page-accueil"><<<<<<< HEAD
|
||||
<title>Ma monnaie libre</title>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
|
||||
<link rel="stylesheet" type="text/css" href="themes/attilax/layout.css">
|
||||
<link rel="stylesheet" type="text/css" href="themes/attilax/decoration.css">
|
||||
</head>
|
||||
<body class="page-accueil">
|
||||
<header>
|
||||
<h1> <a href="."> <span> Ma monnaie libre </span> </a> </h1>
|
||||
</header>
|
||||
|
@ -33,8 +33,8 @@
|
|||
<dt style="text-align: center;"><br>
|
||||
</dt>
|
||||
</dl>
|
||||
<h3><a href="crevard.html" title="CREVARD">Le Crevard de la June</a></h3>
|
||||
Les empaffés parlent aux empaffés<br>
|
||||
<h3><a href="crevard.html" title="CREVARD">Le petit crevard de la June</a></h3>
|
||||
Les empaffés parlent aux empaffés...<br>
|
||||
<br>
|
||||
<dl>
|
||||
</dl>
|
||||
|
@ -44,5 +44,6 @@
|
|||
<p><img src="img/qrcodeg1cotiz.png" alt="Clef publique d'Attilax"></p>
|
||||
<p>site publié sous licence libre CC-By-SA</p>
|
||||
</footer>
|
||||
>>>>>>> 4ee4ea682ea20d9821300acfab37756f7574ed08
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -352,7 +352,7 @@
|
|||
<footer>
|
||||
<p>Vous aimez ce site ? Faites-moi un don en june :</p>
|
||||
|
||||
<p><img src="img/qrcodeg1cotiz.png" alt="Clef publique d'Attilax" /></p>
|
||||
<p><img data-lazyimg-list="true" src="img/qrcodeg1cotiz.png" alt="Clef publique d'Attilax" /></p>
|
||||
|
||||
<p>site publié sous licence libre CC-By-SA</p>
|
||||
</footer>
|
||||
|
|
|
@ -1,3 +1,8 @@
|
|||
:root {
|
||||
|
||||
--bleu-nuit: hsla(247.5, 70.6%, 6.7%, 0.5);
|
||||
}
|
||||
|
||||
body {
|
||||
|
||||
background-image: url("espace-1348w-60pcts.jpg");
|
||||
|
@ -10,7 +15,16 @@ body {
|
|||
font-family: "Bree Serif";
|
||||
font-weight: bold;
|
||||
|
||||
text-shadow: 0 0 0.5rem hsl(244.8, 86.2%, 5.7%);
|
||||
text-shadow: 0 0 0.5rem var(--bleu-nuit);
|
||||
}
|
||||
|
||||
body:before {
|
||||
|
||||
background-color: var(--bleu-nuit);
|
||||
box-shadow:
|
||||
-6rem 0 3rem var(--bleu-nuit),
|
||||
3rem 0 3rem var(--bleu-nuit)
|
||||
;
|
||||
}
|
||||
|
||||
body > header a:after {
|
||||
|
|
|
@ -1,14 +1,38 @@
|
|||
|
||||
body {
|
||||
|
||||
max-width: 800px;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
body:before {
|
||||
|
||||
content: " ";
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 50vw;
|
||||
margin-left: -400px;
|
||||
width: 800px;
|
||||
height: 100vh;
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
header, main, footer {
|
||||
|
||||
position: relative;
|
||||
z-index: 100;
|
||||
}
|
||||
|
||||
body > header {
|
||||
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
|
||||
body > header > :first-child {
|
||||
|
||||
margin-top: 2rem;
|
||||
}
|
||||
|
||||
body > header a span {
|
||||
|
||||
display: none;
|
||||
|
@ -106,3 +130,4 @@ dt {
|
|||
margin-top: 0.5rem;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue