From 0552eedf01ad18ffc6fc5fa2007f8df7e3aada04 Mon Sep 17 00:00:00 2001 From: Philippe Barbosa Date: Fri, 8 Apr 2016 15:21:05 +0200 Subject: [PATCH] Various improvments --- app/festival/static/css/index.css | 4 ++-- app/festival/static/js/index.js | 3 +-- app/festival/static/scss/modules/video-card.scss | 3 ++- app/festival/templates/festival/inc/video_card.html | 2 +- app/festival/templates/festival/video_list.html | 3 ++- app/templates/base.html | 4 +--- app/templates/index.html | 8 ++++---- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css index c7a28fed..5157a1ab 100755 --- a/app/festival/static/css/index.css +++ b/app/festival/static/css/index.css @@ -3059,10 +3059,10 @@ th { margin: 0; text-transform: uppercase; text-align: left; - font: 700 0.8em "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif; + font: 700 0.9em "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif; } -/* line 42, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/video-card.scss */ +/* line 43, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/video-card.scss */ .video__card__link { position: absolute; top: 0; diff --git a/app/festival/static/js/index.js b/app/festival/static/js/index.js index 3537e079..ee42447f 100644 --- a/app/festival/static/js/index.js +++ b/app/festival/static/js/index.js @@ -130,6 +130,7 @@ $(function() { * Tabs */ + var myTabs = tabs({ el: '#tabs', tabNavigationLinks: '.c-tabs-nav__link', @@ -138,8 +139,6 @@ $(function() { myTabs.init(); - alert('go !'); - /** * Audio player */ diff --git a/app/festival/static/scss/modules/video-card.scss b/app/festival/static/scss/modules/video-card.scss index f9c9409f..8e39fdff 100644 --- a/app/festival/static/scss/modules/video-card.scss +++ b/app/festival/static/scss/modules/video-card.scss @@ -36,7 +36,8 @@ text-transform: uppercase; text-align: left; // font-size: 0.6rem; - font: $bold 0.8em $base_font_family; + font: $bold .9em $base_font_family; + // &:before } &__link { diff --git a/app/festival/templates/festival/inc/video_card.html b/app/festival/templates/festival/inc/video_card.html index 6fe56d1c..80a538f7 100644 --- a/app/festival/templates/festival/inc/video_card.html +++ b/app/festival/templates/festival/inc/video_card.html @@ -1,6 +1,6 @@ {% load i18n %} -
+
diff --git a/app/festival/templates/festival/video_list.html b/app/festival/templates/festival/video_list.html index cc9250d8..a738d2d1 100644 --- a/app/festival/templates/festival/video_list.html +++ b/app/festival/templates/festival/video_list.html @@ -7,7 +7,8 @@ {% endblock %} {% block main %} -
+
+
{% for video in object_list %} {% if video.status == 2 %} {% include 'festival/inc/video_card.html' %} diff --git a/app/templates/base.html b/app/templates/base.html index b7f4c725..11b40f12 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -147,9 +147,7 @@
{% endif %}
-
-

{% block title %}{% endblock %}

-
+

{% block title %}{% endblock %}

{% block main %}{% endblock %} diff --git a/app/templates/index.html b/app/templates/index.html index 5ab66b3d..355ad563 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -19,11 +19,11 @@ {% featured as featured %}
-

{% trans "Featured" %}


+

{% trans "Featured" %}

{% for post in featured.blogposts.all %}
-

{% trans "Article" %}

+ {% trans "Article" %} {% include 'blog/includes/post_card.html' %} {% trans "All" %} {% trans "articles" %}
@@ -31,7 +31,7 @@ {% for artist in featured.artists.all %}
-

{% trans "Artist" %}

+ {% trans "Artist" %} {% include "festival/inc/artist_card.html" %} {% trans "All" %} {% trans "artists" %}
@@ -39,7 +39,7 @@ {% for video in featured.videos.all %}
-

{% trans "Video" %}

+ {% trans "Video" %} {% include 'festival/inc/video_card.html' %} {% trans "All" %} {% trans "videos" %}
-- 2.39.5