Footer img, artist img copyrights, new main color

diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css
index adde83ab08e70bdbb9c06daf07e0a69de23bbfb6..8d46a348e442a8cb8523ff9bcb28206a51b97c7c 100755 (executable)
--- a/app/festival/static/css/index.css
+++ b/app/festival/static/css/index.css
@@ -509,7 +509,7 @@ html {
 /* line 20, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_defaults.scss */
 body {
   font: 400 0.9rem "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  line-height: 1.4;
+  line-height: 1.6;
   background: #f7f7f7;
   color: #555;
 }
@@ -559,7 +559,7 @@ body {
 /* line 16, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */
 h1, h2, h3, h4, h5, h6 {
   font-family: "Triplex", Georgia, Times, "Times New Roman", serif;
-  line-height: 1.4;
+  line-height: 1.6;
   text-rendering: optimizeLegibility;
   color: #333;
   margin-bottom: 0;
@@ -597,30 +597,30 @@ h6 {
 
 /* line 48, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */
 p {
-  margin: 0 0 0.7rem;
+  margin: 0 0 0.8rem;
   font-family: "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 
 /* line 53, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */
 a {
-  color: #d7a433;
+  color: #c4a563;
   transition: all .3s ease;
   text-decoration: none;
 }
 
 /* line 64, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */
 a:active, a:focus {
-  color: #89671b;
+  color: #8c7035;
   outline: none;
 }
 
 /* line 70, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */
 hr {
-  border-bottom: 1px solid #e8ca88;
+  border-bottom: 1px solid #d2ba88;
   border-left: none;
   border-right: none;
   border-top: none;
-  margin: 1.4 0;
+  margin: 1.6 0;
 }
 
 /* line 78, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */
@@ -634,7 +634,7 @@ img {
 blockquote {
   display: block;
   padding: 0.45rem 0 0.45rem 0.6rem;
-  border-left: 0.45rem solid #e8ca88;
+  border-left: 0.45rem solid #d2ba88;
   border-color: rgba(0, 0, 0, 0.1);
   font-size: 0.9rem;
   margin-left: 0;
@@ -670,12 +670,12 @@ del {
 
 /* line 116, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */
 ins {
-  border-bottom: 1px dotted #e8ca88;
+  border-bottom: 1px dotted #d2ba88;
 }
 
 /* line 120, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */
 mark {
-  background: #e8ca88;
+  background: #d2ba88;
   padding: 0 .2rem;
 }
 
@@ -714,7 +714,7 @@ sub {
 small,
 .small {
   font-size: 80%;
-  line-height: 1.26;
+  line-height: 1.44;
 }
 
 /* line 158, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */
@@ -741,7 +741,7 @@ hr {
 /* line 176, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */
 pre {
   background: #ecf0f1;
-  border-left: 0.3rem solid #e8ca88;
+  border-left: 0.3rem solid #d2ba88;
   font-family: Consolas, monaco, monospace;
 }
 
@@ -774,8 +774,8 @@ pre > p {
 .page__title {
   font: 700 3rem "Triplex", Georgia, Times, "Times New Roman", serif;
   text-transform: uppercase;
-  color: #d7a433;
-  margin: 0;
+  color: #c4a563;
+  margin: 0 0 1rem;
 }
 
 /* line 212, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */
@@ -805,7 +805,7 @@ pre > p {
 /* line 38, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
 .aside {
   display: block;
-  background: #f0ddb3;
+  background: #e0cfad;
   padding: 1rem .5rem;
   margin: 0 0 3rem;
   color: white;
@@ -901,7 +901,7 @@ fieldset {
   background-color: #f7f7f7;
   border: 1px solid #95a5a6;
   margin: 0 0 0.45rem;
-  padding: 1.4;
+  padding: 1.6;
   border-radius: 0px;
 }
 
@@ -954,7 +954,7 @@ input:not([type]),
 select[multiple=multiple],
 textarea {
   background-color: #fff;
-  border: 1px solid #f4e7c8;
+  border: 1px solid #e7dac0;
   box-sizing: border-box;
   font-family: "Triplex", Georgia, Times, "Times New Roman", serif;
   font-size: 0.9rem;
@@ -1002,18 +1002,18 @@ input[type="search"] {
 input[type="checkbox"],
 input[type="radio"] {
   display: inline;
-  margin-right: 0.35;
+  margin-right: 0.4;
 }
 
 /* line 98, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */
 input[type="file"] {
-  padding-bottom: 0.7;
+  padding-bottom: 0.8;
   width: 100%;
 }
 
 /* line 103, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */
 select {
-  margin-bottom: 1.4;
+  margin-bottom: 1.6;
   max-width: 100%;
   width: auto;
 }
@@ -1057,7 +1057,7 @@ select {
 /* line 146, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */
 .sticked-form input {
   font: 300 1rem "Triplex", Georgia, Times, "Times New Roman", serif;
-  border-color: #ca9727;
+  border-color: #bd9a50;
   float: left;
   width: 70%;
   color: #555;
@@ -1072,7 +1072,7 @@ select {
 .sticked-form input[type=submit] {
   width: 30%;
   -webkit-appearance: none;
-  background: #ca9727;
+  background: #bd9a50;
   float: left;
   font-weight: 700;
   color: #fff;
@@ -1084,7 +1084,7 @@ select {
 /* line 183, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */
 .sticked-form input[type=submit]:active {
   outline: 0;
-  background: #e4c073;
+  background: #cbaf75;
 }
 
 /*
@@ -1094,7 +1094,7 @@ select {
 .select {
   padding: 0;
   margin: 0;
-  border: 1px solid #ca9727;
+  border: 1px solid #bd9a50;
   width: 100%;
   overflow: hidden;
   background-color: #fff;
@@ -1111,7 +1111,7 @@ select {
   height: 0;
   border-left: 0.5rem solid transparent;
   border-right: 0.5rem solid transparent;
-  border-top: 0.5rem solid #e8ca88;
+  border-top: 0.5rem solid #d2ba88;
 }
 
 /* line 214, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */
@@ -1153,7 +1153,7 @@ input[type="submit"],
 button {
   appearence: none;
   -webkit-font-smoothing: antialiased;
-  background-color: #d7a433;
+  background-color: #c4a563;
   border-radius: 0px;
   border: none;
   color: #000;
@@ -1185,7 +1185,7 @@ input[type="submit"]:hover,
 input[type="submit"]:focus,
 button:hover,
 button:focus {
-  background-color: #ca9727;
+  background-color: #bd9a50;
   color: #fff;
 }
 
@@ -1220,14 +1220,14 @@ button:disabled {
   font-family: inherit;
   font-size: .75rem;
   cursor: pointer;
-  border: 1px solid #ca9727;
+  border: 1px solid #bd9a50;
   margin: .5rem 0;
   padding-top: 0;
   padding-bottom: 0;
   line-height: 3;
   padding-right: 1rem;
   padding-left: 1rem;
-  background: #d7a433;
+  background: #c4a563;
   color: #000;
   font-family: "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif;
   border-radius: 0px;
@@ -1237,7 +1237,7 @@ button:disabled {
 /* line 37, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */
 .btn:hover, .artist__event__cta:hover {
   text-decoration: none;
-  background-color: #ca9727;
+  background-color: #bd9a50;
   color: #fff;
 }
 
@@ -1477,7 +1477,7 @@ th {
 
 /* line 22, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */
 .banner .is-active {
-  background-color: #e8ca88;
+  background-color: #d2ba88;
 }
 
 /* line 24, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */
@@ -1652,7 +1652,7 @@ th {
 /* line 9, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */
 .footer {
   padding: 0.9rem 1rem;
-  background-color: #e8ca88;
+  background-color: #d2ba88;
 }
 
 /**
@@ -1755,6 +1755,18 @@ th {
   display: block;
 }
 
+/* line 117, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */
+.footer-partners {
+  display: block;
+  text-align: center;
+  margin: 2rem auto;
+}
+
+/* line 121, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */
+.footer-partners img {
+  max-width: 60px;
+}
+
 /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
 .sidebar__title, .sidebar__title--inverse {
   text-transform: uppercase;
@@ -1830,7 +1842,7 @@ th {
 /* line 42, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_menu-toggle.scss */
 .menu__toggle span {
   display: block;
-  background: #e8ca88;
+  background: #d2ba88;
   width: 20px;
   height: 2px;
   border-radius: 3px;
@@ -1872,7 +1884,7 @@ th {
 
 /* line 28, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_breadcrumbs.scss */
 .breadcrumb li.is-active:before {
-  color: #e8ca88;
+  color: #d2ba88;
 }
 
 /* line 4, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_pagination.scss */
@@ -1981,7 +1993,7 @@ th {
   margin: 0 0.1em;
   padding: 0.3em 1em;
   color: #fff;
-  background: #e8ca88;
+  background: #d2ba88;
   font-size: 90%;
   margin: .5rem auto;
   border-radius: 0px;
@@ -2033,7 +2045,7 @@ th {
 .hero {
   display: block;
   padding: 3rem 1rem;
-  background: #e8ca88 no-repeat top center;
+  background: #d2ba88 no-repeat top center;
   background-size: cover;
   width: 100%;
   position: relative;
@@ -2129,7 +2141,7 @@ th {
   margin: 0 0.1em;
   padding: 0.3em 1em;
   color: #fff;
-  background: #e8ca88;
+  background: #d2ba88;
   font-size: 90%;
 }
 
@@ -2411,7 +2423,7 @@ th {
 
 /* line 101, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/vendors/_lightslider.scss */
 .lSSlideOuter .lSPager.lSpg > li:hover a, .lSSlideOuter .lSPager.lSpg > li.active a {
-  background-color: #e8ca88;
+  background-color: #d2ba88;
 }
 
 /* line 104, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/vendors/_lightslider.scss */
@@ -2783,11 +2795,31 @@ th {
 }
 
 /* line 37, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
+.artist__item .artist__img {
+  position: relative;
+  padding: 0;
+  margin: 0;
+}
+
+/* line 41, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
+.artist__item .artist__img__copyright {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  display: block;
+  width: 100%;
+  padding: .2rem;
+  text-align: right;
+  font: 400 0.6rem "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  color: white;
+}
+
+/* line 54, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
 .artist__item img {
   display: block;
 }
 
-/* line 41, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
+/* line 58, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
 .artist__item__name {
   display: block;
   width: 100%;
@@ -2797,7 +2829,7 @@ th {
   margin: 0;
 }
 
-/* line 53, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
+/* line 70, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
 .artist__item__name span {
   display: inline-block;
   *display: inline;
@@ -2833,7 +2865,10 @@ th {
 }
 
 /* line 32, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-detail.scss */
-.artist__portrait, .artist__portrait--left, .artist__portrait--right {
+.artist__portrait, .artist__portrait--left,
+.img__align--left, .artist__portrait--right,
+.img__align--right,
+.img__align {
   display: block;
   margin: 1rem auto;
 }
@@ -2983,7 +3018,7 @@ th {
   display: block;
   width: 100%;
   height: 500px;
-  background: #e8ca88 no-repeat center;
+  background: #d2ba88 no-repeat center;
   background-size: cover;
 }
 
@@ -3017,8 +3052,8 @@ th {
   float: left;
   width: 14.2%;
   box-sizing: border-box;
-  border-right: 1px solid #f0ddb3;
-  border-bottom: 1px solid #f0ddb3;
+  border-right: 1px solid #e0cfad;
+  border-bottom: 1px solid #e0cfad;
   cursor: default;
 }
 
@@ -3028,12 +3063,12 @@ th {
   height: 0;
   padding-bottom: 100%;
   overflow: hidden;
-  background: #e8ca88;
+  background: #d2ba88;
 }
 
 /* line 40, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/calendar.scss */
 .calendar__day-active .calendar__day-inner {
-  background: #e0b75d;
+  background: #c4a563;
 }
 
 /* line 42, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/calendar.scss */
@@ -3077,8 +3112,9 @@ th {
 .user__panel {
   margin: 1rem auto;
   padding: .5rem 1rem;
-  background: #f9f0dd;
-  color: #555;
+  background: #f7f7f7;
+  color: #000;
+  text-transform: uppercase;
 }
 @media (min-width: 769px) {/* line 137, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */
   .sticked-form {
@@ -3108,14 +3144,16 @@ th {
   }/* line 17, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-detail.scss */
   .artist__event__cta {
     width: 30%;
-  }/* line 35, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-detail.scss */
-  .artist__portrait--left {
+  }/* line 36, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-detail.scss */
+  .artist__portrait--left,
+  .img__align--left {
     max-width: 40%;
     margin-top: 0;
     margin-right: 1rem;
     float: left;
-  }/* line 45, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-detail.scss */
-  .artist__portrait--right {
+  }/* line 46, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-detail.scss */
+  .artist__portrait--right,
+  .img__align--right {
     max-width: 40%;
     margin-top: 0;
     margin-left: 1rem;
@@ -3124,7 +3162,7 @@ th {
 }
 @media (min-width: 961px) {/* line 59, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */
   a:hover {
-    color: #89671b;
+    color: #8c7035;
   }/* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
   .container {
     max-width: 960px;
@@ -3211,7 +3249,7 @@ th {
     box-shadow: 0px 1px 15px 0px rgba(0, 0, 0, 0.8);
     -webkit-transform: scale(1.01);
     transform: scale(1.01);
-  }/* line 41, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
+  }/* line 58, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
   .artist__item__name {
     padding: 0.8rem;
     font-size: 0.8rem;

diff --git a/app/festival/static/img/logo_cnrs.png b/app/festival/static/img/logo_cnrs.png
new file mode 100644 (file)
index 0000000..dc271cc
Binary files /dev/null and b/app/festival/static/img/logo_cnrs.png differ

diff --git a/app/festival/static/img/logo_inra.png b/app/festival/static/img/logo_inra.png
index fbbe7332bb88177bc5d0e5e0f53cf6a11ff48427..d58bea375c9b7ea4459d4571c1e1da398ba323d5 100644 (file)
Binary files a/app/festival/static/img/logo_inra.png and b/app/festival/static/img/logo_inra.png differ

diff --git a/app/festival/static/img/logo_mmc.png b/app/festival/static/img/logo_mmc.png
new file mode 100644 (file)
index 0000000..f7fe89a
Binary files /dev/null and b/app/festival/static/img/logo_mmc.png differ

diff --git a/app/festival/static/img/logo_upmc.png b/app/festival/static/img/logo_upmc.png
new file mode 100644 (file)
index 0000000..20ab756
Binary files /dev/null and b/app/festival/static/img/logo_upmc.png differ

diff --git a/app/festival/static/scss/base/_typography.scss b/app/festival/static/scss/base/_typography.scss
index 767fb0b035949c47b2195c8b7bd363560eac288d..4815fff14e1126aa52449131132a3b6f35a96612 100755 (executable)
--- a/app/festival/static/scss/base/_typography.scss
+++ b/app/festival/static/scss/base/_typography.scss
@@ -206,7 +206,7 @@ pre > p {
   font: $bold 3rem $header_font_family;
   text-transform: uppercase;
   color: $base_link_color;
-  margin: 0;
+  margin: 0 0 1rem;
 }
 
 .push-ical {

diff --git a/app/festival/static/scss/components/_footers.scss b/app/festival/static/scss/components/_footers.scss
index 61b12755d9cb5a9f413e249d3bf30cc5ee0066ae..3743c9a353e543c76adab12590f1c93f1a8cb09b 100755 (executable)
--- a/app/festival/static/scss/components/_footers.scss
+++ b/app/festival/static/scss/components/_footers.scss
@@ -112,4 +112,13 @@
       }
     }
   }
+}
+
+.footer-partners {
+  display: block;
+  text-align: center;
+  margin: 2rem auto;
+  img {
+    max-width: 60px;
+  }
 }
\ No newline at end of file

diff --git a/app/festival/static/scss/config/_variables.scss b/app/festival/static/scss/config/_variables.scss
index 6ede90b55254bb43e61b85dd7ff4a5b06a104415..4cc443f8ec358ad3ee10943890e2d95d22d5a289 100755 (executable)
--- a/app/festival/static/scss/config/_variables.scss
+++ b/app/festival/static/scss/config/_variables.scss
@@ -9,8 +9,9 @@
 /* _Colors
 ---------------------------------- */
 
-$manifeste16           : #e8ca88;
-$manifeste16_darker    : darken($manifeste16, 20);
+// $manifeste16           : #e8ca88;
+$manifeste16           : #d2ba88;
+$manifeste16_darker    : darken($manifeste16, 10);
 
 $manifeste16_alt       : #00818d;
 
@@ -59,7 +60,7 @@ $base_font_weight   : $regular;
 
 // Sizes
 $base_font_size     : .9rem;
-$base_line_height   : 1.4;
+$base_line_height   : 1.6;
 
 // Layout
 $base_border_radius : 0px;

diff --git a/app/festival/static/scss/modules/artist-card.scss b/app/festival/static/scss/modules/artist-card.scss
index 838a546f306b68f5f0cabd849e4c69cebe203ade..ca3e797e627eb3dc4399ea94456717b9fd009009 100644 (file)
--- a/app/festival/static/scss/modules/artist-card.scss
+++ b/app/festival/static/scss/modules/artist-card.scss
@@ -34,6 +34,23 @@
       }
   }
 
+  .artist__img {
+    position: relative;
+    padding: 0;
+    margin: 0;
+    &__copyright {
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      display: block;
+      width: 100%;
+      padding: .2rem;
+      text-align: right;
+      font: $regular .6rem $base_font_family;
+      color: white;
+    }
+  }
+
   img {
     display: block;
   }

diff --git a/app/festival/static/scss/modules/artist-detail.scss b/app/festival/static/scss/modules/artist-detail.scss
index be6ff891e82bcba21bb33811cca3811cff053a3e..4315c6a846563200db26cbf6c2be5927afe38041 100644 (file)
--- a/app/festival/static/scss/modules/artist-detail.scss
+++ b/app/festival/static/scss/modules/artist-detail.scss
@@ -29,7 +29,8 @@
   }
 }
 
-.artist__portrait {
+.artist__portrait,
+.img__align {
   display: block;
   margin: 1rem auto;
   &--left {

diff --git a/app/festival/static/scss/modules/user.scss b/app/festival/static/scss/modules/user.scss
index 38487a6746d795e8dde0b4d8d087407c64150962..832b32226b4abf3e592d16a1f7cd77257f10a99e 100644 (file)
--- a/app/festival/static/scss/modules/user.scss
+++ b/app/festival/static/scss/modules/user.scss
@@ -1,6 +1,7 @@
 .user__panel {
   margin: 1rem auto;
   padding: .5rem 1rem;
-  background: lighten($main_color, 20);
-  color: $base_font_color;
+  background: $base_background_color;
+  color: $black;
+  text-transform: uppercase;
 }
\ No newline at end of file

diff --git a/app/festival/templates/festival/artist_list.html b/app/festival/templates/festival/artist_list.html
index 2b0af85c426d784bdbe597b131b332ce273008bf..1e532c5b8bae3041437bd6c81a6e692143725a23 100644 (file)
--- a/app/festival/templates/festival/artist_list.html
+++ b/app/festival/templates/festival/artist_list.html
@@ -13,8 +13,12 @@
         <div class="artist__item">
             <div class="artist__item__inner">
                 <a href="{% url 'festival-artist-detail' artist.slug %}" class="artist__item__inner">
-                    <img src="{% if artist.photo_featured %}{{ MEDIA_URL }}/{{ artist.photo_featured }}{% elif artist.photo %}{{ MEDIA_URL }}/{{ artist.photo }}{% else %}{% endif %}" alt="Portrait {{ artist.name }}">
-                    <p>{{ artist.photo_credits }}</p>
+                    <figure class="artist__img">
+                        <img src="{% if artist.photo_featured %}{{ MEDIA_URL }}/{{ artist.photo_featured }}{% elif artist.photo %}{{ MEDIA_URL }}/{{ artist.photo }}{% else %}{% endif %}" alt="Portrait {{ artist.name }}">
+                        <figcaption class="artist__img__copyright">
+                           {{ artist.photo_credits }}
+                        </figcaption>
+                    </figure>
                     <h3 class="artist__item__name">
                         <span>
                             {{ artist.name }}

diff --git a/app/templates/base.html b/app/templates/base.html
index d7c4fca15831551c8e8eae2a7c4bdd13ebe6e213..553b88ce55fbec12f5f9075faac47bc0e650729d 100644 (file)
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -143,13 +143,11 @@
                     {% search_form "all" %}
                 </div>
 
-                <h2 class="sidebar__title">Télécharger :</h2>
-
                 <div>
-                    <a href="#" class="btn btn-full btn-inverse">Le programme</a>
+                    <a href="#" class="btn btn-full btn-inverse">Télécharger le programme</a>
                 </div>
                 <div>
-                    <a href="#" class="btn btn-full btn-inverse">La brochure</a>
+                    <a href="#" class="btn btn-full btn-inverse">Inscription newsletter</a>
                 </div>
 
                 {% nevercache %}
@@ -176,6 +174,30 @@
                 <img src="{% static "img/logo_manifeste16_black.png" %}" alt="Logo Manifeste 2016 ircam" width="80">
             </div>
             {% page_menu "pages/menus/footer.html" %}
+
+            <ul class="footer-partners list-inline">
+                <li>
+                    <a href="http://www.culturecommunication.gouv.fr/" target="_blank">
+                        <img src="{% static "img/logo_mmc.png" %}" alt="Logo Ministere Culture et Communication">
+                    </a>
+                </li>
+                <li>
+                    <a href="http://www.cnrs.fr/" target="_blank">
+                        <img src="{% static "img/logo_cnrs.png" %}" alt="Logo CNRS">
+                    </a>
+                </li>
+                <li>
+                    <a href="http://www.upmc.fr/" target="_blank">
+                        <img src="{% static "img/logo_upmc.png" %}" alt="Logo UPMC">
+                    </a>
+                </li>
+                <li>
+                    <a href="http://www.inria.fr/" target="_blank">
+                        <img src="{% static "img/logo_inra.png" %}" alt="Logo Inria">
+                    </a>
+                </li>
+            </ul>
+
             <div class="footer-legals">
                 <p>
                     {# {% trans "Powered by" %} #}