Fix media object

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80c57a228aa5a6c92b545e4c23a5168903d7f109..eec48ba1502b7653d12f97ccadef21529112353c 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@
 * Add `.content` table
 * Fix inputs with icons
 * Input icons require the `.icon` container
+* Deprecate `.media-number`
+* Fix `.level-item` height
 
 ## 0.2.2
 

diff --git a/docs/bulma-docs.sass b/docs/bulma-docs.sass
index 98024b65c0199450dfe33f829ce61189f07c4fe1..0f9b86dab2a46d6eb0a8c114fd79c478365731c2 100644 (file)
--- a/docs/bulma-docs.sass
+++ b/docs/bulma-docs.sass
@@ -296,7 +296,7 @@ html.route-index #carbon
     pre
       max-height: 600px
     &:not(:last-child)
-      margin-bottom: 3rem
+      margin-bottom: 1.5rem
 
 $structure: $danger
 $structure-invert: $danger-invert

diff --git a/docs/css/bulma-docs.css b/docs/css/bulma-docs.css
index 5f4092ef10c44b5b81af655a5ae0af08b1c363fb..2dceb2698e965dbc7bf2604a41ce9c1907f8abd8 100644 (file)
--- a/docs/css/bulma-docs.css
+++ b/docs/css/bulma-docs.css
@@ -662,7 +662,7 @@ a.box:active {
 
 .button:focus, .button.is-focused {
   border-color: #00d1b2;
-  box-shadow: 0 0 0.5em rgba(0, 209, 178, 0.5);
+  box-shadow: 0 0 0.5em rgba(0, 209, 178, 0.25);
   color: #363636;
 }
 
@@ -698,7 +698,7 @@ a.box:active {
 
 .button.is-white:focus, .button.is-white.is-focused {
   border-color: transparent;
-  box-shadow: 0 0 0.5em rgba(255, 255, 255, 0.5);
+  box-shadow: 0 0 0.5em rgba(255, 255, 255, 0.25);
   color: #0a0a0a;
 }
 
@@ -749,7 +749,7 @@ a.box:active {
 
 .button.is-black:focus, .button.is-black.is-focused {
   border-color: transparent;
-  box-shadow: 0 0 0.5em rgba(10, 10, 10, 0.5);
+  box-shadow: 0 0 0.5em rgba(10, 10, 10, 0.25);
   color: white;
 }
 
@@ -800,7 +800,7 @@ a.box:active {
 
 .button.is-light:focus, .button.is-light.is-focused {
   border-color: transparent;
-  box-shadow: 0 0 0.5em rgba(245, 245, 245, 0.5);
+  box-shadow: 0 0 0.5em rgba(245, 245, 245, 0.25);
   color: #363636;
 }
 
@@ -851,7 +851,7 @@ a.box:active {
 
 .button.is-dark:focus, .button.is-dark.is-focused {
   border-color: transparent;
-  box-shadow: 0 0 0.5em rgba(54, 54, 54, 0.5);
+  box-shadow: 0 0 0.5em rgba(54, 54, 54, 0.25);
   color: whitesmoke;
 }
 
@@ -902,7 +902,7 @@ a.box:active {
 
 .button.is-primary:focus, .button.is-primary.is-focused {
   border-color: transparent;
-  box-shadow: 0 0 0.5em rgba(0, 209, 178, 0.5);
+  box-shadow: 0 0 0.5em rgba(0, 209, 178, 0.25);
   color: #fff;
 }
 
@@ -953,7 +953,7 @@ a.box:active {
 
 .button.is-info:focus, .button.is-info.is-focused {
   border-color: transparent;
-  box-shadow: 0 0 0.5em rgba(50, 115, 220, 0.5);
+  box-shadow: 0 0 0.5em rgba(50, 115, 220, 0.25);
   color: #fff;
 }
 
@@ -1004,7 +1004,7 @@ a.box:active {
 
 .button.is-success:focus, .button.is-success.is-focused {
   border-color: transparent;
-  box-shadow: 0 0 0.5em rgba(35, 209, 96, 0.5);
+  box-shadow: 0 0 0.5em rgba(35, 209, 96, 0.25);
   color: #fff;
 }
 
@@ -1055,7 +1055,7 @@ a.box:active {
 
 .button.is-warning:focus, .button.is-warning.is-focused {
   border-color: transparent;
-  box-shadow: 0 0 0.5em rgba(255, 221, 87, 0.5);
+  box-shadow: 0 0 0.5em rgba(255, 221, 87, 0.25);
   color: rgba(0, 0, 0, 0.7);
 }
 
@@ -1106,7 +1106,7 @@ a.box:active {
 
 .button.is-danger:focus, .button.is-danger.is-focused {
   border-color: transparent;
-  box-shadow: 0 0 0.5em rgba(255, 56, 96, 0.5);
+  box-shadow: 0 0 0.5em rgba(255, 56, 96, 0.25);
   color: #fff;
 }
 
@@ -2592,7 +2592,7 @@ a.box:active {
 }
 
 .subtitle + .title {
-  margin-top: -1.4rem;
+  margin-top: -1.5rem;
 }
 
 .subtitle.is-1 {
@@ -2751,10 +2751,17 @@ a.box:active {
 }
 
 .number {
+  align-items: center;
   background-color: whitesmoke;
   border-radius: 290486px;
-  display: inline-block;
+  display: inline-flex;
   font-size: 1.25rem;
+  height: 2em;
+  justify-content: center;
+  margin-right: 1.5rem;
+  min-width: 2.5em;
+  padding: 0.25rem 0.5rem;
+  text-align: center;
   vertical-align: top;
 }
 
@@ -2762,16 +2769,15 @@ a.box:active {
   align-items: stretch;
   box-shadow: 0 1px 2px rgba(10, 10, 10, 0.1);
   display: flex;
-  min-height: 40px;
 }
 
 .card-header-title {
-  align-items: flex-start;
+  align-items: center;
   color: #363636;
   display: flex;
   flex-grow: 1;
-  font-weight: bold;
-  padding: 10px;
+  font-weight: 700;
+  padding: 0.75rem;
 }
 
 .card-header-icon {
@@ -2779,7 +2785,7 @@ a.box:active {
   cursor: pointer;
   display: flex;
   justify-content: center;
-  width: 40px;
+  padding: 0.75rem;
 }
 
 .card-image {
@@ -2788,11 +2794,11 @@ a.box:active {
 }
 
 .card-content {
-  padding: 20px;
+  padding: 1.5rem;
 }
 
 .card-content .title + .subtitle {
-  margin-top: -20px;
+  margin-top: -1.5rem;
 }
 
 .card-footer {
@@ -2805,8 +2811,9 @@ a.box:active {
   align-items: center;
   display: flex;
   flex-grow: 1;
+  flex-shrink: 0;
   justify-content: center;
-  padding: 10px;
+  padding: 0.75rem;
 }
 
 .card-footer-item:not(:last-child) {
@@ -2819,15 +2826,10 @@ a.box:active {
   color: #4a4a4a;
   max-width: 100%;
   position: relative;
-  width: 300px;
 }
 
 .card .media:not(:last-child) {
-  margin-bottom: 10px;
-}
-
-.card.is-fullwidth {
-  width: 100%;
+  margin-bottom: 0.75rem;
 }
 
 .card.is-rounded {
@@ -3059,6 +3061,12 @@ a.box:active {
   color: #2aa198;
 }
 
+.level-item {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+}
+
 .level-item .title,
 .level-item .subtitle {
   margin-bottom: 0;
@@ -3066,13 +3074,13 @@ a.box:active {
 
 @media screen and (max-width: 768px) {
   .level-item:not(:last-child) {
-    margin-bottom: 10px;
+    margin-bottom: 0.75rem;
   }
 }
 
 .level-left .level-item:not(:last-child),
 .level-right .level-item:not(:last-child) {
-  margin-right: 10px;
+  margin-right: 0.75rem;
 }
 
 .level-left .level-item.is-flexible,
@@ -3080,24 +3088,31 @@ a.box:active {
   flex-grow: 1;
 }
 
+.level-left {
+  align-items: center;
+  justify-content: flex-start;
+}
+
 @media screen and (max-width: 768px) {
   .level-left + .level-right {
-    margin-top: 20px;
+    margin-top: 1.5rem;
   }
 }
 
 @media screen and (min-width: 769px) {
   .level-left {
-    align-items: center;
     display: flex;
   }
 }
 
+.level-right {
+  align-items: center;
+  justify-content: flex-end;
+}
+
 @media screen and (min-width: 769px) {
   .level-right {
-    align-items: center;
     display: flex;
-    justify-content: flex-end;
   }
 }
 
@@ -3140,33 +3155,18 @@ a.box:active {
   }
 }
 
-.media-number,
 .media-left,
 .media-right {
   flex-grow: 0;
   flex-shrink: 0;
 }
 
-.media-number {
-  background-color: whitesmoke;
-  border-radius: 290486px;
-  display: inline-block;
-  font-size: 1.25rem;
-  height: 32px;
-  line-height: 24px;
-  margin-right: 1rem;
-  min-width: 32px;
-  padding: 4px 8px;
-  text-align: center;
-  vertical-align: top;
-}
-
 .media-left {
-  margin-right: 1rem;
+  margin-right: 0.75rem;
 }
 
 .media-right {
-  margin-left: 1rem;
+  margin-left: 0.75rem;
 }
 
 .media-content {
@@ -3188,7 +3188,7 @@ a.box:active {
 .media .media {
   border-top: 1px solid rgba(219, 219, 219, 0.5);
   display: flex;
-  padding-top: 10px;
+  padding-top: 0.75rem;
 }
 
 .media .media .content:not(:last-child),
@@ -3211,14 +3211,8 @@ a.box:active {
 }
 
 .media.is-large + .media {
-  margin-top: 1.4rem;
-  padding-top: 1.4rem;
-}
-
-@media screen and (min-width: 769px) {
-  .media.is-large .media-number {
-    margin-right: 1.4rem;
-  }
+  margin-top: 1.5rem;
+  padding-top: 1.5rem;
 }
 
 .menu-nav a {
@@ -6342,7 +6336,7 @@ html.route-index #carbon {
 }
 
 .example + .highlight:not(:last-child) {
-  margin-bottom: 3rem;
+  margin-bottom: 1.5rem;
 }
 
 .structure {

diff --git a/docs/documentation/components/card.html b/docs/documentation/components/card.html
index ca65427f8678ab12da9e1618143313f992f4fd20..070d380c2f5a8b824730b3fdff534c49ee8d3bb9 100644 (file)
--- a/docs/documentation/components/card.html
+++ b/docs/documentation/components/card.html
@@ -13,37 +13,7 @@ doc-subtab: card
 
     <hr>
 
-    <div class="columns">
-      <div class="column is-one-third">
-        <div class="card">
-          <div class="card-image">
-            <figure class="image is-4by3">
-              <img src="http://placehold.it/300x225" alt="">
-            </figure>
-          </div>
-          <div class="card-content">
-            <div class="media">
-              <div class="media-left">
-                <figure class="image is-32x32">
-                  <img src="http://placehold.it/64x64" alt="Image">
-                </figure>
-              </div>
-              <div class="media-content">
-                <p class="title is-5">John Smith</p>
-                <p class="subtitle is-6">@johnsmith</p>
-              </div>
-            </div>
-
-            <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>
-              <br>
-              <small>11:09 PM - 1 Jan 2016</small>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="column">
-{% highlight html %}
+{% capture card_example %}
 <div class="card">
   <div class="card-image">
     <figure class="image is-4by3">
@@ -72,51 +42,36 @@ doc-subtab: card
     </div>
   </div>
 </div>
+{% endcapture %}
+<div class="columns">
+  <div class="column is-one-third">
+{{card_example}}
+  </div>
+  <div class="column">
+{% highlight html %}
+{{card_example}}
 {% endhighlight %}
-      </div>
-    </div>
+  </div>
+</div>
 
     <hr>
 
-    <div class="columns">
-      <div class="column is-one-third">
-        <div class="card is-fullwidth">
-          <header class="card-header">
-            <p class="card-header-title">
-              Component
-            </p>
-            <a class="card-header-icon">
-              <i class="fa fa-angle-down"></i>
-            </a>
-          </header>
-          <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>
-              <br>
-              <small>11:09 PM - 1 Jan 2016</small>
-            </div>
-          </div>
-          <footer class="card-footer">
-            <a class="card-footer-item">Save</a>
-            <a class="card-footer-item">Edit</a>
-            <a class="card-footer-item">Delete</a>
-          </footer>
-        </div>
-      </div>
-      <div class="column">
-{% highlight html %}
-<div class="card is-fullwidth">
+{% capture card_header_example %}
+<div class="card">
   <header class="card-header">
     <p class="card-header-title">
       Component
     </p>
     <a class="card-header-icon">
-      <i class="fa fa-angle-down"></i>
+      <span class="icon">
+        <i class="fa fa-angle-down"></i>
+      </span>
     </a>
   </header>
   <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>
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus nec iaculis mauris.
+      <a href="#">@bulmaio</a>. <a href="#">#css</a> <a href="#">#responsive</a>
       <br>
       <small>11:09 PM - 1 Jan 2016</small>
     </div>
@@ -127,8 +82,17 @@ doc-subtab: card
     <a class="card-footer-item">Delete</a>
   </footer>
 </div>
+{% endcapture %}
+<div class="columns">
+  <div class="column is-one-third">
+{{card_header_example}}
+  </div>
+  <div class="column">
+{% highlight html %}
+{{card_header_example}}
 {% endhighlight %}
-      </div>
-    </div>
+  </div>
+</div>
+
   </div>
 </section>

diff --git a/docs/documentation/components/level.html b/docs/documentation/components/level.html
index d5e638a8fb27f36e63069e3633b8f4df83fa2714..7e314a4c92f7e65187e9ab4e16cdb3ef2d0f2fd3 100644 (file)
--- a/docs/documentation/components/level.html
+++ b/docs/documentation/components/level.html
@@ -71,46 +71,7 @@ doc-subtab: level
       </nav>
     </div>
 
-    <div class="example">
-      <nav class="level">
-        <div class="level-left">
-          <div class="level-item">
-            <p class="subtitle is-5">
-              <strong>123</strong> posts
-            </p>
-          </div>
-          <div class="level-item">
-            <p class="control has-addons">
-              <input class="input" type="text" placeholder="Find a post">
-              <button class="button">
-                Search
-              </button>
-            </p>
-          </div>
-        </div>
-        <div class="level-right">
-          <p class="level-item">
-            <strong>All</strong>
-          </p>
-          <p class="level-item">
-            <a>Published</a>
-          </p>
-          <p class="level-item">
-            <a>Drafts</a>
-          </p>
-          <p class="level-item">
-            <a>Deleted</a>
-          </p>
-          <p class="level-item">
-            <a class="button is-success">
-              New
-            </a>
-          </p>
-        </div>
-      </nav>
-    </div>
-
-{% highlight html %}
+{% capture nav_example %}
 <!-- Main container -->
 <nav class="level">
   <!-- Left side -->
@@ -139,37 +100,21 @@ doc-subtab: level
     <p class="level-item"><a class="button is-success">New</a></p>
   </div>
 </nav>
+{% endcapture %}
+<div class="example">
+{{nav_example}}
+</div>
+{% highlight html %}
+{{nav_example}}
 {% endhighlight %}
 
     <hr>
-    <h3 class="title">Centered level</h3>
-
-    <div class="content">
-      If you want a <strong>centered level</strong>, you can use as many <code>level-item</code> as you want, as long as they are <strong>direct</strong> children of the <code>level</code> container.
-    </div>
 
-    <div class="example">
-      <nav class="level">
-        <div class="level-item has-text-centered">
-          <p class="heading">Tweets</p>
-          <p class="title">3,456</p>
-        </div>
-        <div class="level-item has-text-centered">
-          <p class="heading">Following</p>
-          <p class="title">123</p>
-        </div>
-        <div class="level-item has-text-centered">
-          <p class="heading">Followers</p>
-          <p class="title">456K</p>
-        </div>
-        <div class="level-item has-text-centered">
-          <p class="heading">Likes</p>
-          <p class="title">789</p>
-        </div>
-      </nav>
-    </div>
-
-{% highlight html %}
+<h3 class="title">Centered level</h3>
+<div class="content">
+  If you want a <strong>centered level</strong>, you can use as many <code>level-item</code> as you want, as long as they are <strong>direct</strong> children of the <code>level</code> container.
+</div>
+{% capture nav_centered_example %}
 <nav class="level">
   <div class="level-item has-text-centered">
     <p class="heading">Tweets</p>
@@ -188,29 +133,8 @@ doc-subtab: level
     <p class="title">789</p>
   </div>
 </nav>
-{% endhighlight %}
-
-    <div class="example">
-      <nav class="level">
-        <p class="level-item has-text-centered">
-          <a class="link is-info">Home</a>
-        </p>
-        <p class="level-item has-text-centered">
-          <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;">
-        </p>
-        <p class="level-item has-text-centered">
-          <a class="link is-info">Reservations</a>
-        </p>
-        <p class="level-item has-text-centered">
-          <a class="link is-info">Contact</a>
-        </p>
-      </nav>
-    </div>
-
-{% highlight html %}
+{% endcapture %}
+{% capture nav_centered_bis_example %}
 <nav class="level">
   <p class="level-item has-text-centered">
     <a class="link is-info">Home</a>
@@ -228,33 +152,52 @@ doc-subtab: level
     <a class="link is-info">Contact</a>
   </p>
 </nav>
+{% endcapture %}
+<div class="example">
+{{nav_centered_example}}
+</div>
+{% highlight html %}
+{{nav_centered_example}}
+{% endhighlight %}
+<div class="example">
+{{nav_centered_bis_example}}
+</div>
+{% highlight html %}
+{{nav_centered_bis_example}}
 {% endhighlight %}
 
     <hr>
-    <h3 class="title">Mobile level</h3>
-    <div class="content">
-      By default, for space concerns, the level is vertical on mobile. If you want the level to be horizontal on mobile as well, add the <code>is-mobile</code> modifier on the <code>level</code> container.
-    </div>
 
-    <div class="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>
-        <div class="level-item has-text-centered">
-          <p class="heading">Following</p>
-          <p class="title">123</p>
-        </div>
-        <div class="level-item has-text-centered">
-          <p class="heading">Followers</p>
-          <p class="title">456K</p>
-        </div>
-        <div class="level-item has-text-centered">
-          <p class="heading">Likes</p>
-          <p class="title">789</p>
-        </div>
-      </nav>
-    </div>
+<h3 class="title">Mobile level</h3>
+<div class="content">
+  By default, for space concerns, the level is vertical on mobile. If you want the level to be horizontal on mobile as well, add the <code>is-mobile</code> modifier on the <code>level</code> container.
+</div>
+{% 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>
+  <div class="level-item has-text-centered">
+    <p class="heading">Following</p>
+    <p class="title">123</p>
+  </div>
+  <div class="level-item has-text-centered">
+    <p class="heading">Followers</p>
+    <p class="title">456K</p>
+  </div>
+  <div class="level-item has-text-centered">
+    <p class="heading">Likes</p>
+    <p class="title">789</p>
+  </div>
+</nav>
+{% endcapture %}
+<div class="example">
+{{nav_mobile_example}}
+</div>
+{% highlight html %}
+{{nav_mobile_example}}
+{% endhighlight %}
+
   </div>
 </section>

diff --git a/docs/documentation/components/media-object.html b/docs/documentation/components/media-object.html
index 8f034ef3d158536f7c85bc604eb4ac21ef9493ae..f10ed3ea4f97c89238c58acfdc62a4f4349be291 100644 (file)
--- a/docs/documentation/components/media-object.html
+++ b/docs/documentation/components/media-object.html
@@ -52,43 +52,7 @@ doc-subtab: media-object
       </article>
     </div>
 
-
-    <div class="example">
-      <article class="media">
-        <figure class="media-left">
-          <p class="image is-64x64">
-            <img src="http://placehold.it/128x128">
-          </p>
-        </figure>
-        <div class="media-content">
-          <div class="content">
-            <p>
-              <strong>John Smith</strong> <small>@johnsmith</small> <small>31m</small>
-              <br>
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin ornare magna eros, eu pellentesque tortor vestibulum ut. Maecenas non massa sem. Etiam finibus odio quis feugiat facilisis.
-            </p>
-          </div>
-          <nav class="level">
-            <div class="level-left">
-              <a class="level-item">
-                <span class="icon is-small"><i class="fa fa-reply"></i></span>
-              </a>
-              <a class="level-item">
-                <span class="icon is-small"><i class="fa fa-retweet"></i></span>
-              </a>
-              <a class="level-item">
-                <span class="icon is-small"><i class="fa fa-heart"></i></span>
-              </a>
-            </div>
-          </nav>
-        </div>
-        <div class="media-right">
-          <button class="delete"></button>
-        </div>
-      </article>
-    </div>
-
-{% highlight html %}
+{% capture media_example %}
 <article class="media">
   <figure class="media-left">
     <p class="image is-64x64">
@@ -121,42 +85,19 @@ doc-subtab: media-object
     <button class="delete"></button>
   </div>
 </article>
+{% endcapture %}
+<div class="example">
+{{media_example}}
+</div>
+{% highlight html %}
+{{media_example}}
 {% endhighlight %}
 
     <div class="content">
       <p>You can include <em>any</em> other Bulma element, like inputs, textareas, icons, buttons... or even a <strong>nav bar</strong>.</p>
     </div>
 
-    <div class="example">
-      <article class="media">
-        <figure class="media-left">
-          <p class="image is-64x64">
-            <img src="http://placehold.it/128x128">
-          </p>
-        </figure>
-        <div class="media-content">
-          <p class="control">
-            <textarea class="textarea" placeholder="Add a comment..."></textarea>
-          </p>
-          <nav class="level">
-            <div class="level-left">
-              <div class="level-item">
-                <a class="button is-info">Post comment</a>
-              </div>
-            </div>
-            <div class="level-right">
-              <div class="level-item">
-                <label class="checkbox">
-                  <input type="checkbox"> Press enter to submit
-                </label>
-              </div>
-            </div>
-          </nav>
-        </div>
-      </article>
-    </div>
-
-{% highlight html %}
+{% capture media_bis_example %}
 <article class="media">
   <figure class="media-left">
     <p class="image is-64x64">
@@ -183,6 +124,12 @@ doc-subtab: media-object
     </nav>
   </div>
 </article>
+{% endcapture %}
+<div class="example">
+{{media_bis_example}}
+</div>
+{% highlight html %}
+{{media_bis_example}}
 {% endhighlight %}
 
     <hr>
@@ -191,88 +138,7 @@ doc-subtab: media-object
     <div class="content">
       <p>You can nest media objects up to <strong>3 levels</strong> deep.</p>
     </div>
-    <div class="example">
-      <article class="media">
-        <figure class="media-left">
-          <p class="image is-64x64">
-            <img src="http://placehold.it/128x128">
-          </p>
-        </figure>
-        <div class="media-content">
-          <div class="content">
-            <p>
-              <strong>Barbara Middleton</strong>
-              <br>
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis porta eros lacus, nec ultricies elit blandit non. Suspendisse pellentesque mauris sit amet dolor blandit rutrum. Nunc in tempus turpis.
-              <br>
-              <small><a>Like</a> · <a>Reply</a> · 3 hrs</small>
-            </p>
-          </div>
-
-          <article class="media">
-            <figure class="media-left">
-              <p class="image is-48x48">
-                <img src="http://placehold.it/96x96">
-              </p>
-            </figure>
-            <div class="media-content">
-              <div class="content">
-                <p>
-                  <strong>Sean Brown</strong>
-                  <br>
-                  Donec sollicitudin urna eget eros malesuada sagittis. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam blandit nisl a nulla sagittis, a lobortis leo feugiat.
-                  <br>
-                  <small><a>Like</a> · <a>Reply</a> · 2 hrs</small>
-                </p>
-              </div>
-
-              <article class="media">
-                Vivamus quis semper metus, non tincidunt dolor. Vivamus in mi eu lorem cursus ullamcorper sit amet nec massa.
-              </article>
-
-              <article class="media">
-                Morbi vitae diam et purus tincidunt porttitor vel vitae augue. Praesent malesuada metus sed pharetra euismod. Cras tellus odio, tincidunt iaculis diam non, porta aliquet tortor.
-              </article>
-            </div>
-          </article>
-
-          <article class="media">
-            <figure class="media-left">
-              <p class="image is-48x48">
-                <img src="http://placehold.it/96x96">
-              </p>
-            </figure>
-            <div class="media-content">
-              <div class="content">
-                <p>
-                  <strong>Kayli Eunice </strong>
-                  <br>
-                  Sed convallis scelerisque mauris, non pulvinar nunc mattis vel. Maecenas varius felis sit amet magna vestibulum euismod malesuada cursus libero. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus lacinia non nisl id feugiat.
-                  <br>
-                  <small><a>Like</a> · <a>Reply</a> · 2 hrs</small>
-                </p>
-              </div>
-            </div>
-          </article>
-        </div>
-      </article>
-      <article class="media">
-        <figure class="media-left">
-          <p class="image is-64x64">
-            <img src="http://placehold.it/128x128">
-          </p>
-        </figure>
-        <div class="media-content">
-          <p class="control">
-            <textarea class="textarea" placeholder="Add a comment..."></textarea>
-          </p>
-          <p class="control">
-            <button class="button">Post comment</button>
-          </p>
-        </div>
-      </article>
-    </div>
-{% highlight html %}
+{% capture media_nested_example %}
 <article class="media">
   <figure class="media-left">
     <p class="image is-64x64">
@@ -352,6 +218,12 @@ doc-subtab: media-object
     </p>
   </div>
 </article>
+{% endcapture %}
+<div class="example">
+{{media_nested_example}}
+</div>
+{% highlight html %}
+{{media_nested_example}}
 {% endhighlight %}
 
   </div>

diff --git a/sass/components/card.sass b/sass/components/card.sass
index d5a980ad45ae3bb75844cdcb9f4d79fbc496fce5..bdc4d0468925bfbb4f104e3d64838e2bccc64a8e 100644 (file)
--- a/sass/components/card.sass
+++ b/sass/components/card.sass
@@ -2,31 +2,30 @@
   align-items: stretch
   box-shadow: 0 1px 2px rgba($black, 0.1)
   display: flex
-  min-height: 40px
 
 .card-header-title
-  align-items: flex-start
+  align-items: center
   color: $text-strong
   display: flex
   flex-grow: 1
-  font-weight: bold
-  padding: 10px
+  font-weight: $weight-bold
+  padding: 0.75rem
 
 .card-header-icon
   align-items: center
   cursor: pointer
   display: flex
   justify-content: center
-  width: 40px
+  padding: 0.75rem
 
 .card-image
   display: block
   position: relative
 
 .card-content
-  padding: 20px
+  padding: 1.5rem
   .title + .subtitle
-    margin-top: -20px
+    margin-top: -1.5rem
 
 .card-footer
   border-top: 1px solid $border
@@ -37,8 +36,9 @@
   align-items: center
   display: flex
   flex-grow: 1
+  flex-shrink: 0
   justify-content: center
-  padding: 10px
+  padding: 0.75rem
   &:not(:last-child)
     border-right: 1px solid $border
 
@@ -48,11 +48,8 @@
   color: $text
   max-width: 100%
   position: relative
-  width: 300px
   .media:not(:last-child)
-    margin-bottom: 10px
+    margin-bottom: 0.75rem
   // Modifiers
-  &.is-fullwidth
-    width: 100%
   &.is-rounded
     border-radius: $radius-large

diff --git a/sass/components/level.sass b/sass/components/level.sass
index d54f96972de0d5b3c9ed2893af6cfa856a0e8835..08ba36b876d9b62b90cd1d3622521b946300dc6a 100644 (file)
--- a/sass/components/level.sass
+++ b/sass/components/level.sass
@@ -1,36 +1,40 @@
 .level-item
+  align-items: center
+  display: flex
+  justify-content: center
   .title,
   .subtitle
     margin-bottom: 0
   // Responsiveness
   +mobile
     &:not(:last-child)
-      margin-bottom: 10px
+      margin-bottom: 0.75rem
 
 .level-left,
 .level-right
   .level-item
     &:not(:last-child)
-      margin-right: 10px
+      margin-right: 0.75rem
     // Modifiers
     &.is-flexible
       flex-grow: 1
 
 .level-left
+  align-items: center
+  justify-content: flex-start
   // Responsiveness
   +mobile
     & + .level-right
-      margin-top: 20px
+      margin-top: 1.5rem
   +tablet
-    align-items: center
     display: flex
 
 .level-right
+  align-items: center
+  justify-content: flex-end
   // Responsiveness
   +tablet
-    align-items: center
     display: flex
-    justify-content: flex-end
 
 .level
   +block

diff --git a/sass/components/media.sass b/sass/components/media.sass
index a62b39866f4b8dbce63bd1ea708a0213691ecc5b..b09f1c82aecadade3b79425cac93dd5e8ad702a8 100644 (file)
--- a/sass/components/media.sass
+++ b/sass/components/media.sass
@@ -1,27 +1,13 @@
-.media-number,
 .media-left,
 .media-right
   flex-grow: 0
   flex-shrink: 0
 
-.media-number
-  background-color: $background
-  border-radius: 290486px
-  display: inline-block
-  font-size: $size-medium
-  height: 32px
-  line-height: 24px
-  margin-right: 1rem
-  min-width: 32px
-  padding: 4px 8px
-  text-align: center
-  vertical-align: top
-
 .media-left
-  margin-right: 1rem
+  margin-right: 0.75rem
 
 .media-right
-  margin-left: 1rem
+  margin-left: 0.75rem
 
 .media-content
   flex-grow: 1
@@ -37,7 +23,7 @@
   .media
     border-top: 1px solid rgba($border, 0.5)
     display: flex
-    padding-top: 10px
+    padding-top: 0.75rem
     .content:not(:last-child),
     .control:not(:last-child)
       margin-bottom: 0.5rem
@@ -52,10 +38,5 @@
   // Sizes
   &.is-large
     & + .media
-      margin-top: 1.4rem
-      padding-top: 1.4rem
-  // Responsiveness
-  +tablet
-    &.is-large
-      .media-number
-        margin-right: 1.4rem
+      margin-top: 1.5rem
+      padding-top: 1.5rem

diff --git a/sass/elements/button.sass b/sass/elements/button.sass
index ca7761ca333423bd77759626369b9767adf25490..5769e1fedbfaf96ffc71713294acba47f4e471dc 100644 (file)
--- a/sass/elements/button.sass
+++ b/sass/elements/button.sass
@@ -89,7 +89,7 @@ $button-shadow-inset: inset 0 1px 2px rgba($black, 0.2)
   &:focus,
   &.is-focused
     border-color: $button-focus-border
-    box-shadow: 0 0 0.5em rgba($button-focus-border, 0.5)
+    box-shadow: 0 0 0.5em rgba($button-focus-border, 0.25)
     color: $button-focus
   &:active,
   &.is-active
@@ -125,7 +125,7 @@ $button-shadow-inset: inset 0 1px 2px rgba($black, 0.2)
       &:focus,
       &.is-focused
         border-color: transparent
-        box-shadow: 0 0 0.5em rgba($color, 0.5)
+        box-shadow: 0 0 0.5em rgba($color, 0.25)
         color: $color-invert
       &:active,
       &.is-active

diff --git a/sass/elements/other.sass b/sass/elements/other.sass
index 4eab64619b5715fe15aa94b0bd962aa9f73d415d..0e89c292b1dcdf1fcff72f74e8c303e7c65f31e9 100644 (file)
--- a/sass/elements/other.sass
+++ b/sass/elements/other.sass
@@ -42,8 +42,15 @@
   +loader
 
 .number
+  align-items: center
   background-color: $background
   border-radius: 290486px
-  display: inline-block
+  display: inline-flex
   font-size: $size-medium
+  height: 2em
+  justify-content: center
+  margin-right: 1.5rem
+  min-width: 2.5em
+  padding: 0.25rem 0.5rem
+  text-align: center
   vertical-align: top

diff --git a/sass/elements/title.sass b/sass/elements/title.sass
index b738daa17961c58e4c91020455bcce254001ba98..0fb62b4e993cb9c1cfb8d1989a6c27b7768a799a 100644 (file)
--- a/sass/elements/title.sass
+++ b/sass/elements/title.sass
@@ -48,7 +48,7 @@ $subtitle-weight:   $weight-light !default
   strong
     color: $subtitle-strong
   & + .title
-    margin-top: -1.4rem
+    margin-top: -1.5rem
   // Colors
   @each $size in $sizes
     $i: index($sizes, $size)