pgp #1

Open
pgp wants to merge 10 commits from pgp into master
11 changed files with 20 additions and 19 deletions
Showing only changes of commit 60df03a126 - Show all commits

Binary file not shown.

View file

@ -17,11 +17,11 @@ transition_speed = "slow"
## UN FABLAB DE L'UNIVERSITÉ DE BORDEAUX OUVERT À TOUS
<br>
<a href="/#/2" ><p style="font-size:25px;">///PRÉSENTATION///<p></a>
<a href="/#/2" ><p style="font-size:25px;">///MACHINES-RÉSERVATIONS///<p></a>
<a href="/#/2" ><p style="font-size:25px;">///PROJETS EN COURS///</p></a>
<a href="/#/2" ><p style="font-size:25px;">///PORTFOLIOS///</p></a>
<a href="/#/2" ><p style="font-size:25px;">///CONTACT-INSCRIPTIONS///</p></a>
<a href="/#/2" ><p style="font-size:25px;">/// PRÉSENTATION ///<p></a>
<a href="/#/2" ><p style="font-size:25px;">/// MACHINES-RÉSERVATIONS ///<p></a>
<a href="/#/2" ><p style="font-size:25px;">/// PROJETS EN COURS ///</p></a>
<a href="/#/2" ><p style="font-size:25px;">/// PORTFOLIOS ///</p></a>
<a href="/#/2" ><p style="font-size:25px;">/// CONTACT-INSCRIPTIONS ///</p></a>
@ -29,16 +29,17 @@ transition_speed = "slow"
{{% section %}}
{{< slide class="hello" background-color="#D8E9A8">}}
# MACHINES
&
# RÉSERVATIONS
<a href="/#/1/1"><img src="images/icone-decoupe-laser.png" href="/#/1/1" alt="découpe-laser" width="30%" height="auto" margin="10px" align="left"/></a>
<a href="/#/1/2" ><img src="images/impression3d.jpg" alt="impression 3D" width="30%" height="auto" margin="10px" align="left"/></a>
{{< slide class="hello" background-color="#f2f2f2">}}
# MACHINES & RÉSERVATIONS
<a href="/#/1/1"><img src="images/logo-3D-print-fd-blc.png" href="/#/1/1" alt="impression 3D" width="30%" height="auto" margin="10px" align="left"/></a>
<a href="/#/1/2" ><img src="images/logo-découpe-laser-fd-blc.png" alt="découpe laser" width="30%" height="auto" margin="10px" align="center"/></a>
<a href="/#/1/1"><img src="images/logo-fraiseuse-fd-blc.png" href="/#/1/1" alt="impression 3D" width="30%" height="auto" margin="10px" align="right"/></a>
<br>
<a href="/#/1/2" ><img src="images/logo-plotter-fd-blc.png" alt="découpe laser" width="30%" height="auto" margin="10px" align="left"/></a>
<a href="/#/1/2" ><img src="images/logo-brodeuse-fd-blc.png" alt="découpe laser" width="30%" height="auto" margin="10px" align="center"/></a>
<a href="/#/1/1"><img src="images/logo-autres-outils-fd-blc.png" href="/#/1/1" alt="impression 3D" width="30%" height="auto" margin="10px" align="right"/></a>
---

View file

@ -32,7 +32,7 @@
.reveal section[data-background-image] a,
.reveal section[data-background-image] p,
.reveal section[data-background-image] h2 {
color: f2f2f2;
color: #f2f2f2;
}
.reveal section[data-background-image] a {
text-decoration: underline;

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

View file

@ -130,7 +130,7 @@ body {
.reveal h2,
.reveal h3 {
color: #cccccc;
text-shadow: 2px 2px rgba(0,0,00.4);}
text-shadow: 2px 2px rgba(0,0,0,0.8);}
.reveal h4,
.reveal h5,
.reveal h6 {
@ -298,7 +298,7 @@ body {
*********************************************/
.reveal a {
color: rgb(72,210,0);
text-shadow: 2px 2px rgba(0,0,00.4);
text-shadow: 2px 2px rgba(0,0,0,0.7);
text-decoration: none;
-webkit-transition: color .15s ease;
-moz-transition: color .15s ease;
@ -317,14 +317,14 @@ body {
* IMAGES
*********************************************/
.reveal section img {
margin: 15px 0px;
margin: 0 0;
background: rgba(255, 255, 255, 0.12);
border: 4px solid #363636;
border: 0px solid #363636;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.15); }
.reveal section img.plain {
border: 0;
box-shadow: none; }
box-shadow: 10px 10px 2px 1px rgba(0,0,0,1; }
.reveal a img {
-webkit-transition: all .15s linear;