Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
piRGoif committed Aug 14, 2024
2 parents 494392e + 380ae10 commit 02e3bda
Showing 11 changed files with 39 additions and 58 deletions.
72 changes: 22 additions & 50 deletions communs/gepapir.css
Original file line number Diff line number Diff line change
@@ -179,7 +179,7 @@ blockquote>p>cite

q, blockquote
{
font: normal 1rem Verdana, Geneva, Arial, Helvetica, sans-serif;
font: normal 1em Verdana, Geneva, Arial, Helvetica, sans-serif;
}

q:before
@@ -295,21 +295,27 @@ nav
left: 0;

width: 100%;
padding: 0.2em;
padding: 0;
margin: 0;

background: #DAE2FE url("../images/fonds/nuages_background.jpg") repeat scroll;
opacity: 0.85;
border-top: 1px solid grey;
border-radius: 10% 10% 0 0 / 1em 1em 0 0;
text-align: center;
}

nav ul
{
display: inline-block;

list-style: none;

margin: 0;
padding: 0;
margin: auto;
padding: 0 1.5em;

background: #DAE2FE url("../images/fonds/nuages_background.jpg") repeat scroll;
opacity: 0.85;
border: 1px solid grey;
border-bottom: none;
border-radius: 5% 5% 0 0 / 1em 1em 0 0;
box-shadow: 10px 10px 15px rgba(0, 0, 0, 0.5);

font: bold 1em arial, helvetica, sans-serif;

@@ -326,64 +332,30 @@ nav li
nav a
{
display: inline-block;
margin: 0 0.5em;
margin: 0;
padding: 0.5em 1em;

border: 1px outset transparent; /* car on a 1px gray sur :hover */
border-left: 1px solid gray;

font-size: 0.9em;
text-decoration: none;
}

nav a:hover
nav>ul>li:first-child>a {
border-left-color: transparent;
}

nav>ul>li>a:hover
{
background-color: white;
border-color: gray;
border-radius: 5px;
}

nav a:link, nav a:visited
{
color: black;
}

nav a:before
{
content: "➦"; /* U+27A6 Heavy black curved upwards and rightwards arrow (Dingbats) */
}

nav a>span.menu_icon
{
display: inline-block;
width: 15px;
height: 15px;
margin-right: 5px;
vertical-align: baseline;
background-image: url("../images/menu/menu-sprites.png");
background-repeat: no-repeat;
}

nav a#menu_accueil>span.menu_icon {
background-position: 0 0;
}

nav a#menu_info>span.menu_icon {
width: 18px;
background-position: -15px 0;
}

nav a#menu_liens>span.menu_icon {
background-position: -33px 0;
}

nav a#menu_moi>span.menu_icon {
background-position: -48px 0;
}

nav a#menu_zicmue>span.menu_icon {
background-position: -63px 0;
}

/*
Ciblage mobiles avec balise meta viewport
Les utilisateurs desktop aussi ont besoin de ces modif donc on leur laisse (utilisation max-width plutôt que max-device-width)
@@ -408,7 +380,7 @@ nav a#menu_zicmue>span.menu_icon {
}
}

@media screen and (max-width: 420px)
@media screen and (max-width: 600px)
{
nav ul
{
Binary file modified communs/gepapir.csz
Binary file not shown.
10 changes: 5 additions & 5 deletions communs/menu.inc.php
Original file line number Diff line number Diff line change
@@ -10,19 +10,19 @@

<li>
<a href="<?=($RelBasePath == "")?"index.php":$RelBasePath;?>" id="menu_accueil">
<span class="menu_icon"></span>&nbsp;Accueil</a>
🏡&nbsp;Accueil</a>
</li><li>
<a href="<?=$RelBasePath?>info/" id="menu_info">
<span class="menu_icon"></span>&nbsp;Informatique</a>
💻&nbsp;Informatique</a>
</li><li>
<a href="<?=$RelBasePath?>zicmue/" id="menu_zicmue">
<span class="menu_icon"></span>&nbsp;Musiques</a>
🎵&nbsp;Musiques</a>
</li><li>
<a href="<?=$RelBasePath?>moi/" id="menu_moi">
<span class="menu_icon"></span>&nbsp;Moi</a>
👤&nbsp;Moi</a>
</li><li>
<a href="<?=$RelBasePath?>liens/" id="menu_liens">
<span class="menu_icon"></span>&nbsp;Liens</a>
🔗&nbsp;Liens</a>
</li>

</ul>
Binary file removed images/menu/accueil.gif
Binary file not shown.
Binary file removed images/menu/informatique.gif
Binary file not shown.
Binary file removed images/menu/liens.gif
Binary file not shown.
Binary file removed images/menu/menu-sprites.png
Binary file not shown.
Binary file removed images/menu/moi.gif
Binary file not shown.
Binary file removed images/menu/zicmue.gif
Binary file not shown.
7 changes: 4 additions & 3 deletions index.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php ob_start('ob_gzhandler');
$pageVersion = "v8.1.0";
$pageVersion = "v8.2.0";

// NAVIGATION
$RelBasePath = "";
@@ -140,9 +140,10 @@
****/
?>

<dt>14/08/2024, v8.1.0</dt>
<dt>14/08/2024, v8.2.0</dt>
<dd>
- <a href="zicmue/">Musiques</a> : mise à jour complète du contenu
- <a href="zicmue/">Musiques</a> : mise à jour complète du contenu<br>
- Menu : changement d'apparence
</dd>

<dt>13/08/2024, v8.0.0</dt>
8 changes: 8 additions & 0 deletions zicmue/index.php
Original file line number Diff line number Diff line change
@@ -268,6 +268,14 @@ class="pretty-img" style="float:right; margin-left: 60px; transform: rotate(6deg
<li>2021 : <a href="https://www.flickr.com/photos/pirgoif/albums/72157719939836099">concert Philippe Renard</a>, <a href="https://www.flickr.com/photos/pirgoif/albums/72157719959862356">concert Pierre Hamon</a>, <a href="https://www.flickr.com/photos/pirgoif/albums/72157720013003003">Bal</a></li>
</ul>
</li>
<li>Evénements Fanfares :
<ul>
<li>2023 : <a href="https://www.flickr.com/photos/pirgoif/albums/72177720312177018">Les 10 ans des Son'enBulles</a></li>
<li>2022 : <a href="https://www.flickr.com/photos/pirgoif/albums/72177720300537588">Anniversaire des Garces Embouchées</a></li>
<li>2021 : <a href="https://www.flickr.com/photos/pirgoif/albums/72157719802471828">La Valdingue 2021</a></li>
<li>2014 : <a href="https://www.flickr.com/photos/pirgoif/albums/72157646265826332">Fort en son 6</a></li>
</ul>
</li>
</ul>


0 comments on commit 02e3bda

Please sign in to comment.