From: Jeremy Thomas <bbxdesign@gmail.com>
Date: Thu, 22 Dec 2016 19:37:38 +0000 (+0000)
Subject: Fix media object
X-Git-Tag: 0.3.0^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dd8463348e23b58f048ccc1a0fb4e3af29fa75e;p=thirdparty%2Fbulma.git

Fix media object
---

diff --git a/docs/css/bulma-docs.css b/docs/css/bulma-docs.css
index 98b2eb723..3d8e5828a 100644
--- a/docs/css/bulma-docs.css
+++ b/docs/css/bulma-docs.css
@@ -173,7 +173,7 @@ input[type="radio"] {
 }
 
 small {
-  font-size: 0.75rem;
+  font-size: 0.8em;
 }
 
 span {
@@ -2234,7 +2234,6 @@ a.box:active {
   text-align: center;
   vertical-align: top;
   width: 1.5rem;
-  background: coral;
 }
 
 .icon .fa {
@@ -3243,6 +3242,9 @@ a.box:active {
 .level-item {
   align-items: center;
   display: flex;
+  flex-basis: auto;
+  flex-grow: 0;
+  flex-shrink: 0;
   justify-content: center;
 }
 
@@ -3257,6 +3259,13 @@ a.box:active {
   }
 }
 
+.level-left,
+.level-right {
+  flex-basis: auto;
+  flex-grow: 0;
+  flex-shrink: 0;
+}
+
 .level-left .level-item:not(:last-child),
 .level-right .level-item:not(:last-child) {
   margin-right: 0.75rem;
@@ -3336,19 +3345,21 @@ a.box:active {
 
 .media-left,
 .media-right {
+  flex-basis: auto;
   flex-grow: 0;
   flex-shrink: 0;
 }
 
 .media-left {
-  margin-right: 0.75rem;
+  margin-right: 1rem;
 }
 
 .media-right {
-  margin-left: 0.75rem;
+  margin-left: 1rem;
 }
 
 .media-content {
+  flex-basis: auto;
   flex-grow: 1;
   flex-shrink: 1;
   text-align: left;
@@ -3361,7 +3372,7 @@ a.box:active {
 }
 
 .media .content:not(:last-child) {
-  margin-bottom: 1rem;
+  margin-bottom: 0.75rem;
 }
 
 .media .media {
diff --git a/docs/documentation/components/card.html b/docs/documentation/components/card.html
index 9b7358b83..6f069b20f 100644
--- a/docs/documentation/components/card.html
+++ b/docs/documentation/components/card.html
@@ -17,7 +17,7 @@ doc-subtab: card
 <div class="card">
   <div class="card-image">
     <figure class="image is-4by3">
-      <img src="{{site.url}}/images/placeholders/300x225.png" alt="">
+      <img src="{{site.url}}/images/placeholders/300x225.png" alt="Image">
     </figure>
   </div>
   <div class="card-content">
@@ -35,8 +35,8 @@ doc-subtab: card
 
     <div class="content">
       Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-      Phasellus nec iaculis mauris. <a href="#">@bulmaio</a>.
-      <a href="#">#css</a> <a href="#">#responsive</a>
+      Phasellus nec iaculis mauris. <a>@bulmaio</a>.
+      <a>#css</a> <a>#responsive</a>
       <br>
       <small>11:09 PM - 1 Jan 2016</small>
     </div>
@@ -71,7 +71,7 @@ doc-subtab: card
   <div class="card-content">
     <div class="content">
       Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus nec iaculis mauris.
-      <a href="#">@bulmaio</a>. <a href="#">#css</a> <a href="#">#responsive</a>
+      <a>@bulmaio</a>. <a>#css</a> <a>#responsive</a>
       <br>
       <small>11:09 PM - 1 Jan 2016</small>
     </div>
diff --git a/docs/documentation/components/level.html b/docs/documentation/components/level.html
index 7e314a4c9..d7562232e 100644
--- a/docs/documentation/components/level.html
+++ b/docs/documentation/components/level.html
@@ -117,20 +117,28 @@ doc-subtab: level
 {% capture nav_centered_example %}
 <nav class="level">
   <div class="level-item has-text-centered">
-    <p class="heading">Tweets</p>
-    <p class="title">3,456</p>
+    <div>
+      <p class="heading">Tweets</p>
+      <p class="title">3,456</p>
+    </div>
   </div>
   <div class="level-item has-text-centered">
-    <p class="heading">Following</p>
-    <p class="title">123</p>
+    <div>
+      <p class="heading">Following</p>
+      <p class="title">123</p>
+    </div>
   </div>
   <div class="level-item has-text-centered">
-    <p class="heading">Followers</p>
-    <p class="title">456K</p>
+    <div>
+      <p class="heading">Followers</p>
+      <p class="title">456K</p>
+    </div>
   </div>
   <div class="level-item has-text-centered">
-    <p class="heading">Likes</p>
-    <p class="title">789</p>
+    <div>
+      <p class="heading">Likes</p>
+      <p class="title">789</p>
+    </div>
   </div>
 </nav>
 {% endcapture %}
@@ -143,7 +151,7 @@ doc-subtab: level
     <a class="link is-info">Menu</a>
   </p>
   <p class="level-item has-text-centered">
-    <img src="{{ site.url }}/images/bulma-type.png" alt="" style="height: 33px;">
+    <img src="{{ site.url }}/images/bulma-type.png" alt="" style="height: 30px;">
   </p>
   <p class="level-item has-text-centered">
     <a class="link is-info">Reservations</a>
@@ -175,20 +183,28 @@ doc-subtab: level
 {% capture nav_mobile_example %}
 <nav class="level is-mobile">
   <div class="level-item has-text-centered">
-    <p class="heading">Tweets</p>
-    <p class="title">3,456</p>
+    <div>
+      <p class="heading">Tweets</p>
+      <p class="title">3,456</p>
+    </div>
   </div>
   <div class="level-item has-text-centered">
-    <p class="heading">Following</p>
-    <p class="title">123</p>
+    <div>
+      <p class="heading">Following</p>
+      <p class="title">123</p>
+    </div>
   </div>
   <div class="level-item has-text-centered">
-    <p class="heading">Followers</p>
-    <p class="title">456K</p>
+    <div>
+      <p class="heading">Followers</p>
+      <p class="title">456K</p>
+    </div>
   </div>
   <div class="level-item has-text-centered">
-    <p class="heading">Likes</p>
-    <p class="title">789</p>
+    <div>
+      <p class="heading">Likes</p>
+      <p class="title">789</p>
+    </div>
   </div>
 </nav>
 {% endcapture %}
diff --git a/sass/base/generic.sass b/sass/base/generic.sass
index ecf7d910a..cd15763d8 100644
--- a/sass/base/generic.sass
+++ b/sass/base/generic.sass
@@ -71,7 +71,7 @@ input[type="radio"]
   vertical-align: baseline
 
 small
-  font-size: $size-small
+  font-size: 0.8em
 
 span
   font-style: inherit
diff --git a/sass/components/level.sass b/sass/components/level.sass
index 08ba36b87..65f827c33 100644
--- a/sass/components/level.sass
+++ b/sass/components/level.sass
@@ -1,6 +1,9 @@
 .level-item
   align-items: center
   display: flex
+  flex-basis: auto
+  flex-grow: 0
+  flex-shrink: 0
   justify-content: center
   .title,
   .subtitle
@@ -12,6 +15,9 @@
 
 .level-left,
 .level-right
+  flex-basis: auto
+  flex-grow: 0
+  flex-shrink: 0
   .level-item
     &:not(:last-child)
       margin-right: 0.75rem
diff --git a/sass/components/media.sass b/sass/components/media.sass
index b09f1c82a..575e4fcc9 100644
--- a/sass/components/media.sass
+++ b/sass/components/media.sass
@@ -1,15 +1,17 @@
 .media-left,
 .media-right
+  flex-basis: auto
   flex-grow: 0
   flex-shrink: 0
 
 .media-left
-  margin-right: 0.75rem
+  margin-right: 1rem
 
 .media-right
-  margin-left: 0.75rem
+  margin-left: 1rem
 
 .media-content
+  flex-basis: auto
   flex-grow: 1
   flex-shrink: 1
   text-align: left
@@ -19,7 +21,7 @@
   display: flex
   text-align: left
   .content:not(:last-child)
-    margin-bottom: 1rem
+    margin-bottom: 0.75rem
   .media
     border-top: 1px solid rgba($border, 0.5)
     display: flex
diff --git a/sass/elements/icon.sass b/sass/elements/icon.sass
index 08937057b..99add01db 100644
--- a/sass/elements/icon.sass
+++ b/sass/elements/icon.sass
@@ -1,6 +1,5 @@
 .icon
   +fa(21px, 1.5rem)
-  background: coral
   .fa
     font-size: inherit
     line-height: inherit