Merge branch 'release/0.6.4'

Fonsart · Jun 6, 2016 · f4c2dc0 · f4c2dc0
2 parents 9bd4ac5 + a137129
commit f4c2dc0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 23 deletions.
diff --git a/assets/components/organisms/media-mondrian.hbs b/assets/components/organisms/media-mondrian.hbs
@@ -6,7 +6,7 @@ notes: |
 <div class="media-mondrian media-mondrian-flex">
 
   <div class="media-mondrian-item media-mondrian-item-xl media-mondrian-item-first">
-    <a href="http://web2016.notrehistoire.ch/medias/57710">
+    <a href="http://web2016.notrehistoire.ch/medias/11742">
       <div class="media-mondrian-thumbnail">
         <img data-object-fit="cover" src="http://notrehistoire.ch.s3.amazonaws.com/photos/2010/03/b73135467630813c.jpg" class="img-responsive" alt="" />
       </div>
@@ -41,7 +41,7 @@ notes: |
   </a>
 
 
-  <a class="media-mondrian-item media-mondrian-item-md" href="http://web2016.notrehistoire.ch/medias/1717">
+  <a class="media-mondrian-item media-mondrian-item-md" href="http://web2016.notrehistoire.ch/medias/11166">
     <div class="media-mondrian-thumbnail" style="background-image: url(http://notrehistoire.ch.s3.amazonaws.com/photos/2010/03/c40a43931ede3320.jpg);">
       <img src="http://notrehistoire.ch.s3.amazonaws.com/photos/2010/03/c40a43931ede3320.jpg" class="img-responsive" alt=""/>
     </div>
@@ -53,7 +53,7 @@ notes: |
     </div>
   </a>
 
-  <a class="media-mondrian-item media-mondrian-item-sm" href="http://web2016.notrehistoire.ch/collection/509-les-cinemas-aujourdhui-disparus-de-suisse-romande">
+  <a class="media-mondrian-item media-mondrian-item-sm" href="http://web2016.notrehistoire.ch/collection/507-sous-la-protection-de-la-croix-rouge">
     <div class="media-mondrian-thumbnail" style="background-image: url(http://notrehistoire.ch.s3.amazonaws.com/photos/2013/07/45e27158b7d2603a.jpg);">
       <img src="http://notrehistoire.ch.s3.amazonaws.com/photos/2013/07/45e27158b7d2603a.jpg" class="img-responsive" alt=""/>
     </div>
@@ -70,7 +70,7 @@ notes: |
       <img src="http://notrehistoire.ch.s3.amazonaws.com/photos/2011/06/26a029039e8a61c3.jpg" class="img-responsive" alt=""/>
     </div>
     <div class="media-mondrian-content">
-      <a class="btn btn-primary btn-lg btn-block" href="http://web2016.notrehistoire.ch/medias/21065">
+      <a class="btn btn-primary btn-lg btn-block" href="http://web2016.notrehistoire.ch/search/">
       Toutes les collections ›
       </a>
     </div>
@@ -80,7 +80,7 @@ notes: |
     <h2>86'678 <span>documents</span></h2>
   </a>
 
-  <a class="media-mondrian-item media-mondrian-item-sm" href="http://web2016.notrehistoire.ch/profile/451">
+  <a class="media-mondrian-item media-mondrian-item-sm" href="http://web2016.notrehistoire.ch/collection/816-les-tunnels-routiers-et-ferroviaires-en-suisse">
     <div class="media-mondrian-thumbnail" style="background-image: url(http://notrehistoire.ch.s3.amazonaws.com/photos/2016/02/a37aa61b77a1ea52.jpg);">
       <img src="http://notrehistoire.ch.s3.amazonaws.com/photos/2016/02/a37aa61b77a1ea52.jpg" class="img-responsive" alt=""/>
     </div>
@@ -104,7 +104,7 @@ notes: |
     </div>
   </a>
 
-  <a class="media-mondrian-item media-mondrian-item-sm" href="http://web2016.notrehistoire.ch/medias/1580">
+  <a class="media-mondrian-item media-mondrian-item-sm" href="http://web2016.notrehistoire.ch/collection/392-les-reperages-de-notrehistoire">
     <div class="media-mondrian-thumbnail" style="background-image: url(../build/img/NH-ski.png);">
       <img src="../build/img/NH-ski.png" class="img-responsive" alt=""/>
     </div>
