Skip to content

Commit 318f1af

Browse files
author
Arturos Sanchez Pineda
committed
repair and improve all the macro-objects aligments
1 parent f17403c commit 318f1af

File tree

81 files changed

+193
-165
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+193
-165
lines changed

‎footer-home.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<div class="footer">
2+
<CENTRE>
3+
<p style="padding: 0px 0px 50px 0px;">
4+
<b><a href="./index.php"><font color="white">revenir à la page d'accueil</font></a></b>
5+
</p>
6+
</CENTRE>
7+
</div>

‎glossaire.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<!DOCTYPE html>
22
<html>
33
<header>
4-
<?php include('header-glossaire.html'); ?>
4+
<div style="width:1200px; margin:0 auto;">
5+
<?php include('header-glossaire.html'); ?>
6+
</div>
57
</header>
68

79
<!-- body -->

‎header-glossaire.html‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,27 @@
1515
<link rel="stylesheet" type="text/css" href="css/demo.css" />
1616
<link rel="stylesheet" type="text/css" href="css/style-us.css" />
1717

18-
19-
<style type="text/css">
20-
#first {
21-
width: 280px;
22-
height: 30px;
23-
float:left;
24-
border: 0px;
25-
margin: 20px 5px 10px 10%;
26-
overflow: hidden;
27-
}
28-
#second {
29-
width: 115px;
30-
height: 30px;
31-
float:right;
32-
border: 0px;
33-
overflow: hidden; /* if you don't want #second to wrap below #first */
34-
margin: 20px 10% 10px 20px;
35-
overflow: hidden;
36-
}
37-
</style>
18+
<style type="text/css">
19+
#first {
20+
width: 280px;
21+
height: 30px;
22+
float:left;
23+
border: 0px;
24+
margin: 25px 0px 10px 0px;
25+
overflow: hidden;
26+
padding: 0px 0px 0px 0px;
27+
}
28+
#second {
29+
width: 115px;
30+
height: 30px;
31+
float:right;
32+
border: 0px;
33+
overflow: hidden; /* if you don't want #second to wrap below #first */
34+
margin: 25px 0px 10px 0px;
35+
padding: 0px 0px 0px 0px;
36+
text-align: right;
37+
}
38+
</style>
3839

3940
<div>
4041
<div id="first">
@@ -43,8 +44,8 @@
4344
</div>
4445

4546
<div id="second">
46-
<!-- Notre projet -->
47-
<a style="color:white;font-size:120%;" href="./us.php">Notre projet</a>
47+
<!-- back home -->
48+
<a style="color:white;font-size:120%;" href="./index.php">Page d'accueil</a>
4849
</div>
4950
</div>
5051

‎header-us.html‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,27 @@
1515
<link rel="stylesheet" type="text/css" href="css/demo.css" />
1616
<link rel="stylesheet" type="text/css" href="css/style-us.css" />
1717

18-
19-
<style type="text/css">
20-
#first {
21-
width: 280px;
22-
height: 30px;
23-
float:left;
24-
border: 0px;
25-
margin: 20px 5px 10px 10%;
26-
overflow: hidden;
27-
}
28-
#second {
29-
width: 115px;
30-
height: 30px;
31-
float:right;
32-
border: 0px;
33-
overflow: hidden; /* if you don't want #second to wrap below #first */
34-
margin: 20px 10% 10px 20px;
35-
overflow: hidden;
36-
}
37-
</style>
18+
<style type="text/css">
19+
#first {
20+
width: 280px;
21+
height: 30px;
22+
float:left;
23+
border: 0px;
24+
margin: 25px 0px 10px 0px;
25+
overflow: hidden;
26+
padding: 0px 0px 0px 0px;
27+
}
28+
#second {
29+
width: 115px;
30+
height: 30px;
31+
float:right;
32+
border: 0px;
33+
overflow: hidden; /* if you don't want #second to wrap below #first */
34+
margin: 25px 0px 10px 0px;
35+
padding: 0px 0px 0px 0px;
36+
text-align: right;
37+
}
38+
</style>
3839

3940
<div>
4041
<div id="first">

‎header.html‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,33 @@
1616
<link rel="stylesheet" type="text/css" href="css/demo.css" />
1717
<link rel="stylesheet" type="text/css" href="css/style-short.css" />
1818

19-
20-
<style type="text/css">
21-
#first {
22-
width: 250px;
23-
height: 30px;
24-
float:left;
25-
border: 0px;
26-
margin: 20px 5px 10px 10%;
27-
overflow: hidden;
28-
}
29-
#second {
30-
width: 100px;
31-
height: 30px;
32-
float:right;
33-
border: 0px;
34-
overflow: hidden; /* if you don't want #second to wrap below #first */
35-
margin: 20px 10% 10px 20px;
36-
overflow: hidden;
37-
}
38-
</style>
39-
19+
<style type="text/css">
20+
#first {
21+
width: 280px;
22+
height: 30px;
23+
float:left;
24+
border: 0px;
25+
margin: 25px 0px 10px 0px;
26+
overflow: hidden;
27+
padding: 0px 0px 0px 0px;
28+
}
29+
#second {
30+
width: 115px;
31+
height: 30px;
32+
float:right;
33+
border: 0px;
34+
overflow: hidden; /* if you don't want #second to wrap below #first */
35+
margin: 25px 0px 10px 0px;
36+
padding: 0px 0px 0px 0px;
37+
text-align: right;
38+
}
39+
</style>
4040

