From e58fcb1e165b24b2deb48b04d54ae49d935c6fd4 Mon Sep 17 00:00:00 2001
From: Philippe Barbosa <contact@philippebarbosa.com>
Date: Fri, 8 Apr 2016 11:47:11 +0200
Subject: [PATCH] Typography fixes

---
 app/festival/static/css/index.css             | 35 +++++++++++--------
 .../static/scss/base/_typography.scss         | 16 +++++++--
 .../static/scss/components/_sidebar.scss      |  1 -
 .../static/scss/config/_variables.scss        |  1 +
 .../templates/festival/artist_detail.html     |  2 +-
 app/templates/agenda/event_detail.html        |  6 ++--
 app/templates/index.html                      |  4 +--
 7 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css
index 13a77fdb..d5c02b60 100755
--- a/app/festival/static/css/index.css
+++ b/app/festival/static/css/index.css
@@ -517,7 +517,6 @@ body {
 
 /* line 30, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_defaults.scss */
 .clearfix:after, .container:after, .row:after, .sidebar__title--inverse:after,
-.section__title--inverse:after,
 .page__related__title--inverse:after, .row-box:after, .event__card:after, .event__card--alt:after, .event__card--full:after, .calendar__month:after, .last__media:after, .sticked-form:after, .banner:after, .header:after, .navigation:after, .footer-nav:after, .cta__panel:after, .media:after, .split-container:after, .video__list:after, .c-tabs:after {
   content: "";
   display: table;
@@ -810,13 +809,17 @@ pre > p {
   text-transform: uppercase;
   margin: 0;
   padding: 0;
-  font: 700 1em/1.2 "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font: 700 1.1em/1.2 "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  color: #c4a563;
 }
 
-/* line 244, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */
+/* line 248, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */
 .section__title {
-  font-size: 2rem;
-  font-family: "Triplex", Georgia, Times, "Times New Roman", serif;
+  line-height: 1.6;
+  font-family: "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  text-transform: uppercase;
+  color: #c4a563;
+  font-size: 1.4rem;
 }
 
 /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
@@ -828,7 +831,6 @@ pre > p {
 
 /* line 22, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
 .row, .sidebar__title--inverse,
-.section__title--inverse,
 .page__related__title--inverse, .row-box, .event__card, .event__card--alt, .event__card--full, .calendar__month {
   display: block;
 }
@@ -1800,9 +1802,7 @@ th {
 
 /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
 .sidebar__title, .sidebar__title--inverse,
-.section__title--inverse,
 .page__related__title--inverse,
-.section__title,
 .page__related__title {
   text-transform: uppercase;
   display: inline-block;
@@ -1816,9 +1816,8 @@ th {
   border-bottom: 1px solid #fff;
 }
 
-/* line 18, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
+/* line 17, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
 .sidebar__title--inverse,
-.section__title--inverse,
 .page__related__title--inverse {
   color: #000;
   border-top-color: #000;
@@ -1826,7 +1825,7 @@ th {
   margin-bottom: 2rem;
 }
 
-/* line 29, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
+/* line 28, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
 .sidebar__entry {
   font-size: 1rem;
   margin: 0;
@@ -1835,7 +1834,7 @@ th {
   font: 400 0.85rem "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 
-/* line 37, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
+/* line 36, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
 .cta__panel {
   margin-top: 2rem;
 }
@@ -3633,7 +3632,7 @@ th {
   .nav__footer__item__link{
     padding: 1rem;
   }
-  /* line 41, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
+  /* line 40, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
   .cta__panel div{
     display: block;
     float: left;
@@ -3691,6 +3690,14 @@ th {
     font-size: 3.2rem;
     margin: 0rem 0 1rem;
   }
+  /* line 237, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */
+  .location__title{
+    font: 700 1.3em/1.2 "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  }
+  /* line 248, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */
+  .section__title{
+    font-size: 1.8rem;
+  }
   /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
   .container{
     max-width: 960px;
@@ -3802,7 +3809,7 @@ th {
   .footer-partners img{
     max-width: 60px;
   }
-  /* line 49, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
+  /* line 48, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
   .cta__panel div{
     float: none;
     width: 100%;
diff --git a/app/festival/static/scss/base/_typography.scss b/app/festival/static/scss/base/_typography.scss
index a2791f56..6a192a85 100755
--- a/app/festival/static/scss/base/_typography.scss
+++ b/app/festival/static/scss/base/_typography.scss
@@ -238,10 +238,20 @@ pre > p {
   text-transform: uppercase;
   margin: 0;
   padding: 0;
-  font: $bold 1em/1.2 $base_font_family;
+  font: $bold 1.1em/1.2 $base_font_family;
+  color: $main_color_darker;
+  @media (min-width : $desktop ) {
+    font: $bold 1.3em/1.2 $base_font_family;
+  }
 }
 
 .section__title {
-  font-size: 2rem;
-  font-family: $header_font_family;
+  line-height: $base_line_height;
+  font-family: $base_font_family;
+  text-transform: uppercase;
+  color: $main_color_darker;
+  font-size: 1.4rem;
+  @media (min-width : $desktop ) {
+    font-size: 1.8rem;
+  }
 }
\ No newline at end of file
diff --git a/app/festival/static/scss/components/_sidebar.scss b/app/festival/static/scss/components/_sidebar.scss
index 940c8a60..1a83e841 100755
--- a/app/festival/static/scss/components/_sidebar.scss
+++ b/app/festival/static/scss/components/_sidebar.scss
@@ -3,7 +3,6 @@
 // ****************************************************************
 
 .sidebar__title,
-.section__title,
 .page__related__title {
   text-transform: uppercase;
   display: inline-block;
diff --git a/app/festival/static/scss/config/_variables.scss b/app/festival/static/scss/config/_variables.scss
index 5587367c..f317b24a 100755
--- a/app/festival/static/scss/config/_variables.scss
+++ b/app/festival/static/scss/config/_variables.scss
@@ -17,6 +17,7 @@ $manifeste16_darker    : darken($manifeste16, 10);
 $manifeste16_alt       : #00818d;
 
 $main_color            : $manifeste16;
+$main_color_darker     : $manifeste16_darker;
 $base_background_color : #f7f7f7;
 $main_color_alt        : $manifeste16_alt;
 
diff --git a/app/festival/templates/festival/artist_detail.html b/app/festival/templates/festival/artist_detail.html
index cb07f3b9..ace9bd85 100644
--- a/app/festival/templates/festival/artist_detail.html
+++ b/app/festival/templates/festival/artist_detail.html
@@ -22,7 +22,7 @@
     </p>
 </div>
 
-<h2 class="page__related__title--inverse">{% trans "Related events" %}</h2> <br>
+<h2 class="section__title">{% trans "Related events" %}</h2> <br>
 {% for event in artist.events.all %}
  {% include 'agenda/includes/event_card.html' %}
 {% endfor %}
diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html
index 4745146d..3b0c2ba3 100644
--- a/app/templates/agenda/event_detail.html
+++ b/app/templates/agenda/event_detail.html
@@ -90,7 +90,7 @@
 {% endblock %}
 
 {% if event.location %}
-<h3 class="section__title--inverse">Le lieu :</h3>
+<h3 class="section__title">Le lieu :</h3>
 {% block event_detail_location %}
 {% editable event.location %}
 <p>
@@ -152,14 +152,14 @@
 
 {% block event_related %}
 
-<h3 class="section__title--inverse">{% trans "Artists" %}</h3>
+<h3 class="section__title">{% trans "Artists" %}</h3>
 <div class="row">
     {% for artist in event.artists.all %}
         {% include "festival/inc/artist_card.html" %}
     {% endfor %}
 </div>
 
-<h3 class="section__title--inverse">{% trans "Videos" %}</h3>
+<h3 class="section__title">{% trans "Videos" %}</h3>
 <div class="row">
     {% for video in event.videos.all %}
         {% include 'festival/inc/video_card.html' %}
diff --git a/app/templates/index.html b/app/templates/index.html
index 8fbd97fb..0261b776 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -19,7 +19,7 @@
 {% featured as featured %}
 
 <div class="last__media">
-    <h2 class="page__related__title--inverse">{% trans "Last medias" %}</h2> <br>
+    <h2 class="section__title">{% trans "Last medias" %}</h2> <br>
 
     {% for post in featured.blogposts.all %}
     <div class="last__media__entry">
@@ -47,7 +47,7 @@
 </div>
 
 {% for playlist in featured.playlists.all %}
-<h2 class="page__related__title--inverse">{% trans "Playlist" %}</h2>
+<h2 class="section__title">{% trans "Playlist" %}</h2>
 {% include 'festival/inc/audio_playlist.html' %}
 {% endfor %}
 
-- 
2.39.5