@@ -139,7 +139,7 @@ notes: |
     </div>
   </a>
 
-  <a class="media-mondrian-item media-mondrian-item-xs" href="http://web2016.notrehistoire.ch/medias/64687">
+  <a class="media-mondrian-item media-mondrian-item-xs" href="http://web2016.notrehistoire.ch/profile/8-television-suisse-romande">
     <div class="media-mondrian-thumbnail" style="background-image: url(../build/img/NH-archives-rts.png);">
       <img src="../build/img/NH-archives-rts.png" class="img-responsive" alt=""/>
     </div>
@@ -153,13 +153,13 @@ notes: |
       <img src="http://notrehistoire.ch.s3.amazonaws.com/photos/2011/11/a7b52e09cb671e3f.jpg" class="img-responsive" alt=""/>
     </div>
     <div class="media-mondrian-content">
-      <a class="btn btn-primary btn-lg btn-block" href="http://web2016.notrehistoire.ch/medias/25952">
+      <a class="btn btn-primary btn-lg btn-block" href="http://web2016.notrehistoire.ch/search/">
       Documents du jour ›
       </a>
     </div>
   </div>
 
-  <a class="media-mondrian-item media-mondrian-item-md" href="http://web2016.notrehistoire.ch/medias/58278">
+  <a class="media-mondrian-item media-mondrian-item-md" href="http://web2016.notrehistoire.ch/collection/190-lieux-a-identifier">
     <div class="media-mondrian-thumbnail" style="background-image: url(http://notrehistoire.ch.s3.amazonaws.com/photos/2016/02/5839f988d108053e.jpg);">
       <img src="http://notrehistoire.ch.s3.amazonaws.com/photos/2016/02/5839f988d108053e.jpg" class="img-responsive" alt=""/>
     </div>
@@ -184,21 +184,13 @@ notes: |
     </div>
   </a>
 
-  <a  class="media-mondrian-item media-mondrian-item-sm" href="http://fonsart.ch/">
+  <a  class="media-mondrian-item media-mondrian-item-sm" href="http://web2016.notrehistoire.ch/pages/le-projet-notrehistoire-ch">
     <div class="media-mondrian-thumbnail no-trick">
       <img src="../build/img/rts-fonsart-collaboration.jpg" class="img-responsive" alt=""/>
     </div>
     <div class="media-mondrian-caption">
-      <b>La plateforme notreHistoire.ch est éditée par la FONSART et soutenue par la RTS</b>
-    </div>
-  </a>
-
-  <a  class="media-mondrian-item media-mondrian-item-sm" href="http://www.leenaards.ch/">
-    <div class="media-mondrian-thumbnail no-trick">
-      <img src="../build/img/leenaards.png" class="img-responsive" alt=""/>
-    </div>
-    <div class="media-mondrian-caption">
-      <b>La plateforme est soutenue par la Fondation Leenaards</b>
+      <b>La plateforme notreHistoire.ch est éditée par la FONSART</b>
+      <div><em>Elle est soutenue principalement par la RTS et la fondation Leenaards</em></div>
     </div>
   </a>
 

diff --git a/assets/img/rts-fonsart-collaboration.jpg b/assets/img/rts-fonsart-collaboration.jpg
diff --git a/assets/sass/molecules/_media-mondrian-items.scss b/assets/sass/molecules/_media-mondrian-items.scss
@@ -50,7 +50,7 @@
   min-height: 1px; // IE 11 FIX
 
   &:not(.no-trick) {
-    flex: 1;
+    flex: 1 1 auto;
     background-size: cover;
     background-repeat: no-repeat;
     background-position: center center;
@@ -123,6 +123,7 @@
     margin: 0;
     padding: 0;
     font-weight: bold;
+    max-width: 100%;
   }
   .lead {
     font-weight: normal;

diff --git a/assets/sass/organisms/_navbars.scss b/assets/sass/organisms/_navbars.scss
@@ -11,7 +11,7 @@ body {
   left: 0;
   width: 100%;
   background: $gallery-2;
-  padding-right: ($grid-gutter-width / 2) + 103px;
+  padding-right: ($grid-gutter-width / 2) + 130px;
   border: none;
   font-family: $font-family-sans-serif;
   a {text-decoration: none;}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nhdesign",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "license": "MIT",
   "author": "Antistatique <[email protected]>",
   "repository": "fonsart/NHdesign",