4141
<div>
4242
<div id="first">
4343
<!--title of the project/app -->
44-
<h1 style="color:white;font-size:120%;">BIHM: books x objects</h1>
44+
<h1 style="color:white;font-size:190%;">BIHM: books x objects</h1>
45+
4546
</div>
4647

4748
<div id="second">

‎index.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<!DOCTYPE html>
22
<html>
33
<header>
4+
<div style="width:1200px; margin:0 auto;">
45
<?php include('header.html'); ?>
6+
</div>
57
</header>
68

79
<!-- body -->

‎photos/css/mainpage.css‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@ div.left {
1111
grid-column-start: 1;
1212
grid-column-end: 2;
1313
grid-row-start: 1;
14-
grid-row-end: 2;
14+
grid-row-end: 1;
1515
background-color: Black;
1616
text-align:center;
1717
position: relative;
18-
height: 100%;
19-
min-width: 100px;
20-
max-width: 620px;
18+
min-width: 150px;
19+
max-width: 1000px;
2120
display: flex;
2221
align-items: center;
2322
justify-content: center;
24-
padding: 0px 0px 0px 20px;
23+
padding: 0px 0px 0px 12%;
2524
margin-left: auto;
2625
margin-right: auto;
2726
align: center;
@@ -31,16 +30,19 @@ div.right {
3130
grid-column-start: 3;
3231
grid-column-end: 4;
3332
grid-row-start: 1;
34-
grid-row-end; 1;
33+
grid-row-end: 1;
3534
background-color: Black;
3635
text-align:center;
3736
position: relative;
38-
height: 100%;
39-
min-width: 100px;
40-
max-width: 930px;
37+
min-width: 150px;
38+
max-width: 900px;
4139
display: flex;
4240
align-items: center;
4341
justify-content: center;
42+
padding: 0px 8% 0px 5%;
43+
margin-left: auto;
44+
margin-right: auto;
45+
align: center;
4446
}
4547

4648
div.middle {
@@ -49,9 +51,15 @@ div.middle {
4951
grid-row-start: 2;
5052
grid-row-end: 2;
5153
background-color: Black;
52-
padding: 10px 4% 0px 1%;
54+
position: relative;
55+
padding: 15px 0px 0px 10%;
5356
font-size: 115%;
57+
display: flex;
58+
align-items: center;
5459
font-family: "NeoSansStd";
60+
min-width: 150px;
61+
max-width: 800px;
62+
margin:0 auto;
5563
}
5664

5765
div.below {

‎photos/header.html‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,31 @@
99
<title>IHM</title>
1010

1111
<style type="text/css">
12-
#first {
13-
width: 250px;
12+
#first {
13+
width: 280px;
1414
height: 30px;
15-
float:left;
16-
border: 0px;
17-
margin: 20px 5px 10px 10%;
18-
overflow: hidden;
19-
}
20-
#second {
21-
width: 100px;
15+
float:left;
16+
border: 0px;
17+
margin: 25px 0px 10px 0px;
18+
overflow: hidden;
19+
padding: 0px 0px 0px 0px;
20+
}
21+
#second {
22+
width: 115px;
2223
height: 30px;
23-
float:right;
24-
border: 0px;
25-
overflow: hidden; /* if you don't want #second to wrap below #first */
26-
margin: 20px 10% 10px 20px;
27-
overflow: hidden;
28-
}
24+
float:right;
25+
border: 0px;
26+
overflow: hidden; /* if you don't want #second to wrap below #first */
27+
margin: 25px 0px 10px 0px;
28+
padding: 0px 0px 0px 0px;
29+
text-align: right;
30+
}
2931
</style>
3032

3133
<div>
3234
<div id="first">
3335
<!--title of the project/app -->
34-
<a style="color:white;font-size:120%;" href="../index.php">BIHM: books x objects</a>
36+
<a style="color:white;font-size:190%;" href="../index.php">BIHM: books x objects</a>
3537
</div>
3638

3739
<div id="second">

‎photos/photo.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
<head>
44
<?php include('head.html'); ?>
55
</head>
6+
67
<header>
8+
<div style="width:1200px; margin:0 auto;">
79
<?php include('header.html'); ?>
10+
</div>
811
</header>
912

1013
<?php
@@ -54,10 +57,9 @@
5457
}
5558
fclose($file);
5659

57-
echo "<p style=\"padding: 0px 0px 0px 10%; color:white;\">";
60+
echo "<p style=\"padding: 0px 0px 0px 0px; color:white;\">";
5861
echo "<b>$data[3]</b>";
5962
echo"<br>$data[5]</br>";
60-
echo "<a href=\"https://creativecommons.org/licenses/by-sa/4.0\" target=\"_blank\" title=\"Creative Commons Attribution-Share Alike 4.0\" >CC BY-SA 4.0</a>";
6163
echo "</p>";
6264
?>
6365
<!-- end legend under the picture -->

‎photos/related-books.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="component">
22
<div class="container demo-3">
3-
<p align="left" style="padding: 60px 0px 10px 132px; color:rgb(255,255,255);""><b>En lien avec cet objet</b></p>
3+
<p align="center" style="padding: 60px 0px 10px 0px; color:rgb(255,255,255);""><b>En lien avec cet objet</b></p>
44
<!-- Top Navigation -->
55
<ul class="grid cs-style-4">
66
<li>

0 commit comments

Comments
 (0)