html changes

Author: ChristelleWehbe93

project_scrum/static/description/index.html

@@ -1,5 +1,7 @@
+<!--
 <t name="Homepage" priority="29" t-name="website.homepage">
   <t t-call="website.layout">
+-->
     <div id="wrap" class="oe_structure oe_empty">
       <div class="carousel slide mb64 mt0" id="myCarousel0">
         <ol class="carousel-indicators">
@@ -48,49 +50,52 @@ <h1 class="carousel-content col-md-6 col-sm-12 mb128 mt128">Get a good overview
           <i class="fa fa-chevron-right" style=""/>
         </div>
       </div>
-      <section class="mb16 para_large">
-        <div class="container">
-          <div class="row mt16 mb16">
-            <div class="text-center col-md-2"><span class="fa fa-suitcase fa-5x"/><h3 class="mt8 mb0">Planing</h3>
-Scrum is a tool that gives your team and empolyees the oportunity to plan their work in a more neat and structured way.</div>
-            <div class="text-center col-md-2">
-              <span class="fa fa-lock fa-5x" style=""/>
-              <h3 class="mt8 mb0">Roles</h3>
-              <p>Each team member has his own role. In Scrum there are always three different roles; Product Owner, Scrum Master and the developers.</p>
-              <div class="text-muted"/>
+    <section class="mb12 para_large">
+        <div class="oe_container">
+            <div class="row ">
+                <div class="text-center col-md-4">
+                    <span class="fa fa-suitcase fa-5x"/>
+                    <h3 class="mt8 mb0">Planing</h3>
+                    Scrum is a tool that gives your team and empolyees the oportunity to plan their work in a more neat and structured way.
+                </div>
+                
+                <div class="text-center  col-md-4">
+                    <span class="fa fa-lock fa-5x" style=""/>
+                    <h3 class="mt8 mb0">Roles</h3>
+                    Each team member has his own role. In Scrum there are always three different roles; Product Owner, Scrum Master and the developers.
+                    <div class="text-muted"/>
+                </div>
+
+                <div class="text-center  col-md-4">
+                    <span class="fa fa-heart fa-5x" style=""/>
+                    <h3 class="mt8 mb0 " style="">Daily Meetings.</h3>
+                    Daily Meeting for a maximum of 15 minutes duration where each member of the team will have to answer three question about what he did/will do and what obsticles he faces.
+                </div>
             </div>
-<<<<<<< HEAD
-            <div class="text-center col-md-2"><span class="fa fa-heart fa-5x" style=""/><h3 class="mt8 mb0" style="text-align: left;">Daily Meetings.</h3>
-Daily Meeting for a maximum of 15 minutes duration where each member of the team will have to answer three question about what he did/will do and what obsticles he faces.</div>
-          </div>
-=======
-            
-             <div class="oe_span4">
-                <h3 >Daily Meetings</h3>
-                <p >
-                   Daily meeting for a maximum of 15 minutes duration where each member of the team will have to answer three questions about what he did/will do and what obstacles he faces.
-               </p> 
-               <br>
-            </div>    
-        
+        </div>
+    </section>
+
         <section>          
             <div class="oe_span12">
                 <h3 class="oe_slogan">Sprints</h3>   
                 <p>
                     In Scrum you will work by sprints, where every sprint should be completed under a specific period which can vary from weeks and up to months.
                 </p>
-                
-                 <center>
-                     <img src="kanban.png" height="300" width="500">
+                <center>
+                    <img src="kanban.png" height="300" width="500">
                 </center> 
-                
-                <p>
-
-            This is a port and enhancement of the old project_scrum version 6.1 by OpenERP SA.
-</p>
->>>>>>> 98f9e11dfdbfb3f05eae480eca7d7a606b50808a
-        </div>
-      </section>
+                <br/><br/>
+            </div> 
+            <br/><br/>     
+        </section>
+        
+            <div class="form-group">
+                <div class="col-sm-10">
+                <label class="control-label">This is a port and enhancement of the old project_scrum version 6.1 by OpenERP SA.</label>
+            </div>   
     </div>
+
+<!--
   </t>
 </t>
+-->