Commit 290376e4 authored by Jérôme Ortais's avatar Jérôme Ortais

gerstion de conflit

parents 698e30c3 c61e7ce1
......@@ -9,4 +9,3 @@ pages:
- public/
only:
- master
......@@ -8,7 +8,7 @@ PELICANOPTS=
BASEDIR=$(pwd)
INPUTDIR=$BASEDIR/content
OUTPUTDIR=$BASEDIR/output
OUTPUTDIR=$BASEDIR/public
CONFFILE=$BASEDIR/pelicanconf.py
###
......
/**********************************
* GLOBAL
**********************************/
html, body {
height: 100%;
margin: -8px 0;
@media screen and (max-width: 940px) {
html {
margin: -8px 5px;
}
}
@media screen and (min-width: 940px) {
html {
margin: 0 0;
}
}
body {
height: 100%;
font-size: 11px;
line-height: 125%;
font-size: 11px;
color: #333;
}
img {
max-width: 100%;
height: auto;
}
body a {
color: #773015;
}
body p{
font-size: 11px;
}
body ul {
list-style: none;
padding: 0;
}
#total {
height: 100%;
min-height: 100%;
position: relative;
margin: 0;
}
#page {
width: 940px;
max-width: 940px;
margin: 0 auto;
}
h2, h3 {
border-bottom: 1px solid #ffa628;
padding:2em 0;
}
h1, h2, h3 {
color: #d32f19;
......@@ -36,25 +54,39 @@ h1 {
font-weight: lighter;
font-variant: small-caps;
padding-bottom: 15px;
line-height:125%;
}
h2 {
font-weight: lighter;
padding-bottom: 10px;
padding-top:10px;
font-size:140%;
}
h3 {
padding-bottom: 5px;
font-weight: bold;
font-size:11px;
}
h4 {
margin-top: 10px;
margin-bottom: 5px;
color: #000;
}
h5 {
float: right;
margin-top: 0;
padding-left: 20px;
color: #000;
font-size: 11px;
@media screen and (max-width: 940px) {
h5 {
margin-top: 0;
color: #000;
font-size: 11px;
}
}
@media screen and (min-width: 940px) {
h5 {
float: right;
margin-top: 0;
padding-left: 20px;
color: #000;
font-size: 11px;
}
}
#deux_cols h5 {
margin-top: 11px;
......@@ -62,10 +94,6 @@ h5 {
/**********************************
* MENUS
**********************************/
code{
font-family: monospace;
color: #ffa628;
}
.code{
font-family: monospace;
color: #ffa628;
......@@ -74,30 +102,84 @@ code{
text-align: center;
font-size: 120%;
clear: both;
padding-top: 15px;
padding-bottom: 15px;
padding: 0;
margin: 0;
font-variant: small-caps;
color: #d32f19;
}
#nav_menu li a:hover {
color:#ffa628;
}
#nav_menu a {
text-decoration: none;
color: #d32f19;
}
#nav_menu a:hover {
font-weight: bold;
#nav_menu a.icon {
float: right;
display: none;
background: transparent url('../../theme/images/menu_icon.png') no-repeat right top;
background-size: 15px;
}
#nav_menu ul {
border: 1px solid #ffa628;
height: 35px;
list-style: none;
@media only screen and (min-width: 940px) {
#nav_menu {
padding-top: 15px;
padding-bottom: 15px;
}
#nav_menu a {
font-weight: bold;
color: #d32f19;
}
#nav_menu ul {
border: 1px solid #ffa628;
height: 35px;
list-style: none;
}
#nav_menu li {
border-right: 1px solid #ffa628;
display: block;
width: 16.57%;
height: 15px;
float: left;
padding: 10px 0;
}
#nav_menu li#adroite {
float:right;
border-right: none;
}
}
#nav_menu li {
border-right: 1px solid #ffa628;
display: block;
width: 10em;
height: 25px;
float: left;
padding: 5px 0;
@media only screen and (max-width: 940px) {
#nav_menu ul {
overflow: hidden;
background-color:#d32f19;
height: 35px;
}
#nav_menu li {
text-align: left;
height: 15px;
padding: 10px;
}
#nav_menu li:not(:first-child) {
display: none;
}
#nav_menu a{
color: white;
font-weight: bold;
}
#nav_menu a.icon{
display: block;
background-color:#d32f19;
background-position: center center;
height:35px;
width:30px;
}
#nav_menu.responsive ul{
height:210px;
}
#nav_menu.responsive li{
display: block;
}
#presentation{
display: none;
}
}
/**********************************
* SLIDESHOW
......@@ -135,7 +217,7 @@ code{
}
.presentation_droite_haut {
position: relative;
line-height: 24px;
line-height: 230% ;
}
.presentation_droite_haut h2 {
margin-left: 60px;
......@@ -159,61 +241,123 @@ code{
/**********************************
* 3 COLONNES
**********************************/
#trois_cols {
display: block;
padding-top: 15px;
padding-bottom: 50px;
}
#trois_cols img {
max-width: 250px;
}
#trois_cols #col_gauche {
width: 32%;
float: left;
}
#trois_cols #col_centre {
width: 32%;
margin: 0 auto;
}
#trois_cols #col_droite {
width: 32%;
float: right;
}
.centerleft {
width: 21%;
float: left;
text-align: center;
}
.centerright {
width: 21%;
float: right;
text-align: center;
@media only screen and (min-width: 940px) {
#trois_cols {
display: block;
padding-top: 15px;
padding-bottom: 50px;
}
#trois_cols #col_gauche {
width: 32%;
float: left;
}
#trois_cols #col_centre {
width: 32%;
margin: 0 auto;
}
#trois_cols #col_droite {
width: 32%;
float: right;
}
.centerleft {
width: 21%;
float: left;
text-align: center;
}
.centerright {
width: 21%;
float: right;
text-align: center;
}
.center {
width: 21%;
margin: 0 auto;
text-align: center;
}
}
.center {
width: 21%;
margin: 0 auto;
text-align: center;
@media only screen and (max-width: 940px) {
#trois_cols {
}
#col_gauche {
width: 100%;
float: none;
}
#col_centre {
width: 100%;
float: none;
margin: 0;
}
#col_droite {
width: 100%;
float: none;
}
#page {
width: 100%;
margin: 0 auto;
}
.centerleft {
padding-bottom: 10px;
}
.centerright {
padding-bottom: 10px;
}
.center {
}
}
/**********************************
* 2 COLONNES
**********************************/
@media only screen and (min-width: 940px) {
#deux_cols {
display: block;
padding-top: 15px;
padding-bottom: 50px;
}
#deux_cols #col_gauche {
width: 65%}
width: 65%;
float: left;
}
#deux_cols #col_droite {
width: 25%;
max-width: 30%;
float: right;
padding: 15px;
border: 1px solid #ffa628;
}
.margin-check {
padding: 0 15px 15px 15px;
}
#deux_cols #col_droite ul.docs {
list-style: disc;
padding-left: 15px;
line-height: 2em;
line-height: 200%;
}
}
@media only screen and (max-width: 940px) {
div#deux_cols {
display: flex;
flex-direction: column-reverse;
padding-top: 15px;
padding-bottom: 50px;
}
#deux_cols #col_gauche {
width: 100%;
}
#deux_cols #col_droite {
margin-top: 30px;
border: 1px solid #ffa628;
}
.margin-check {
display: inline-block;
padding: 0 15px 15px 15px;
position: relative;
}
#deux_cols #col_droite ul.docs {
list-style: disc;
padding-left: 15px;
line-height: 200%;
}
}
/**********************************
* ARTICLES
......@@ -229,7 +373,7 @@ width: 65%}
#nouveautes-de-cette-version h2 {
font-family: serif;
font-size: 11px;
line-height: 14px;
line-height: 125%;
font-weight: bold;
display: block;
float: none;
......@@ -243,7 +387,7 @@ width: 65%}
.article .section h2 {
font-family: verdana, sans-serif;
font-size: 13px;
line-height: 14px;
line-height: 125%;
font-weight: bold;
display: block;
float: none;
......@@ -265,22 +409,28 @@ width: 65%}
/**********************************
* EN TETE
**********************************/
#logo_holder #logo {
background: transparent url('../../theme/images/bandeau.png');
float: left;
display: block;
text-indent: -9999px;
height: 80px;
width: 444px;
@media only screen and (min-width: 940px) {
#logo_holder #logo {
background: transparent url('../../theme/images/bandeau.png') no-repeat;
background-repeat: no-repeat;
float: left;
display: block;
text-indent: -9999px;
height: 80px;
width: 444px;
padding-bottom:15px;
}
}
@media only screen and (max-width: 940px) {
#logo_holder #logo {
display: none;
}
}
/**********************************
* PIED DE PAGE
**********************************/
#footer {
position: absolute;
width: 100%;
height: 50px;
bottom: 0;
position: static;
border-top: 1px dotted #ffa628;
padding: 0;
margin: 0;
......@@ -299,12 +449,22 @@ width: 65%}
}
#footer #feeds {
float: right;
line-height: 16px;
line-height: 125%;
width: 85px;
height: 50px;
}
@media only screen and (max-width: 600px) {
#footer #right a#feeds {
font-size: 0;
padding-right: 0;
}
}
@media only screen and (min-width: 600px) {
#footer #right a#feeds {
padding: 18px 20px 0 0;
}
}
#footer #right a#feeds {
padding: 20px 20px 0 0;
background: transparent url('../../images/feed.png') no-repeat 70% 35%;
text-decoration: none;
}
......@@ -327,7 +487,7 @@ a.button {
a.button span {
background: transparent url('../../images/bouton_span.png') no-repeat;
display: block;
line-height: 14px;
line-height: 125%;
padding: 5px 0 5px 18px;
margin: 0;
}
......@@ -350,6 +510,7 @@ a.button:hover span {
overflow: hidden;
margin: 0;
padding: 0;
line-height: 100%;
}
.article img {
border: 0;
......@@ -366,7 +527,9 @@ ul#version {
}
.console {
overflow: auto;
width: 90%;
display: inherit;
position:relative;
min-width: 80%;
border: 1px solid #000;
background: #333;
padding: .8em 2em .8em .5em;
......@@ -435,102 +598,6 @@ table.dons td:nth-child(4) {
color: #fff;
width: 100px;
}
/**********************************
* PYROMATHS EN LIGNE
**********************************/
.ui-tabs-panel {
background: url('../../images/enligne.png') no-repeat;
width: 611px;
}
table.tabs {
width: 611px;
}
table.tabs td {
width: 50%}
.ui-widget-overlay {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%}
.ui-tabs-nav {
margin: 0;
height: 30px;
width: 611px;
padding: 0;
border-bottom: 1px solid #ddc525;
}
.ui-tabs .ui-tabs-nav li {
list-style: none;
float: left;
position: relative;
padding: 0;
white-space: nowrap;
}
.ui-tabs .ui-tabs-nav a {
background: url('../../images/tabs.png') no-repeat -652px 0;
display: block;
height: 30px;
line-height: 30px;
width: 76px;
text-align: center;
float: left;
text-decoration: none;
color: #666;
position: relative;
}
.ui-tabs .ui-tabs-panel {
display: block;
padding: 0;
}
.ui-tabs a:active {
outline: 0;
}
.ui-tabs a:hover {
background-position: -652px -31px;
color: #fff;
}
p#msgjs, p#errmsg {
color: #911101;
text-align: center;
}
ul.tabs a.current, ul.tabs a.current:hover, ul.tabs li.current a {
background-position: -652px -62px;
cursor: default!important;
color: #000!important;
}
form#idForm input {
border: 2px outset #ddc525;
background-color: #f8f3d2;
}
form#idForm select {
color: #666;
background-color: #f8f3d2;
}
/* Start by setting display:none to make this hidden.
Then we position it in relation to the viewport window
with position:fixed. Width, height, top and left speak
speak for themselves. Background we set to 80% white with
our animation centered, and no-repeating */
.modal {
display: none;
position: fixed;
z-index: 1000;
top: 0;
left: 0;
height: 100%;
width: 100%;
background: rgba( 255, 255, 255, .8 )
url('../../images/loading.gif')
50% 50%
no-repeat;
}
body.loading {
overflow: hidden;
}
body.loading .modal {
display: block;
}
/**********************************
* DESCRIPTIF EXERCICES
**********************************/
......@@ -555,7 +622,7 @@ ul.menu li p.titre {
background-color: #fff;
background-position: 0 0;
background-repeat: no-repeat;
background-image: url('../../images/titlesBackgroundImagePlus.png');
background-image: url('../../images/titlesBackgroundImagePlus.png') no-repeat;
color: #000;
}
ul.menu li p {
......
......@@ -16,61 +16,63 @@
{% block content %}
<div id="deux_cols">
<div id="col_droite">
{% if article.category == "telecharger" %}
<h3>Historique des versions</h3>
<ul class="docs">
{% for cat_name, article_list in categories if cat_name=="telecharger" %}
{% for article in article_list %}
<li>
<a href="{{ SITEURL }}/{{ article.slug }}.html">{{ article.title }}</a>
</li>
{% endfor %}
<div class="margin-check">
{% if article.category == "telecharger" %}
<h3>Historique des versions</h3>
<ul class="docs">
{% for cat_name, article_list in categories if cat_name=="telecharger" %}
{% for article in article_list %}
<li>
<a href="{{ SITEURL }}/{{ article.slug }}.html">{{ article.title }}</a>
</li>
{% endfor %}
{% endfor %}
</ul>
{% else %}
{% if article.category == "finances" %}
<h3>Bilan financier</h3>
Un immense merci à celles et ceux qui ont contribué financièrement à la vie de
Pyromaths. Vous trouverez ici l'état de nos finances.
<form action="https://www.paypal.com/cgi-bin/webscr"
method="post">
<p>
<input type="hidden" name="cmd" value="_s-xclick"/>
<input type="hidden" name="hosted_button_id" value="5486963"/>
<input type="image"
src="https://www.paypal.com/fr_FR/FR/i/btn/btn_donate_SM.gif"
name="submit" alt="PayPal"/>
<img alt="logo Paypal"
src="https://www.paypal.com/fr_FR/i/scr/pixel.gif"/>
</p>
</form>
{% else %}
<h3>Documentation</h3>
{% for cat_name, article_list in categories if cat_name!="telecharger" and cat_name != "finances"%}
<ul>
{% for group in article_list|groupby('category') %}
{% for article in group.list %}
{% if loop.first %}
<li>
<h4>{{ article.category }}</h4>
<ul class="docs">
{% endif %}
{% if 'hidden' not in article.tags %}
<li>
<a href="{{ SITEURL }}/{{ article.slug }}.html">{{ article.title }}</a>
</li>
{% endif %}
{% if loop.last %}
</ul>
</li>
{% endif %}
{% endfor %}
{% endfor %}
</ul>
{% endfor %}
</ul>
{% else %}
{% if article.category == "finances" %}
<h3>Bilan financier</h3>
Un immense merci à celles et ceux qui ont contribué financièrement à la vie de
Pyromaths. Vous trouverez ici l'état de nos finances.
<form action="https://www.paypal.com/cgi-bin/webscr"
method="post">
<p>
<input type="hidden" name="cmd" value="_s-xclick"/>
<input type="hidden" name="hosted_button_id" value="5486963"/>
<input type="image"
src="https://www.paypal.com/fr_FR/FR/i/btn/btn_donate_SM.gif"
name="submit" alt="PayPal"/>
<img alt="logo Paypal"
src="https://www.paypal.com/fr_FR/i/scr/pixel.gif"/>
</p>
</form>
{% else %}
{% for cat_name, article_list in categories if cat_name!="telecharger" and cat_name != "finances"%}
<ul>
{% for group in article_list|groupby('category') %}
{% for article in group.list %}
{% if loop.first %}
<li>
<h4>{{ article.category }}</h4>
<ul class="docs">
{% endif %}
{% if 'hidden' not in article.tags %}
<li>
<a href="{{ SITEURL }}/{{ article.slug }}.html">{{ article.title }}</a>
</li>
{% endif %}
{% if loop.last %}
</ul>
</li>
{% endif %}
{% endfor %}
{% endfor %}
</ul>
{% endfor %}
{% endif %}
{% endif %}
{% endif %}
</div>
</div>
<div id="col_gauche">
<div class="article">
<h5> Par
......@@ -95,7 +97,7 @@
</div>
</div>
<div class="clear">&nbsp;</div>
</div>
<div class="clear">&nbsp;</div>
{% endblock %}
......@@ -4,6 +4,7 @@
<title>{% block title %}{% endblock %}</title>
{% block head %}
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="icon" href="{{ SITEURL }}/theme/images/favicon.ico"/>
{% if FEED_ALL_ATOM %}
......@@ -52,9 +53,12 @@
<h1><a href="{{ SITEURL }}" id="logo">Pyromaths</a></h1>
</div>
<div id="nav_menu">
<div class="topnav" id="nav_menu">
<a href="javascript:void(0);" class="icon" onclick="myFunction();">
<!--<i class="fa fa-bars"></i>-->
</a>
<ul>