Compare commits
No commits in common. "57c45ca1c5afa58b745f2282ec202dc7e0252c3e" and "76755f20aaebcc4c0067d5eaeba29d846b5c8135" have entirely different histories.
57c45ca1c5
...
76755f20aa
4 changed files with 1 additions and 62 deletions
Binary file not shown.
Before Width: | Height: | Size: 60 KiB |
Binary file not shown.
Before Width: | Height: | Size: 72 KiB |
11
index.html
11
index.html
|
@ -26,19 +26,8 @@
|
|||
<a href="https://fr.wikipedia.org/wiki/Violence">Violence</a>
|
||||
<a href="https://fr.wikipedia.org/wiki/Fascisme">Fascisme</a>
|
||||
<a href="https://fr.wikipedia.org/wiki/Anarchisme">Communisme/Anarchisme</a>
|
||||
<<<<<<< HEAD
|
||||
<a href="https://fr.wikipedia.org/wiki/F%C3%A9minisme">Féminisme</a>
|
||||
<a href="https://fr.wikipedia.org/wiki/Handicap">Handicap</a>
|
||||
<a href="https://fr.wikipedia.org/wiki/%C3%89tudes_d%C3%A9coloniales">Décolonialisme</a>
|
||||
=======
|
||||
>>>>>>> 76755f20aaebcc4c0067d5eaeba29d846b5c8135
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
Propulsé par Forgejo
|
||||
Version: 1.21.1+0 Page:
|
||||
37ms
|
||||
Modèle:
|
||||
5ms
|
||||
|
|
50
style.css
50
style.css
|
@ -1,53 +1,4 @@
|
|||
body {
|
||||
<<<<<<< HEAD
|
||||
text-align: center;
|
||||
}
|
||||
body h1 {
|
||||
color: white;
|
||||
margin-top: 0%;
|
||||
margin-bottom: 0%;
|
||||
font-size: 8rem;
|
||||
font-family:'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
|
||||
-webkit-text-stroke: 4px black;
|
||||
background-image: url(img/banière\ site\ def.png);
|
||||
background-size:cover;
|
||||
background-position: center;
|
||||
width: 100%;
|
||||
height: 55vh;
|
||||
}
|
||||
body .site_content {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
}
|
||||
body .site_content .main_content h2 {
|
||||
color: red;
|
||||
}
|
||||
body .site_content .vertical_banner {
|
||||
font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
|
||||
font-size: 2rem;
|
||||
color: white;
|
||||
background-color: #9F0A0A;
|
||||
}
|
||||
body .site_content .vertical_banner .category {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 1vh;
|
||||
margin: 5px;
|
||||
margin-top: 2%;
|
||||
}
|
||||
body .site_content .vertical_banner .category a {
|
||||
font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
|
||||
font-size: 2rem;
|
||||
text-decoration: none;
|
||||
color: white;
|
||||
}
|
||||
body .site_content .vertical_banner .category a:visited {
|
||||
font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
|
||||
font-size: 2rem;
|
||||
text-decoration: none;
|
||||
color: white;
|
||||
}/*# sourceMappingURL=style.css.map */
|
||||
=======
|
||||
text-align: center;
|
||||
}
|
||||
body h1 {
|
||||
|
@ -82,4 +33,3 @@ body .site_content .vertical_banner .category a:visited {
|
|||
text-decoration: none;
|
||||
color: white;
|
||||
}/*# sourceMappingURL=style.css.map */
|
||||
>>>>>>> 76755f20aaebcc4c0067d5eaeba29d846b5c8135
|
||||
|
|
Loading…
Reference in a new issue