diff --git a/kfet/static/kfet/css/index.css b/kfet/static/kfet/css/index.css index ca11e306..fe72b1f0 100644 --- a/kfet/static/kfet/css/index.css +++ b/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; diff --git a/kfet/static/kfet/css/nav.css b/kfet/static/kfet/css/nav.css index f80f1899..d89384b4 100644 --- a/kfet/static/kfet/css/nav.css +++ b/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 { - color:#FFF; +nav .navbar-brand { + padding:3px 25px; +} + +nav .navbar-brand img { + height:44px; } nav .navbar-toggle .icon-bar { diff --git a/kfet/static/kfet/img/logo3.png b/kfet/static/kfet/img/logo3.png new file mode 100644 index 00000000..b68418cd Binary files /dev/null and b/kfet/static/kfet/img/logo3.png differ diff --git a/kfet/templates/kfet/account_read.html b/kfet/templates/kfet/account_read.html index b177d615..c42fad82 100644 --- a/kfet/templates/kfet/account_read.html +++ b/kfet/templates/kfet/account_read.html @@ -24,7 +24,7 @@ Modifier - Recharger par CB + Recharger par CB diff --git a/kfet/templates/kfet/account_read_title.html b/kfet/templates/kfet/account_read_title.html new file mode 100644 index 00000000..6712ed77 --- /dev/null +++ b/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 %} diff --git a/kfet/templates/kfet/article.html b/kfet/templates/kfet/article.html index a21c5332..8fb844b7 100644 --- a/kfet/templates/kfet/article.html +++ b/kfet/templates/kfet/article.html @@ -8,7 +8,7 @@
diff --git a/kfet/templates/kfet/article_read.html b/kfet/templates/kfet/article_read.html index af8e3960..28010170 100644 --- a/kfet/templates/kfet/article_read.html +++ b/kfet/templates/kfet/article_read.html @@ -8,7 +8,7 @@
diff --git a/kfet/templates/kfet/base.html b/kfet/templates/kfet/base.html index efda5934..9409f4ea 100644 --- a/kfet/templates/kfet/base.html +++ b/kfet/templates/kfet/base.html @@ -7,7 +7,7 @@ {# CSS #} - + {# JS #} diff --git a/kfet/templates/kfet/base_nav.html b/kfet/templates/kfet/base_nav.html index 24ec0474..fc4ef1ec 100644 --- a/kfet/templates/kfet/base_nav.html +++ b/kfet/templates/kfet/base_nav.html @@ -1,3 +1,5 @@ +{% load staticfiles %} +