Commit Antoine

blog/templates/blog/index.html

@@ -1,6 +1,7 @@
 {% extends 'template.html' %}
 {% load staticfiles %}
 {% block content %}
+<div class="boxContent">
 <section id="cd-timeline" class="cd-container">
 	{%for article in articles%}
 	<div class="cd-timeline-block">
@@ -19,4 +20,5 @@
 		</div> <!-- cd-timeline-block -->
 	{%endfor%}
 </section>
+</div>
 {% endblock %}

member/templates/member/index.html

@@ -1,6 +1,7 @@
 {% extends 'template.html' %}
 {% load staticfiles %}
 {% block content %}
+<div class="boxContent">
     <section id = "membre">
         <div class="container">
             <div class="row">

project/templates/project/index.html

@@ -2,6 +2,7 @@
 {% load staticfiles %}
 {% block content %}
 	 <!-- projet Grid Section -->
+	 
     <section  id="projet">
         <div class="container">
             <div class="row">
@@ -20,14 +21,15 @@
                             </div>
                         </div>
                         {% if project.screenshot %}
-                            <img src="{{ project.screenshot.url }}" class="img-responsive" alt="">
+                            <img src="{{ project.screenshot.url }}" class="projet" alt="">
                         {% else %}
-                            <img src="{% static 'img/projet/cabin.png' %}" class="img-responsive" alt="">
+                            <img src="{% static 'img/projet/cabin.png' %}" class="projet" alt="">
                         {% endif %}
                     </a>
                 </div>
                 {% endfor %}
             </div>
         </div>
+		</div>
     </section>
 {% endblock %}

project/templates/project/projet.html

@@ -1,6 +1,7 @@
 {% extends 'template.html' %}
 {% load staticfiles %}
 {% block content %}
+<div class="boxContent">
     <div class="projet">
         <div class="col-lg-12">
 		    <h1>{{ project.name }}</h1>
@@ -46,5 +47,6 @@
                 {% endfor %}
             </div>
         </div>
+		</div>
     </section>
 {% endblock %}

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;
-}

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;

templates/index.html

@@ -51,12 +51,14 @@ Voici quelque Game Jam auquel Conjure participe:
 </div>
 </div>
 <div class="infobox" id="contact">
-<p><ul><li>local A-1744</li>
+<p><ul class="right"><li>local A-1744</li>
 <li>Conjure@ens.etsmtl.ca</li>
 <li>(514) 396-8800 poste: #7713</li>
-<li><a href="https://www.facebook.com/ConjureETS">ConjureETS</a></li>
-<li><a href="https://www.youtube.com/user/ConjureETS">Youtube</a></li>
-<ul></p>
+</ul>
+<ul class="left">
+<li><a href="https://www.facebook.com/ConjureETS"><img src={% static 'img/fblogo.png' %} class="logo"/>ConjureETS</a></li>
+<li><a href="https://www.youtube.com/user/ConjureETS"><img src={% static 'img/ytlogo.png' %} class="logo"/>Youtube</a></li>
+</ul></p>
 </div>
 </div>
 {% endblock %}

templates/template.html

@@ -15,7 +15,7 @@
     <link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
     <!-- Custom CSS -->
     <link href="{% static 'css/style.css' %}" rel="stylesheet">
-	<link href="{% static 'css/timeline2.css' %}" rel="stylesheet">
+	<!--link href="{% static 'css/timeline2.css' %}" rel="stylesheet"-->
     <!-- Custom Fonts -->
     <link href="{% static 'css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
     <link href="http://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
@@ -41,7 +41,7 @@
             <div id="navbar" class="navbar-collapse collapse">
               <ul class="nav navbar-nav">
                 <li><a href="{% url 'index' %}">Accueil</a></li>
-                <li><a href="{% url 'blog:index' %}">Blog</a></li>
+                <!--li><a href="{% url 'blog:index' %}">Blog</a></li-->
                 <li><a href="{% url 'project:index' %}">Projets</a></li>
 				<li><a href="{% url 'member:index' %}">Membres</a></li>
               </ul>