Style templates

kfet/static/kfet/css/index.css

@@ -2,17 +2,37 @@
 
 body {
     margin-top:50px;
-    font-family:'Open Sans';
+    font-family:Roboto;
+}
+
+h1,h2,h3,h4,h5,h6 {
+    font-family:Oswald;
 }
 
 a:focus, a:hover {
     color:#C8102E;
 }
 
+.btn-group .btn+.btn, .btn-group .btn+.btn-group, .btn-group .btn-group+.btn, .btn-group .btn-group+.btn-group {
+    margin-left:5px;
+}
+
 .btn, .btn-lg, .btn-group-lg>.btn {
     border-radius:0;
 }
 
+.btn-primary {
+    font-family:Oswald;
+    background-color:rgba(200,16,46,0.9);
+    color:#FFF;
+    border:0;
+}
+
+.btn-primary:hover, .btn-primary.focus, .btn-primary:focus {
+    background-color:#000;
+    color:#FFF;
+}
+
 .container-fluid .row:first-child {
     background-color:rgba(200,16,46,1);
     color:#FFF;

kfet/static/kfet/css/nav.css

@@ -1,14 +1,19 @@
 nav {
     background:#000;
     color:#DDD;
+    font-family:Oswald;
 }
 
 .navbar-fixed-top {
     border:0;
 }
 
-nav .navbar-brand:focus, .navbar-brand:hover {
+nav .navbar-brand {
-    color:#FFF;
+    padding:3px 25px;
+}
+
+nav .navbar-brand img {
+    height:44px;
 }
 
 nav .navbar-toggle .icon-bar {

kfet/templates/kfet/account_read.html

@@ -24,7 +24,7 @@
       <a class="btn btn-primary" href="{% url 'kfet.account.update' account.trigramme %}">
         Modifier
       </a>
-      <a class="btn btn-default disabled">Recharger par CB</a>
+      <a class="btn btn-primary">Recharger par CB</a>
     </div>
   </div>
 </div>

kfet/templates/kfet/account_read_title.html

@@ -0,0 +1,5 @@
+{% if account.user == request.user %}
+    Mon compte
+{% else %}
+    Informations du compte {{ account.trigramme }}
+{% endif %}

kfet/templates/kfet/article.html

@@ -8,7 +8,7 @@
 <div class="row">
   <div class="col-lg-12">
     <div class="btn-group btn-group-lg">
-      <a class="btn btn-default" href="{% url 'kfet.article.create' %}">Créer un article</a>
+      <a class="btn btn-primary" href="{% url 'kfet.article.create' %}">Créer un article</a>
     </div>
   </div>
 </div>

kfet/templates/kfet/article_read.html

@@ -8,7 +8,7 @@
 <div class="row">
   <div class="col-lg-12">
     <div class="btn-group btn-group-lg">
-      <a class="btn btn-default" href="{% url 'kfet.article.update' article.pk %}">Modifier</a>
+      <a class="btn btn-primary" href="{% url 'kfet.article.update' article.pk %}">Modifier</a>
     </div>
   </div>
 </div>

kfet/templates/kfet/base.html

@@ -7,7 +7,7 @@
 
     {# CSS #}
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
+    <link href='https://fonts.googleapis.com/css?family=Roboto|Oswald:400,700' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" type="text/css" href="{% static 'kfet/css/index.css' %}">
 
     {# JS #}

kfet/templates/kfet/base_nav.html

@@ -1,3 +1,5 @@
+{% load staticfiles %}
+
 <nav class="navbar navbar-fixed-top">
   <div class="container-fluid">
     <div class="navbar-header">
@@ -7,7 +9,9 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="#">K-Fêt</a>
+      <a class="navbar-brand" href="#">
+        <img src="{% static 'kfet/img/logo3.png' %}">
+      </a>
     </div>
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
       <ul class="nav navbar-nav">

kfet/templates/kfet/checkout.html

@@ -8,7 +8,7 @@
 <div class="row">
   <div class="col-lg-12">
     <div class="btn-group btn-group-lg">
-      <a class="btn btn-default" href="{% url 'kfet.checkout.create' %}">Créer une caisse</a>
+      <a class="btn btn-primary" href="{% url 'kfet.checkout.create' %}">Créer une caisse</a>
     </div>
   </div>
 </div>

kfet/templates/kfet/checkout_read.html

@@ -8,8 +8,8 @@
 <div class="row">
   <div class="col-lg-12">
     <div class="btn-group btn-group-lg">
-        <a class="btn btn-default{% if checkout.is_protected %} disabled{% endif %}" href="{% url 'kfet.checkout.update' checkout.pk %}">Modifier</a>
+        <a class="btn btn-primary{% if checkout.is_protected %} disabled{% endif %}" href="{% url 'kfet.checkout.update' checkout.pk %}">Modifier</a>
-        <a class="btn btn-default" href="{% url 'kfet.checkoutstatement.create' checkout.pk %}">Effectuer un relevé</a>
+        <a class="btn btn-primary" href="{% url 'kfet.checkoutstatement.create' checkout.pk %}">Effectuer un relevé</a>
     </div>
   </div>
 </div>