Merge branch 'alex'

[MERGE] Alex CSS stuff

static/css/variables.less

@@ -10,15 +10,15 @@
 // -------------------------
 
 @gray-darker:            lighten(#000, 13.5%); // #222
-@gray-dark:              #654d29;   // #333
-@gray:                   #a07833; // #555
-@gray-light:             #caa24c;   // #999
-@gray-lighter:           #d1ae5a; // #eee
+@gray-dark:              #666666;   // #333
+@gray:                   #a5817f; // #555
+@gray-light:             #a2a3a2;   // #999
+@gray-lighter:           #eaafae; // #eee
 
 // Brand colors
 // -------------------------
 
-@brand-primary:         #9f6918;
+@brand-primary:         #bd2525;
 @brand-success:         #5cb85c;
 @brand-warning:         #f0ad4e;
 @brand-danger:          #d9534f;
@@ -27,7 +27,7 @@
 // Scaffolding
 // -------------------------
 
-@body-bg:               #f2e3a1;
+@body-bg:               #f8f8f7;
 @text-color:            @gray-dark;
 
 // Links
@@ -98,7 +98,7 @@
 @table-bg-hover:                     #f5f5f5;
 @table-bg-active:                    @table-bg-hover;
 
-@table-border-color:                 #654d29; // table and cell border
+@table-border-color:                 #666666; // table and cell border
 
 
 // Buttons
@@ -269,7 +269,7 @@
 //
 // Reset inverted navbar basics
 @navbar-inverse-color:                      @gray-light;
-@navbar-inverse-bg:                         #191d26;
+@navbar-inverse-bg:                         #090a09;
 @navbar-inverse-border:                     darken(@navbar-inverse-bg, 10%);
 
 // Inverted navbar links

templates/corpus.html

@@ -5,7 +5,6 @@
 {% load staticfiles %}
 
 <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.css" %}">
-<link rel="stylesheet" type="text/css" href="{% static "css/bootstrap-theme.min.css" %}">
 <link rel="stylesheet" type="text/css" href="{% static "css/morris.css" %}">
 <link rel="stylesheet" type="text/css" href="{% static "css/jquery.easy-pie-chart.css"%}">
 

templates/home.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 <link rel="stylesheet" href="{% static "css/bootstrap.css" %}">
 <link rel="stylesheet" href="{% static "css/bootstrap-theme.min.css" %}">
+
+<script src="{% static "js/jquery/jquery-1.9.1.min.js"%}"></script>
 {% endblock %}
 
 
@@ -16,8 +18,25 @@
 						<h1>Gargantext</h1>
 						<p>A web platform to explore text-mining</p>
         </div>
+
+		<div class="container">
+				<div class="row">
+						<div class="content">
+						<center>
+						<h2>Tutoral in Video</h2>
+						<video width="320" height="240" controls>
+						<source src="movie.mp4" type="video/mp4">
+						<source src="movie.ogg" type="video/ogg">
+						Your browser does not support this video sorry. Try Firefox or Chromium.
+						</video>
+						</center>
+				</div>
+				</div>
+		</div>
 </div>
 
+
+
 <div class="container">
     <div class="row">
 										<div class="col-md-4 content">

templates/menu.html

@@ -60,8 +60,9 @@
 {% load staticfiles %}
 
 
-<!-- <script src="{% static "js/jquery/jquery-1.9.1.min.js"%}"></script> -->
+<!-- 
 
+<script src="{% static "js/jquery/jquery-1.9.1.min.js"%}"></script> 
 <script src="{% static "js/easy/jquery.easypiechart.js"%}"></script>
 
 <script type="text/javascript">
@@ -74,7 +75,10 @@ $(function() {
 
 </script>
 
+-->
+
 <script src="{% static "js/bootstrap/bootstrap.min.js" %}"></script>
+
 <script>$(function () { $("[data-toggle='popover']").popover({
 		html:true,
 		title: function() {

templates/project.html

@@ -4,7 +4,6 @@
 {% block css %}
 {% load staticfiles %}
 <link rel="stylesheet" href="{% static "css/bootstrap.css" %}">
-<link rel="stylesheet" href="{% static "css/bootstrap-theme.min.css" %}">
 
 <link rel="stylesheet" type="text/css" href="{% static "css/morris.css" %}">
 <link rel="stylesheet" type="text/css" href="{% static "css/jquery.easy-pie-chart.css"%}">
@@ -112,7 +111,7 @@
             {% endif %}
 
             ],
-            colors: ["#939393", "#939555"],
+            colors: ["@white", "@white"],
             //colors: ["#30a1ec", "#76bdee"],
             formatter: function (y) { return y + "%" }
         });

templates/projects.html

@@ -4,7 +4,8 @@
 {% block css %}
 {% load staticfiles %}
 <link rel="stylesheet" href="{% static "css/bootstrap.css" %}">
-<link rel="stylesheet" href="{% static "css/bootstrap-theme.min.css" %}">
+
+<script src="{% static "js/jquery/jquery-1.9.1.min.js"%}"></script>
 {% endblock %}
 
 
@@ -49,8 +50,10 @@
 												</h3>
 
 												<h4>{{ project.subtitle }}<h4>
+												<!-- 
 												<h5>Completed:</h5>
 												<div class="chart" barColor="#fffff" data-percent="75">75%</div>
+												--!>
 										</div>
 										{% endfor %}
 								{% endif %}