diff --git a/blog/templates/blog/index.html b/blog/templates/blog/index.html index c0770c0..b658295 100644 --- a/blog/templates/blog/index.html +++ b/blog/templates/blog/index.html @@ -1,6 +1,7 @@ {% extends 'template.html' %} {% load staticfiles %} {% block content %} +
{%for article in articles%}
@@ -19,4 +20,5 @@
{%endfor%}
+
{% endblock %} diff --git a/member/templates/member/index.html b/member/templates/member/index.html index 3400a09..cdb43db 100644 --- a/member/templates/member/index.html +++ b/member/templates/member/index.html @@ -1,6 +1,7 @@ {% extends 'template.html' %} {% load staticfiles %} {% block content %} +
diff --git a/project/templates/project/index.html b/project/templates/project/index.html index 448b08f..01153d4 100644 --- a/project/templates/project/index.html +++ b/project/templates/project/index.html @@ -2,6 +2,7 @@ {% load staticfiles %} {% block content %} +
@@ -20,14 +21,15 @@
{% if project.screenshot %} - + {% else %} - + {% endif %}
{% endfor %}
+ {% endblock %} diff --git a/project/templates/project/projet.html b/project/templates/project/projet.html index 72886dd..09f31d0 100644 --- a/project/templates/project/projet.html +++ b/project/templates/project/projet.html @@ -1,6 +1,7 @@ {% extends 'template.html' %} {% load staticfiles %} {% block content %} +

{{ project.name }}

@@ -46,5 +47,6 @@ {% endfor %}
+
{% endblock %} diff --git a/static/css/projet.css b/static/css/projet.css index 555a3e2..e69de29 100644 --- a/static/css/projet.css +++ b/static/css/projet.css @@ -1,5 +0,0 @@ -# { - padding-top: 70px; /* Required padding for .navbar-fixed-top. Remove if using .navbar-static-top. Change if height of navigation changes. */ - color:#888; - margin:auto; -} diff --git a/static/css/style.css b/static/css/style.css index f345d97..393353f 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -9,6 +9,8 @@ html { min-height: 100%; } body { + /*min-height:1200px; + max-height:1200px;*/ margin-bottom: 0px; padding-bottom: 0px; color: #696969 ; @@ -121,14 +123,21 @@ footer { -webkit-border-radius: 50%; -moz-border-radius: 50%; border-radius: 50%; - border: 5px solid rgba(255,255,255,0.5); + border: 5px solid rgba(255,255,255,0.5); +} +.projet +{ + border: 5px solid rgba(255,255,255,0.5); + min-width:300px; + max-width:300px; + min-height:200px; + max-height:300px; + } - .list-item .list-link { display: block; position: relative; margin: 0 auto; - max-width: 250px; } .list-item .list-link .caption { @@ -160,6 +169,7 @@ footer { -webkit-border-radius: 50%; -moz-border-radius: 50%; border-radius: 50%; + max-width:250px; } @@ -187,7 +197,7 @@ footer { } .infobox { - padding:15px; + padding-top:15px; height:40%; -webkit-box-shadow: 0px 1px 5px 0px rgba(0,0,0,1); -moz-box-shadow: 0px 1px 5px 0px rgba(0,0,0,1); @@ -227,8 +237,8 @@ footer { #contact { background-color:#f8f8f8; - max-height:100px; - min-height:100px; + max-height:125px; + min-height:125px; color:black; } #contact .boxContent @@ -237,13 +247,12 @@ footer { } #contact ul { - float:right; - display:inline; + display:block; } #contact li { - display:inline; + display:block; padding:5px; } #conjure @@ -264,9 +273,27 @@ footer { } .imgJams { - height:20%; + height:30%; width:40%; } +.imgJams +{ + height:30%; + width:40%; +} +.logo +{ + width:29px; + padding:5px;} +.left +{ + float:left; +} + +.right +{ + float:right; +} @media(min-width:767px) { #projet .list-item { margin: 0 0 30px; diff --git a/static/img/fblogo.png b/static/img/fblogo.png new file mode 100644 index 0000000..1de20ba Binary files /dev/null and b/static/img/fblogo.png differ diff --git a/static/img/jams/55906118.jpg b/static/img/jams/55906118.jpg new file mode 100644 index 0000000..8afeb63 Binary files /dev/null and b/static/img/jams/55906118.jpg differ diff --git a/static/img/ytlogo.png b/static/img/ytlogo.png new file mode 100644 index 0000000..5322e65 Binary files /dev/null and b/static/img/ytlogo.png differ diff --git a/templates/index.html b/templates/index.html index 25b2f5b..d9f7667 100644 --- a/templates/index.html +++ b/templates/index.html @@ -51,12 +51,14 @@ Voici quelque Game Jam auquel Conjure participe:
-

{% endblock %} diff --git a/templates/template.html b/templates/template.html index a1bb9b4..71922c9 100644 --- a/templates/template.html +++ b/templates/template.html @@ -15,7 +15,7 @@ - + @@ -41,7 +41,7 @@